Commit 6e447218 authored by zhangyingbin's avatar zhangyingbin

修改企业关联设备接口

parent 81b63f57
...@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto; ...@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/** /**
* 企业数据信息 Mapper 接口 * 企业数据信息 Mapper 接口
* *
...@@ -17,5 +19,5 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI ...@@ -17,5 +19,5 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
* @param sequenceNbr 企业id * @param sequenceNbr 企业id
* @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置 * @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置
*/ */
EquEnterDto getInfo(String sequenceNbr); List<EquEnterDto> getInfo(String sequenceNbr);
} }
...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper; import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
/** /**
* 企业数据信息 服务类 * 企业数据信息 服务类
* *
...@@ -19,5 +21,5 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI ...@@ -19,5 +21,5 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
* @param sequenceNbr 企业id * @param sequenceNbr 企业id
* @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置 * @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置
*/ */
EquEnterDto getInfo(String sequenceNbr); List<EquEnterDto> getInfo(String sequenceNbr);
} }
...@@ -23,6 +23,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper; ...@@ -23,6 +23,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
...@@ -140,7 +141,7 @@ public class TzBaseEnterpriseInfoController { ...@@ -140,7 +141,7 @@ public class TzBaseEnterpriseInfoController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getEquInfo/{sequenceNbr}", method = RequestMethod.GET) @RequestMapping(value = "/getEquInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "通过企业id查询设备", notes = "通过企业id查询设备") @ApiOperation(httpMethod = "GET", value = "通过企业id查询设备", notes = "通过企业id查询设备")
public ResponseModel<EquEnterDto> getInfo(@PathVariable(value = "sequenceNbr")String sequenceNbr){ public ResponseModel<List<EquEnterDto>> getInfo(@PathVariable(value = "sequenceNbr")String sequenceNbr){
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getInfo(sequenceNbr)); return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getInfo(sequenceNbr));
} }
......
...@@ -6,10 +6,13 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo; ...@@ -6,10 +6,13 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper; import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService; import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.pro.packaged.L;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/** /**
* 企业数据信息 服务实现类 * 企业数据信息 服务实现类
* *
...@@ -23,7 +26,7 @@ public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpris ...@@ -23,7 +26,7 @@ public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpris
private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper; private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@Override @Override
public EquEnterDto getInfo(String sequenceNbr) { public List<EquEnterDto> getInfo(String sequenceNbr) {
return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr); return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment