Commit 6243dd92 authored by KeYong's avatar KeYong

修改string型判断引用

parent a4e9e11c
...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Sequence; import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
...@@ -679,7 +680,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -679,7 +680,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
PartDetailVO partDetail = new PartDetailVO(); PartDetailVO partDetail = new PartDetailVO();
partDetail.setValue("部件详情"); partDetail.setValue("部件详情");
devOverview.setOperaState(StringUtils.isNotEmpty(equipmentSecificDetail.getStatus()) ? equipmentSecificDetail.getStatus() : "1"); devOverview.setOperaState(StringUtil.isNotEmpty(equipmentSecificDetail.getStatus()) ? equipmentSecificDetail.getStatus() : "1");
Map<String, Object> operaStateMap = new HashMap<>(); Map<String, Object> operaStateMap = new HashMap<>();
operaStateMap.put("1", "正常"); operaStateMap.put("1", "正常");
operaStateMap.put("2", "报警"); operaStateMap.put("2", "报警");
...@@ -921,7 +922,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -921,7 +922,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override @Override
public boolean equipmentgetIsSingleByQrcode(String qrCode, Long equipmentSpecifticId) { public boolean equipmentgetIsSingleByQrcode(String qrCode, Long equipmentSpecifticId) {
EquipmentSpecific equipmentSpecific; EquipmentSpecific equipmentSpecific;
if (StringUtils.isEmpty(qrCode)) { if (StringUtils.isBlank(qrCode)) {
QueryWrapper<EquipmentSpecific> wrapper = new QueryWrapper<>(); QueryWrapper<EquipmentSpecific> wrapper = new QueryWrapper<>();
wrapper.eq("equipment_specific_id", equipmentSpecifticId); wrapper.eq("equipment_specific_id", equipmentSpecifticId);
equipmentSpecific = this.baseMapper.selectOne(wrapper); equipmentSpecific = this.baseMapper.selectOne(wrapper);
...@@ -1111,7 +1112,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1111,7 +1112,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override @Override
public List<EquipmentOnCarVo> getAirEquipSpecificList(String like, String notLike, Integer status) { public List<EquipmentOnCarVo> getAirEquipSpecificList(String like, String notLike, Integer status) {
String[] split = null; String[] split = null;
if (StringUtils.isNotEmpty(notLike)) { if (StringUtil.isNotEmpty(notLike)) {
split = notLike.split(","); split = notLike.split(",");
} }
List<EquipmentOnCarVo> list = equipmentSpecificMapper.getAirEquipSpecificList(like, split, status); List<EquipmentOnCarVo> list = equipmentSpecificMapper.getAirEquipSpecificList(like, split, status);
...@@ -1124,7 +1125,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1124,7 +1125,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override @Override
public IPage<EquipmentOnCarVo> onCarVoIPage(EquipmentSpecificDto equipmentSpecificDto) { public IPage<EquipmentOnCarVo> onCarVoIPage(EquipmentSpecificDto equipmentSpecificDto) {
String[] strs = null; String[] strs = null;
if (StringUtils.isNotEmpty(codes)) { if (StringUtil.isNotEmpty(codes)) {
strs = codes.split(","); strs = codes.split(",");
} }
equipmentSpecificDto.setCodes(strs); equipmentSpecificDto.setCodes(strs);
...@@ -1187,15 +1188,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1187,15 +1188,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
equipmentSpecific.setEquipmentCode(equipmentCode); equipmentSpecific.setEquipmentCode(equipmentCode);
equipmentSpecific.setName(equipmentDetail.getName()); equipmentSpecific.setName(equipmentDetail.getName());
if (StringUtils.isNotEmpty(equipmentDetail.getArea())) { if (StringUtil.isNotEmpty(equipmentDetail.getArea())) {
String[] addressData = equipmentDetail.getArea().split("@address@"); String[] addressData = equipmentDetail.getArea().split("@address@");
if (addressData.length > 1) { if (addressData.length > 1) {
equipmentDetail.setArea(addressData[0]); equipmentDetail.setArea(addressData[0]);
JSONObject langLatObj = JSON.parseObject(addressData[1]); JSONObject langLatObj = JSON.parseObject(addressData[1]);
if (StringUtils.isNotEmpty(langLatObj.getString("longitude"))) { if (StringUtil.isNotEmpty(langLatObj.getString("longitude"))) {
equipmentDetail.setLongitude(Double.valueOf(langLatObj.getString("longitude"))); equipmentDetail.setLongitude(Double.valueOf(langLatObj.getString("longitude")));
} }
if (StringUtils.isNotEmpty(langLatObj.getString("latitude"))) { if (StringUtil.isNotEmpty(langLatObj.getString("latitude"))) {
equipmentDetail.setLatitude(Double.valueOf(langLatObj.getString("latitude"))); equipmentDetail.setLatitude(Double.valueOf(langLatObj.getString("latitude")));
} }
} }
......
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