|
@@ -15,12 +15,14 @@ import com.ruoyi.demo.entity.bo.PlanBo;
|
|
|
import com.ruoyi.demo.entity.bo.PlanItemBo;
|
|
|
import com.ruoyi.demo.entity.vo.EquipmentVo;
|
|
|
import com.ruoyi.demo.entity.vo.PlanItemVo;
|
|
|
+import com.ruoyi.demo.enums.EquipmentStateEnum;
|
|
|
import com.ruoyi.demo.mapper.EquipmentMapper;
|
|
|
import com.ruoyi.demo.mapper.PlanItemMapper;
|
|
|
import com.ruoyi.demo.mapper.PlanMapper;
|
|
|
import com.ruoyi.demo.service.EquipmentService;
|
|
|
import com.ruoyi.demo.utils.InitMapUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
@@ -39,6 +41,13 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
@Autowired
|
|
|
PlanMapper planMapper;
|
|
|
+ @Autowired
|
|
|
+ @Qualifier("equipmentStateMap")
|
|
|
+ HashMap<Integer,String> equipmentStateMap;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ @Qualifier("equipmentOnStateMap")
|
|
|
+ HashMap<Integer,String> equipmentOnStateMap;
|
|
|
@Override
|
|
|
public void addEquipment(EquipmentVo equipmentVo) {
|
|
|
Equipment equipment = new Equipment(equipmentVo);
|
|
@@ -70,11 +79,24 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
.set("maintain_telephone",equipmentVo.getMaintainTelephone())
|
|
|
.set("update_time",equipmentVo.getUpdateTime());
|
|
|
equipmentMapper.update(null,updateWrapper);
|
|
|
+
|
|
|
+ //修改冗余字段
|
|
|
+ UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
|
|
|
+ updateWrapper1.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper1.set("equipment_name",equipmentVo.getEquipmentName())
|
|
|
+ .set("addr_info",equipmentVo.getAddrInfo())
|
|
|
+ .set("addr_code",equipmentVo.getAddrCode())
|
|
|
+ .set("addr_code_info",equipmentVo.getAddrCode());
|
|
|
+ planItemMapper.update(null,updateWrapper1);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Equipment getEquipment(String equipmentId) {
|
|
|
- return equipmentMapper.selectById(equipmentId);
|
|
|
+ public EquipmentBo getEquipment(String equipmentId) {
|
|
|
+ Equipment equipment = equipmentMapper.selectById(equipmentId);
|
|
|
+ EquipmentBo equipmentBo = new EquipmentBo(equipment);
|
|
|
+ equipmentBo.setState(equipmentStateMap.get(equipment.getState()));
|
|
|
+ equipmentBo.setOnState(equipmentOnStateMap.get(equipment.getOnState()));
|
|
|
+ return equipmentBo;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -134,6 +156,9 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
+ queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
|
|
|
+ });
|
|
|
if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
planItemBoQueryWrapper.likeRight("plan_id",equipmentVo.getSearchText()).or()
|
|
@@ -204,6 +229,8 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
List<EquipmentBo> result = new ArrayList<>();
|
|
|
for (Equipment equipment1 : equipmentPage.getRecords()) {
|
|
|
EquipmentBo equipmentBo = new EquipmentBo(equipment1);
|
|
|
+ equipmentBo.setState(equipmentStateMap.get(equipment1.getState()));
|
|
|
+ equipmentBo.setOnState(equipmentOnStateMap.get(equipment1.getOnState()));
|
|
|
Integer integer = hashMap.get(equipmentBo.getEquipmentId());
|
|
|
if (integer == null){
|
|
|
equipmentBo.setPlanCounnt(0);
|