设备集合查询

zengh

2021-04-08 f1595ff272b3e2c6d774ae435df66707a8056f33

设备集合查询

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -93,8 +93,8 @@
    @GetMapping("/listAll")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入equipment")
    public R<List<EquipmentVO>> listAll(Equipment equipment, Query query) throws ParseException {
        List<EquipmentVO> pages = equipmentService.listAll();
    public R<List<EquipmentVO>> listAll(EquipmentVO equipment, Query query) throws ParseException {
        List<EquipmentVO> pages = equipmentService.listAll(equipment);

        for (int j = 0; j < pages.size(); j++) {
            String expireTime = pages.get(j).getExpireTime();

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.equipment.entity.Equipment;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
@@ -49,7 +50,9 @@
     */
    List<EquipmentVOS> tree();

    List<EquipmentVO> listAll();
    List<EquipmentVO> listAll(@Param("equipment") EquipmentVO equipment);

    List<EquipmentVO> listAlls();

    /**
     * 懒加载部门列表

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -201,6 +201,31 @@
        equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
        left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
        where 1=1

        <if test="equipment.deviceName!=null">
            and (
            deviceName like concat('%',#{equipment.deviceName},'%')
            or deviceNumber like concat('%',#{equipment.deviceName},'%')
            or street like concat('%',#{equipment.deviceName},'%')
            )
        </if>
    </select>

    <select id="listAlls" resultMap="equipmentResultMap">
          select equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
        ,equipment.ownerId,equipment.devicestate,equipment.stime,equipment.dtype,equipment.heartbeat,equipment.expireTime,
        equipment.parent_id,equipment.district,equipment.province,equipment.city,equipment.serialNumber,equipment.channelNumber,
        equipment.jd ,
        equipment.wd ,
        equipment.state,equipment.reason,
        equipment.street,catalog.pid,
        equipment.oneContacts,equipment.onePhone,equipment.oneId,
        equipment.twoContacts,equipment.twoPhone,equipment.twoId,
        equipment.ThreeContacts,equipment.ThreePhone,equipment.threeId,
        equipment.deptId,
        equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
        left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
        where 1=1
    </select>



 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java

@@ -48,7 +48,7 @@
     */
    List<EquipmentVOS> tree();

    List<EquipmentVO> listAll();
    List<EquipmentVO> listAll(EquipmentVO equipment);

    void updateOne(Equipment equipment);


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java

@@ -83,8 +83,8 @@
    }

    @Override
    public List<EquipmentVO> listAll() {
        return baseMapper.listAll();
    public List<EquipmentVO> listAll(EquipmentVO equipment) {
        return baseMapper.listAll(equipment);
    }

    @Override
@@ -148,7 +148,7 @@
    @Override
    public Integer selectEquipmentCount(ConditionVo conditionVo) {
        //先查询所有的设备
        List<EquipmentVO> equipmentVOS = baseMapper.listAll();
        List<EquipmentVO> equipmentVOS = baseMapper.listAlls();
        long time = new Date().getTime();
        int equipmentCount = 0;
        long hearbeat = 0;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java

@@ -14,6 +14,7 @@
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;
import org.springblade.jfpt.webscoket.service.IPushMsgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -50,6 +51,9 @@

    @Autowired
    private IAlarmService alarmService;

    @Autowired
    private IPushMsgService pushMsgService;

    @Autowired
    private IOperationService operationService;
@@ -1786,6 +1790,9 @@
                        operation.setZc("接警");
                        operation.setZctime(alarm.getJjTime());
                        serverHandler.operationService.save(operation);

                        //通过websocket给前端接警员发送信息
                        //serverHandler.pushMsgService.pushMsg(alarm.getAlarmId(), alarm.getId().toString());
                    }

                    outData.add("LEOK#@");