jinpengyong
2023-10-31 a860a554680453f533328858a525e663a22e86ed
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
@@ -5,7 +5,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,7 +13,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import com.moral.api.entity.Device;
import com.moral.api.entity.Organization;
@@ -22,7 +20,7 @@
import com.moral.api.service.OrganizationService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.sun.org.apache.regexp.internal.RE;
@Slf4j
@Api(tags = {"小程序设备管理"})
@@ -50,10 +48,7 @@
    @ApiOperation(value = "小程序获取设备")
    public ResultMessage selectDevice(@RequestParam @ApiParam(value = "organizationId",name = "组织ID") Integer organizationId){
        List<Device> organizationDevice = deviceService.getOrganizationDevice(organizationId);
        if (ObjectUtils.isEmpty(organizationDevice)){
            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
        }
        return ResultMessage.ok(organizationDevice);
        return ResultMessage.ok(ObjectUtils.isEmpty(organizationDevice)?null:organizationDevice);
    }
    @GetMapping("fuzzySearch")