|
@@ -10,11 +10,13 @@ import com.usky.common.core.bean.CommonPage;
|
|
|
import com.usky.common.core.util.UUIDUtils;
|
|
|
import com.usky.common.security.utils.SecurityUtils;
|
|
|
import com.usky.iot.domain.*;
|
|
|
+import com.usky.iot.mapper.BaseFacilityTypeMapper;
|
|
|
import com.usky.iot.mapper.BaseGgpFacilityMapper;
|
|
|
import com.usky.iot.service.*;
|
|
|
import com.usky.common.mybatis.core.AbstractCrudService;
|
|
|
import com.usky.iot.service.vo.BaseGgpFacilityExportVo;
|
|
|
import com.usky.iot.service.vo.BaseGgpFacilityRequest;
|
|
|
+import com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO;
|
|
|
import com.usky.iot.service.vo.BaseGgpFacilityVO;
|
|
|
import com.usky.system.model.LoginUser;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -46,7 +48,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
|
|
|
@Autowired
|
|
|
private BaseBuildService baseBuildService;
|
|
|
@Autowired
|
|
|
- private BaseFacilityTypeService baseFacilityTypeService;
|
|
|
+ private BaseFacilityTypeMapper baseFacilityTypeMapper;
|
|
|
|
|
|
@Override
|
|
|
public boolean add(BaseGgpFacility baseGgpFacility) {
|
|
@@ -96,8 +98,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
|
|
|
.orderByDesc(BaseGgpFacility::getId);
|
|
|
List<BaseGgpFacility> baseGgpFacilityList = this.list(queryWrapper);
|
|
|
List<BaseGgpFacilityExportVo> list = new ArrayList<>();
|
|
|
- LambdaQueryWrapper<BaseFacilityType> lambdaQuery = Wrappers.lambdaQuery();
|
|
|
- List<BaseFacilityType> typeList = baseFacilityTypeService.list(lambdaQuery);
|
|
|
+ List<BaseGgpFacilityTypeNumVO> typeList = baseFacilityTypeMapper.typeNumList(1);
|
|
|
if (CollectionUtils.isNotEmpty(baseGgpFacilityList)) {
|
|
|
for (int i = 0; i < baseGgpFacilityList.size(); i++) {
|
|
|
BaseGgpFacilityExportVo baseGgpFacilityExportVo = new BaseGgpFacilityExportVo();
|