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

jinpengyong

2023-08-23 8c741905bff160816524a54df00a4acca684b770

 screen-api/src/main/java/com/moral/api/controller/ProfessionController.java

@@ -44,9 +44,13 @@
        return ResultMessage.ok(response);
    }

    @ApiOperation(value = "获取该组织该行业所有设备的因子", notes = "获取该组织该行业所有设备的因子")
    @ApiOperation(value = "获取该组织某些行业所有设备的因子", notes = "获取该组织某些行业所有设备的因子")
    @GetMapping("getSensorByProfessions")
    public ResultMessage getProfessions(HttpServletRequest request) {
    @ApiImplicitParams({
            @ApiImplicitParam(name = "organizationId", value = "组织id", required = true, paramType = "query", dataType = "Integer"),
            @ApiImplicitParam(name = "professions", value = "行业key，多个逗号隔开", required = true, paramType = "query", dataType = "String")
    })
    public ResultMessage getSensorByProfessions(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        if (ObjectUtils.isEmpty(params.get("organizationId")) || ObjectUtils.isEmpty(params.get("professions"))) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -68,14 +72,14 @@
    public ResultMessage professionContribution(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        if (ObjectUtils.isEmpty(params.get("organizationId"))
                ||ObjectUtils.isEmpty(params.get("professions"))
                || ObjectUtils.isEmpty(params.get("professions"))
                || ObjectUtils.isEmpty(params.get("type"))
                || ObjectUtils.isEmpty(params.get("time"))
                || ObjectUtils.isEmpty(params.get("sensorCode"))) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<Map<String, Object>> response = professionService.professionContribution(params);
        Map<String, Object> response = professionService.professionContribution(params);
        return ResultMessage.ok(response);
    }