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

kaiyu

2021-06-17 fb1932ed607f0aa5474a6339ea86a83ae5a5089e

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

 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java

@@ -58,7 +58,8 @@
    URL_IS_EXIST(-43,"路径已存在"),
    ORGANIZATION_EXIST_MONITORPOINT(-44,"组织存在站点，无法删除"),
    CHILDREN_ORGANIZATION_EXIST_MONITORPOINT(-45,"子组织存在站点，无法删除"),
    DEVICE_IS_NULL(-46, "设备不存在")
    DEVICE_IS_NULL(-46, "设备不存在"),
    TARGET_IS_NULL(-47, "操作目标不存在")
    ;
    private final Integer code;
    private final String  msg;

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

@@ -58,4 +58,16 @@
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }

    @RequestMapping(value = "deleteOneDeviceAdjustValue", method = RequestMethod.POST)
    @ResponseBody
    public ResultMessage deleteOneDeviceAdjustValue(@RequestBody Map<String, Object> parameters) {
        Map<String,Object> resultMap = deviceAdjustValueService.deleteOne(parameters);
        String msg = resultMap.get("msg").toString();
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
        }
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }

}

 screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java

@@ -25,4 +25,7 @@
    @Transactional
    Map<String,Object> updateOne(Map map);

    @Transactional
    Map<String,Object> deleteOne(Map map);

}

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java

@@ -167,4 +167,34 @@
        return resultMap;
    }

    @Override
    public Map<String, Object> deleteOne(Map map) {
        Map<String,Object> resultMap = new HashMap<>();
        if (ObjectUtils.isEmpty(map.get("id"))||map.get("id").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("id",map.get("id"));
        DeviceAdjustValue deviceAdjustValue = deviceAdjustValueMapper.selectOne(wrapper);
        if (ObjectUtils.isEmpty(deviceAdjustValue)){
            resultMap.put("code",ResponseCodeEnum.TARGET_IS_NULL.getCode());
            resultMap.put("msg",ResponseCodeEnum.TARGET_IS_NULL.getMsg());
            return resultMap;
        }
        Map<String,Object> deleteMap = new HashMap<>();
        deleteMap.put("id",map.get("id"));
        deleteMap.put("is_delete",Constants.DELETE);
        deviceAdjustValueMapper.updateDeviceAdjustValue(deleteMap);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "删除了"+deviceAdjustValue.getMac()+"设备"+deviceAdjustValue.getSensorCode()+"传感器"+deviceAdjustValue.getStartTime()+"到"+deviceAdjustValue.getEndTime()+"的校准信息:"+";";
        logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
        resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
        return resultMap;
    }

}