Skip to content

A
amos-boot-biz
Commit bdb1cc1a authored by KeYong's avatar KeYong
Browse files
Options

修改绍兴现场相关bug

parent d9e5db3d
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 24 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipInformationCardController.java
View file @ bdb1cc1a
......@@ -72,23 +72,26 @@ public class EquipInformationCardController {
list = page.getRecords();
} else if(type.equals("check")){
page = equipmentSpecificMapper.selectListByPatrolCheck(page, equipmentId);
if (0 < page.getRecords().size()) {
list = page.getRecords();
list.stream().forEach(e->e.put("is_ok", CheckStatusEnum.getNameByCode(e.get("is_ok").toString())));
}
String ids = list.stream().map(map1 -> map1.get("id").toString()).collect(Collectors.joining(","));
JSONObject obj= idxFeign.queryDefectByCodes(idList, ids);
List<JSONObject> jsonObjects = JSONArray.parseArray(JSON.toJSONString(obj.get("result")), JSONObject.class);
//缺陷对应记录 是否存在上报问题
if (!ValidationUtil.isEmpty(jsonObjects)){
list.forEach(e->{
jsonObjects.forEach(j->{
if (e.get("id").toString().equals(j.getString("checkId"))){
e.put("reportProblem",j.getString("defectDescribe"));
e.put("defectId", j.getString("id"));
e.put("defectStatus",j.getString("defectStatus").equals("0")?"未处理":"已处理");
}
});
});
}
String ids = list.stream().map(map1 -> map1.get("id").toString()).collect(Collectors.joining(","));
// JSONObject obj= idxFeign.queryDefectByCodes(idList, ids);
// List<JSONObject> jsonObjects = JSONArray.parseArray(JSON.toJSONString(obj.get("result")), JSONObject.class);
// //缺陷对应记录 是否存在上报问题
// if (!ValidationUtil.isEmpty(jsonObjects)){
// list.forEach(e->{
// jsonObjects.forEach(j->{
// if (e.get("id").toString().equals(j.getString("checkId"))){
// e.put("reportProblem",j.getString("defectDescribe"));
// e.put("defectId", j.getString("id"));
// e.put("defectStatus",j.getString("defectStatus").equals("0")?"未处理":"已处理");
// }
// });
// });
// }
map.put("data", list);
map.put("total", page.getTotal());
return CommonResponseUtil.success(map);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ bdb1cc1a
package com.yeejoin.equipmanage.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
......@@ -15,9 +13,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
import com.yeejoin.equipmanage.common.enums.EquipQrcodeColorEnum;
import com.yeejoin.equipmanage.common.enums.ExcelEnums;
import com.yeejoin.equipmanage.common.enums.FileTypeEnum;
import com.yeejoin.equipmanage.common.enums.SourceTypeEnum;
import com.yeejoin.equipmanage.common.utils.*;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
......@@ -31,7 +27,6 @@ import com.yeejoin.equipmanage.utils.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import liquibase.pro.packaged.S;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -39,7 +34,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.MediaType;
import org.springframework.scheduling.annotation.Async;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ bdb1cc1a
......@@ -70,7 +70,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
private IUnitService iUnitService;
@Autowired
private IFireFightingSystemService fireFightingSystemService;
private FireFightingSystemMapper fireFightingSystemMapper;
@Autowired
private IStockDetailService stockDetailService;
......@@ -405,8 +405,12 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
equipmentDetail.setQrCodeImage(qrCodeImage);
// 消防系统
if (Objects.nonNull(equipmentSpecific.getSystemId())) {
FireFightingSystemEntity fireFightingSystem = fireFightingSystemService.getOneById(Long.valueOf(equipmentSpecific.getSystemId()));
equipmentSpecific.setSystemName(Objects.isNull(fireFightingSystem) ? "" : fireFightingSystem.getName());
List<FireFightingSystemEntity> sys = fireFightingSystemMapper.getFightingSysByIds(equipmentSpecific.getSystemId().split(","));
StringBuilder sb = new StringBuilder();
for (FireFightingSystemEntity entity : sys) {
sb.append(entity.getName()).append(",");
}
equipmentSpecific.setSystemName(Objects.isNull(sb.toString()) ? "" : sb.deleteCharAt(sb.lastIndexOf(",")).toString());
}
// 装备分类
Equipment equipment = equipmentDetail.getEquipment();
......@@ -436,6 +440,25 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
}
equipmentSpecific.setIndexParameter(indexMaps);
List<EquProperty> equPropertyList = equPropertyMapper.queryListByEquipDetailId(equipmentDetail.getId());
equipmentDetail.setEquPropertyList(equPropertyList);
ManufacturerInfo manufacturerInfo = manufacturerInfoMapper.selectById(equipmentDetail.getManufacturerId());
if (manufacturerInfo != null) {
manufacturerInfo.setImg(manufacturerInfo.getImg());
}
equipmentDetail.setManufacturerInfo(manufacturerInfo);
equipmentDetail.setManufacturerName(Objects.isNull(manufacturerInfo) ? "" : manufacturerInfo.getName());
equipmentDetail.setImg(getEquipFileList(equipmentDetail.getId(), FileTypeEnum.image.toString()));
equipmentDetail.setVideo(getEquipFileList(equipmentDetail.getId(), FileTypeEnum.video.toString()));
equipmentDetail.setCertification(getEquipFileList(equipmentDetail.getId(), FileTypeEnum.certificate.toString()));
equipmentDetail.setInstruction(getEquipFileList(equipmentDetail.getId(), FileTypeEnum.instruction.toString()));
equipmentDetail.setQuality(getEquipFileList(equipmentDetail.getId(), FileTypeEnum.quality.toString()));
equipmentDetail.setOperation(getEquipFileList(equipmentDetail.getId(), FileTypeEnum.operation.toString()));
if (equipmentDetail.getCountry() != null) {
equipmentDetail.setCountryName(
iSystemDicService.getOne(new QueryWrapper<SystemDic>().eq("id", equipmentDetail.getCountry())).getName());
}
equipmentDate.setEquipmentDetail(equipmentDetail);
equipmentDate.setEquipmentSpecific(equipmentSpecific);
return equipmentDate;
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml
View file @ bdb1cc1a
......@@ -278,6 +278,7 @@
wl_equipment_specific_alarm_log
WHERE
equipment_specific_id in (#{equipmentSpecificId})
ORDER BY create_date DESC
</select>
<select id="getEquipAlarmIdList" resultType="string">
......
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ bdb1cc1a
......@@ -827,7 +827,7 @@
ptd.is_finish status,
p.is_fixed isFixed,
p.shot_max_number shotMaxNumber,
p.shot_min_number shotMinNumber,dc-center/dc-center/
p.shot_min_number shotMinNumber,
pt.route_id routeId,
c.id checkId,
pt.id planTaskId,
......
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