Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-18 13bd8b759742f0a654679b0c8e152e7a1fb70db9

Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

 screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java

@@ -46,6 +46,17 @@
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }

    @RequestMapping(value = "getTimeSlot", method = RequestMethod.GET)
    @ResponseBody
    public ResultMessage getTimeSlot(HttpServletRequest request) {
        Map<String,Object> parameters = WebUtils.getParametersStartingWith(request,null);
        Map<String,Object> resultMap = deviceAdjustValueService.getTimeSlot(parameters);
        if (!resultMap.containsKey("code")){
            return ResultMessage.ok(resultMap);
        }
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }

    @RequestMapping(value = "updateOneDeviceAdjustValue", method = RequestMethod.POST)
    @ResponseBody
    public ResultMessage updateOneDeviceAdjustValue(@RequestBody Map<String, Object> parameters) {

 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/DeviceAdjustValueService.java

@@ -28,4 +28,6 @@
    @Transactional
    Map<String,Object> deleteOne(Map map);

    Map<String,Object> getTimeSlot(Map map);

}

 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/DeviceAdjustValueServiceImpl.java

@@ -84,7 +84,7 @@
        deviceAdjustValueMapper.insert(deviceAdjustValue);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "添加校准值:"+deviceAdjustValue+";";
        String content = "添加了"+deviceAdjustValue.getMac()+"设备"+deviceAdjustValue.getSensorCode()+"传感器"+deviceAdjustValue.getStartTime()+"到"+deviceAdjustValue.getEndTime()+"的校准信息:"+";";
        logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
@@ -197,4 +197,38 @@
        return resultMap;
    }

    @Override
    public Map<String, Object> getTimeSlot(Map map) {
        Map<String,Object> resultMap = new HashMap<>();
        if (ObjectUtils.isEmpty(map.get("sensor_code"))||map.get("sensor_code").equals("")){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        if (ObjectUtils.isEmpty(map.get("mac"))||map.get("mac").equals("")){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        QueryWrapper<DeviceAdjustValue> wrapper = new QueryWrapper<>();
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        wrapper.eq("sensor_code",map.get("sensor_code"));
        wrapper.eq("mac",map.get("mac"));
        List<DeviceAdjustValue> deviceAdjustValues = deviceAdjustValueMapper.selectList(wrapper);
        List<Map<String,Object>> timeSlotList = new ArrayList<>();
        if (deviceAdjustValues.size()==0){
            resultMap.put("timeSlotList",timeSlotList);
            return resultMap;
        }
        for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
            Map timeSlotMap = new HashMap();
            timeSlotMap.put("id",deviceAdjustValue.getId());
            timeSlotMap.put("startTime",deviceAdjustValue.getStartTime());
            timeSlotMap.put("endTime",deviceAdjustValue.getEndTime());
            timeSlotList.add(timeSlotMap);
        }
        resultMap.put("timeSlotList",timeSlotList);
        return resultMap;
    }

}

 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<>();
@@ -279,7 +309,7 @@
            sensorMap.put("createTime",createTime);
            sensorMap.put("updateTime",updateTime);
            sensorMap.put("key",sensor.getId());
            if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
            if (sensor.getDefaultUnitKey()!=null&&!sensor.getDefaultUnitKey().equals("")){
                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
                wrapper_VSU.eq("is_delete",0);
                wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());