blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2023-08-25 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3 
 screen-manage/src/main/java/com/moral/api/controller/TestController.java


@@ -8,13 +8,15 @@


import com.moral.api.entity.Test;


import com.moral.api.entity.UnitConversion;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.pojo.dto.account.AccountDTO;


import com.moral.api.pojo.dto.accountRole.AccountRoleDTO;


import com.moral.api.pojo.dto.adjust.AdjustDTO;


import com.moral.api.service.DeviceService;


import com.moral.api.service.SensorService;


import com.moral.api.service.SysDictDataService;


import com.moral.api.service.TestService;


import com.moral.api.service.impl.SensorServiceImpl;


import com.moral.api.util.AdjustDataUtils;


import com.moral.api.util.CacheUtils;


import com.moral.api.util.CompareFieldUtils;


import com.moral.constant.Constants;


import com.moral.constant.KafkaConstants;


import com.moral.constant.RedisConstants;


@@ -213,8 +215,9 @@


    private SensorService sensorService;


    @Autowired


    SysDictDataMapper sysDictDataMapper;




    @Autowired


    private  AdjustDataUtils adjustDataUtils;


    private DeviceService deviceService;




    @ApiOperation(value = "因子测试", notes = "因子测试")


    @ApiImplicitParams({


@@ -222,18 +225,34 @@


    })


    @RequestMapping(value = "getSensor", method = RequestMethod.GET)


    public void getSensor() {


        HashMap<String, Object> map = new HashMap<>();


        map.put("time","1692364996898");


        map.put("mac","p5dnd7a0391986");


        HashMap<String, Object> map1 = new HashMap<>();


        HashMap<String, Object> map2 = new HashMap<>();


        Map<String, Object> adjust = adjustDataUtils.adjust(map, map1, map2, "2");


        QueryWrapper<Sensor> queryWrapper = new QueryWrapper<>();


        queryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);


        List<Object> list = sensorService.listObjs(queryWrapper);


        for (Object o : list) {


            System.out.println(o);


        }


        HashMap<String, Object> deviceData = new HashMap<>();


        deviceData.put("time","1691996716839");


        deviceData.put("DataTime","20230814150000");


        deviceData.put("mac","p5dnd7a0245362");


        deviceData.put("a00e12","11479.2");


        deviceData.put("a00e13","44.0");


        deviceData.put("a21005","0.0264");


        deviceData.put("a21004","20.0");


        deviceData.put("a21026","30.5");


        deviceData.put("a01001","38.1");


        deviceData.put("a05024","279.6");


        deviceData.put("a01002","54.2");


        deviceData.put("a01007","2.45");


        deviceData.put("a01006","805.834");


        deviceData.put("a01008","102.0");


        deviceData.put("a34002","4.9");


        deviceData.put("a34004","4.9");


        deviceData.put("a00e03","798.5");


        deviceData.put("a00e04","2.9");


        deviceData.put("a99054","0.0348");


        deviceData.put("a31001","0.1");


        Map<String, Object> map = deviceService.adjustDeviceData(deviceData, "2");


//        QueryWrapper<Sensor> queryWrapper = new QueryWrapper<>();


//        queryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);


//        List<Object> list = sensorService.listObjs(queryWrapper);


//        for (Object o : list) {


//            System.out.println(o);


//        }


    }




}