소스 검색

更新同步代码

zhuoning 2 년 전
부모
커밋
809652f989

+ 0 - 2
huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegisterServiceImpl.java

@@ -66,7 +66,6 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
         wrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
         Page<EartagEartagRegister> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
 
-
         Page<EartagEartagRegisterVo> eartagDeviceRegisterVoPage = new Page<>();
         List<EartagEartagRegisterVo> listVo = new ArrayList();
         BeanUtil.copyProperties(page,eartagDeviceRegisterVoPage);
@@ -76,7 +75,6 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
         for (EartagEartagRegister record : page.getRecords()) {
             EartagEartagRegisterVo eartagDeviceRegisterVo = new EartagEartagRegisterVo();
             BeanUtil.copyProperties(record,eartagDeviceRegisterVo);
-
             EartagData eartagData = eartagDataMapper.selectOne(new QueryWrapper<EartagData>().eq("earmark", record.getEarmark()).orderByDesc("id").last("limit 1"));
             eartagDeviceRegisterVo.setAct(eartagData.getAct1());
             Float earTemp1 = eartagData.getEarTemp1();

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

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.BaseFarmMapper;
 import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
+import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.pojo.SysBaseConfig;
 import com.huimv.eartag2.manage2.mapper.SysBaseConfigMapper;
@@ -29,16 +31,14 @@ import java.util.stream.Collectors;
  */
 @Service
 public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, SysBaseConfig> implements SysBaseConfigService {
-
     @Resource
     private SysBaseConfigMapper sysBaseConfigMapper;
-
+    @Resource
+    private BaseFarmMapper baseFarmMapper;
     @Resource
     RabbitTemplate rabbitTemplate;
-
     @Resource
     private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
-
     @Override
     public Result add(List<Map<String, String>> mapList) {
         //SysBaseConfigEntity
@@ -157,8 +157,8 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     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) {
+//    @Override
+    public Result syncCong_yang(Map<String,String> paramsMap) {
         String farmCode = paramsMap.get("farmId");
         //查询牧场信息
         QueryWrapper<SysBaseConfig> queryWrapper = new QueryWrapper<>();
@@ -189,6 +189,43 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
         return new Result(ResultCode.SUCCESS);
     }
 
+    @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);
+
+        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());
+        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);
+        EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisters.get(0).setSyncTime(new DateUtil().getTimestamp());
+        eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
+        return new Result(ResultCode.SUCCESS);
+    }
+
     private SysBaseConfigVo convertSysBaseConfigVo(List<SysBaseConfig> list){
         Map<String, String> map = list.stream().collect(Collectors.toMap(SysBaseConfig::getConfigKey, SysBaseConfig::getConfigValue,(item1,item2) ->item1));
         SysBaseConfigVo sysBaseConfigVo = new SysBaseConfigVo();