|
@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
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.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.BaseGgpFacilityListVO;
|
|
|
import com.usky.iot.service.vo.BaseGgpFacilityRequest;
|
|
|
import com.usky.iot.service.vo.BaseGgpFacilityVO;
|
|
|
import com.usky.system.model.LoginUser;
|
|
@@ -45,9 +45,12 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
|
|
|
private DmpDeviceInfoService dmpDeviceInfoService;
|
|
|
@Autowired
|
|
|
private BaseBuildService baseBuildService;
|
|
|
+ @Autowired
|
|
|
+ private BaseFacilityTypeService baseFacilityTypeService;
|
|
|
|
|
|
@Override
|
|
|
public boolean add(BaseGgpFacility baseGgpFacility) {
|
|
|
+ baseGgpFacility.setFacilityNum(UUIDUtils.uuid());
|
|
|
baseGgpFacility.setCreator(SecurityUtils.getUsername());
|
|
|
baseGgpFacility.setCreateTime(LocalDateTime.now());
|
|
|
return this.save(baseGgpFacility);
|
|
@@ -84,34 +87,41 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
|
|
|
@Override
|
|
|
public List<BaseGgpFacilityExportVo> recordLsitExport(BaseGgpFacilityRequest exRequest) {
|
|
|
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
- LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
- String userType = null;
|
|
|
- if (loginUser != null && !"".equals(loginUser)) {
|
|
|
- userType = loginUser.getUserType();
|
|
|
- }
|
|
|
LambdaQueryWrapper<BaseGgpFacility> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper
|
|
|
// .eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId())
|
|
|
.like(StringUtils.isNotBlank(exRequest.getFacilityName()), BaseGgpFacility::getFacilityName, exRequest.getFacilityName())
|
|
|
.eq(StringUtils.isNotBlank(exRequest.getFacilityNum()), BaseGgpFacility::getFacilityNum, exRequest.getFacilityNum())
|
|
|
- .eq(null != exRequest.getFacilityType(),BaseGgpFacility::getFacilityType,exRequest.getFacilityType())
|
|
|
+ .eq(exRequest.getFacilityType() != 0,BaseGgpFacility::getFacilityType,exRequest.getFacilityType())
|
|
|
.orderByDesc(BaseGgpFacility::getId);
|
|
|
List<BaseGgpFacility> baseGgpFacilityList = this.list(queryWrapper);
|
|
|
List<BaseGgpFacilityExportVo> list = new ArrayList<>();
|
|
|
- for (int i = 0; i < baseGgpFacilityList.size(); i++) {
|
|
|
- BaseGgpFacilityExportVo baseGgpFacilityExportVo = new BaseGgpFacilityExportVo();
|
|
|
- baseGgpFacilityExportVo.setXh(i + 1);
|
|
|
- baseGgpFacilityExportVo.setId(baseGgpFacilityList.get(i).getId());
|
|
|
- baseGgpFacilityExportVo.setFacilityNum(baseGgpFacilityList.get(i).getFacilityNum());
|
|
|
- baseGgpFacilityExportVo.setFacilityType(baseGgpFacilityList.get(i).getFacilityType());
|
|
|
- baseGgpFacilityExportVo.setFacilityName(baseGgpFacilityList.get(i).getFacilityName());
|
|
|
- baseGgpFacilityExportVo.setAddress(baseGgpFacilityList.get(i).getAddress());
|
|
|
- baseGgpFacilityExportVo.setImagesUrl(baseGgpFacilityList.get(i).getImagesUrl());
|
|
|
- baseGgpFacilityExportVo.setContact(baseGgpFacilityList.get(i).getContact());
|
|
|
- baseGgpFacilityExportVo.setContactPhone(baseGgpFacilityList.get(i).getContactPhone());
|
|
|
- baseGgpFacilityExportVo.setStatus(baseGgpFacilityList.get(i).getStatus());
|
|
|
- baseGgpFacilityExportVo.setCreateTime(baseGgpFacilityList.get(i).getCreateTime().format(df));
|
|
|
- list.add(baseGgpFacilityExportVo);
|
|
|
+ LambdaQueryWrapper<BaseFacilityType> lambdaQuery = Wrappers.lambdaQuery();
|
|
|
+ List<BaseFacilityType> typeList = baseFacilityTypeService.list(lambdaQuery);
|
|
|
+ if (CollectionUtils.isNotEmpty(baseGgpFacilityList)) {
|
|
|
+ for (int i = 0; i < baseGgpFacilityList.size(); i++) {
|
|
|
+ BaseGgpFacilityExportVo baseGgpFacilityExportVo = new BaseGgpFacilityExportVo();
|
|
|
+ baseGgpFacilityExportVo.setXh(i + 1);
|
|
|
+ baseGgpFacilityExportVo.setId(baseGgpFacilityList.get(i).getId());
|
|
|
+ baseGgpFacilityExportVo.setFacilityNum(baseGgpFacilityList.get(i).getFacilityNum());
|
|
|
+ baseGgpFacilityExportVo.setFacilityType("未知");
|
|
|
+ if (CollectionUtils.isNotEmpty(typeList)) {
|
|
|
+ for (int j = 0; j < typeList.size(); j++) {
|
|
|
+ if (baseGgpFacilityList.get(i).getFacilityType().equals(typeList.get(j).getId())) {
|
|
|
+ baseGgpFacilityExportVo.setFacilityType(typeList.get(j).getTypeName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ baseGgpFacilityExportVo.setFacilityName(baseGgpFacilityList.get(i).getFacilityName());
|
|
|
+ baseGgpFacilityExportVo.setAddress(baseGgpFacilityList.get(i).getAddress());
|
|
|
+ baseGgpFacilityExportVo.setImagesUrl(baseGgpFacilityList.get(i).getImagesUrl());
|
|
|
+ baseGgpFacilityExportVo.setContact(baseGgpFacilityList.get(i).getContact());
|
|
|
+ baseGgpFacilityExportVo.setContactPhone(baseGgpFacilityList.get(i).getContactPhone());
|
|
|
+ baseGgpFacilityExportVo.setStatus(baseGgpFacilityList.get(i).getStatus());
|
|
|
+ baseGgpFacilityExportVo.setCreateTime(baseGgpFacilityList.get(i).getCreateTime().format(df));
|
|
|
+ list.add(baseGgpFacilityExportVo);
|
|
|
+ }
|
|
|
}
|
|
|
return list;
|
|
|
}
|