lizijie
2021-06-17 f29b6296a322f6ecd2c432c5cd55ae224330b3e8
不分页查询所有因子
3 files modified
43 ■■■■■ changed files
screen-manage/src/main/java/com/moral/api/controller/SensorController.java 11 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/SensorService.java 2 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java 30 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/SensorController.java
@@ -72,6 +72,17 @@
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }
    @RequestMapping(value = "getAllSensorWithoutPage", method = RequestMethod.GET)
    @ResponseBody
    public ResultMessage getAllSensorWithoutPage(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        Map<String,Object> resultMap = sensorService.getAllSensorWithoutPage();
        if (!resultMap.containsKey("code")){
            return ResultMessage.ok(resultMap);
        }
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }
    @RequestMapping(value = "deleteSensor", method = RequestMethod.POST)
    @ResponseBody
    public ResultMessage deleteSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
screen-manage/src/main/java/com/moral/api/service/SensorService.java
@@ -26,6 +26,8 @@
    Map<String,Object> getAllSensor(Map map);
    Map<String,Object> getAllSensorWithoutPage();
    @Transactional
    Map<String,Object> deleteSensor(Map map);
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -218,6 +218,36 @@
    }
    @Override
    public Map<String, Object> getAllSensorWithoutPage() {
        Map<String,Object> resultMap = new HashMap<>();
        QueryWrapper<Sensor> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",0);
        List<Sensor> sensors = sensorMapper.selectList(wrapper);
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> sensorList = new ArrayList<>();
        for (Sensor sensor:sensors) {
            Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
            String createTime = SDF.format(sensor.getCreateTime());
            String updateTime = SDF.format(sensor.getUpdateTime());
            sensorMap.put("createTime",createTime);
            sensorMap.put("updateTime",updateTime);
            sensorMap.put("key",sensor.getId());
            if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
                wrapper_VSU.eq("is_delete",0);
                wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id",14);
                if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
                    sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                }
            }
            sensorList.add(sensorMap);
        }
        resultMap.put("sensors",sensorList);
        return resultMap;
    }
    @Override
    @Transactional
    public Map<String, Object> deleteSensor(Map map) {
        Map<String,Object> resultMap = new HashMap<>();