v2.0.2，更新时间4.16

fei.wang

2025-04-16 c386374de5ff4a65904124ef839e6862518d27fa

 src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java

@@ -8,6 +8,7 @@
import com.hxzkmonitor.service.TbEquipmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hxzkmonitor.service.TbSystemService;
import com.hxzkmonitor.util.DateUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +35,12 @@
    private final TbCompanyMapper tbCompanyMapper;

    private final TbUserMapper tbUserMapper;

    private final TbEvrydayweiyi2024Mapper tbEvrydayweiyi2024Mapper;

    private final TbAlarmsystemMapper tbAlarmsystemMapper;



    @Autowired
    TbSystemService tbSystemService;
@@ -163,8 +170,6 @@
        }




    }

    @Override
@@ -292,8 +297,6 @@
        }




    }

    @Override
@@ -343,8 +346,30 @@
                    userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
//             userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                Calendar calendar = Calendar.getInstance();
                String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
//        Calendar date = Calendar.getInstance();
//        String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
                Date date = new Date();
                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");

//        Calendar calendar = Calendar.getInstance();
                String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
                int i1 = (Integer.parseInt(dated.split("-")[2]) - 1);
                String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
                System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
                if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s) != null) {
                    userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
                    userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
                    userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
                } else {
                    userPage.getRecords().get(i).setEd("0");
                    userPage.getRecords().get(i).setNd("0");
                    userPage.getRecords().get(i).setTd("0");
                }

            }

            return userPage;
        }else{
            QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -359,7 +384,24 @@
                if (tbCompany!=null){
                    userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                }
//             userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
                Calendar calendar = Calendar.getInstance();
                String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
//        Calendar date = Calendar.getInstance();
//        String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
                Date date = new Date();
                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");

//        Calendar calendar = Calendar.getInstance();
                String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
                int i1 = (Integer.parseInt(dated.split("-")[2]) - 1);
                String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
                System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
                if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s)!=null){
                    userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
                    userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
                    userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
                }

            }
            return userPage;
        }
@@ -468,6 +510,7 @@
        map.put("messageNum",Integer.parseInt(messageNum.get(0).getDatanum()));
        return map;
    }

    @Override
    public List<TbEquipment> getEquipmentmonitor(String username,String phone) {
        QueryWrapper queryWrapperu = new QueryWrapper<>();
@@ -479,7 +522,33 @@
            queryWrapper.eq("companyid",tbUser.getCsname());
        }
        queryWrapper.eq("type",1);
        return baseMapper.selectList(queryWrapper);
        List<TbEquipment> tbEquipments = baseMapper.selectList(queryWrapper);
        for (int i = 0; i < tbEquipments.size(); i++) {
            QueryWrapper queryWrapperas = new QueryWrapper<>();
            queryWrapperas.eq("tagid", tbEquipments.get(i).getTagid());
            tbAlarmsystemMapper.selectOne(queryWrapperas);
            String ed = "N";
            String nd = "N";
            String hd = "N";
            if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv()!=null){
                ed = tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv();
            }
            if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv()!=null){
                nd = tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv();
            }
            if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv()!=null){
                hd = tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv();
            }
//if (tbEquipments.get(i).getEdmm()!=null){
    tbEquipments.get(i).setEdmm(tbEquipments.get(i).getEdmm()+"/"+ed );
    tbEquipments.get(i).setNdmm(tbEquipments.get(i).getNdmm()+"/"+ nd);
    tbEquipments.get(i).setHdmm(tbEquipments.get(i).getHdmm()+"/"+hd );
//}

        }


        return tbEquipments;
    }

    @Override
@@ -520,6 +589,13 @@
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("tagid",tagid);
        TbEquipment standardNum = baseMapper.selectOne(queryWrapper);
        if (standardNum != null) {
            QueryWrapper queryWrapper1 = new QueryWrapper<>();
            queryWrapper1.eq("id", standardNum.getCompanyid());
            TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
            standardNum.setCompany(tbCompany.getCompanyname());
        }

        return standardNum;
    }

@@ -539,4 +615,25 @@
        queryWrapper.orderByDesc("addtime");
        return baseMapper.selectList(queryWrapper);
    }


    @Override
    public List<TbEquipment> jzsearch(String query,String type) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("type", type);
        queryWrapper.like("tagid", query);
        queryWrapper.orderByDesc("addtime");
//        queryWrapper.last("LIMIT 5");
        return baseMapper.selectList(queryWrapper);
    }

    @Override
    public List<TbEquipment> jzsearchfive(String type) {
        QueryWrapper queryWrapper = new QueryWrapper<>();

        queryWrapper.eq("type", type);
        queryWrapper.orderByDesc("addtime");
        queryWrapper.last("LIMIT 5");
        return baseMapper.selectList(queryWrapper);
    }
}