Commit 13e6fbbb by 416409548@qq.com

模块优化

parent bb4ba14c
This source diff could not be displayed because it is too large. You can view the blob instead.
package org.jeecg.modules.demo.pm.config; package org.jeecg.pm.config;
import org.jeecg.pm.hikvision.sdk.client.HikvisionBaseClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionBaseClient;
import org.jeecg.pm.hikvision.sdk.client.HikvisionClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionClient;
......
package org.jeecg.modules.demo.pm.controller; package org.jeecg.pm.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result; ...@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDevice; import org.jeecg.pm.entity.PmAccessControlDevice;
import org.jeecg.modules.demo.pm.service.IPmAccessControlDeviceService; import org.jeecg.pm.service.IPmAccessControlDeviceService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
......
package org.jeecg.modules.demo.pm.controller; package org.jeecg.pm.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result; ...@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDeviceRecord; import org.jeecg.pm.entity.PmAccessControlDeviceRecord;
import org.jeecg.modules.demo.pm.service.IPmAccessControlDeviceRecordService; import org.jeecg.pm.service.IPmAccessControlDeviceRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
......
package org.jeecg.modules.demo.pm.controller; package org.jeecg.pm.controller;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.demo.pm.entity.PmBuildingInfo; import org.jeecg.pm.entity.PmBuildingInfo;
import org.jeecg.pm.hikvision.sdk.client.HikvisionClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionClient;
import org.jeecg.pm.hikvision.sdk.entity.body.vss.preview.HikvisiongetPreviewParamByCameraUuid; import org.jeecg.pm.hikvision.sdk.entity.body.vss.preview.HikvisiongetPreviewParamByCameraUuid;
import org.jeecg.pm.hikvision.sdk.entity.body.vss.res.HikvisionGetCamerasEx; import org.jeecg.pm.hikvision.sdk.entity.body.vss.res.HikvisionGetCamerasEx;
......
package org.jeecg.pm.controller.event; package org.jeecg.pm.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j; ...@@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.pm.entity.event.PmEventInfo; import org.jeecg.pm.entity.PmEventInfo;
import org.jeecg.pm.service.event.IPmEventInfoService; import org.jeecg.pm.service.IPmEventInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
......
package org.jeecg.modules.demo.pm.controller; package org.jeecg.pm.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result; ...@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice; import org.jeecg.pm.entity.PmMonitoringDevice;
import org.jeecg.modules.demo.pm.service.IPmMonitoringDeviceService; import org.jeecg.pm.service.IPmMonitoringDeviceService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
......
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: comm.proto // source: comm.proto
package org.jeecg.pm.entity.eps; package org.jeecg.pm.entity;
public final class Comm { public final class Comm {
private Comm() {} private Comm() {}
......
package org.jeecg.modules.demo.pm.entity; package org.jeecg.pm.entity;
import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
import com.chanjx.utils.JsonUtils; import com.chanjx.utils.JsonUtils;
......
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: event_dis.proto // source: event_dis.proto
package org.jeecg.pm.entity.eps; package org.jeecg.pm.entity;
public final class EventDis { public final class EventDis {
private EventDis() {} private EventDis() {}
......
package org.jeecg.modules.demo.pm.entity; package org.jeecg.pm.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
package org.jeecg.modules.demo.pm.entity; package org.jeecg.pm.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
......
package org.jeecg.modules.demo.pm.entity; package org.jeecg.pm.entity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
......
package org.jeecg.pm.entity.event; package org.jeecg.pm.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
......
package org.jeecg.modules.demo.pm.entity; package org.jeecg.pm.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
......
package org.jeecg.pm.entity.event.enums; package org.jeecg.pm.entity.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
package org.jeecg.pm.entity.event.enums; package org.jeecg.pm.entity.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
package org.jeecg.modules.demo.pm.mapper; package org.jeecg.pm.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDevice; import org.jeecg.pm.entity.PmAccessControlDevice;
/** /**
* @Description: pm_access_control_device * @Description: pm_access_control_device
......
package org.jeecg.modules.demo.pm.mapper; package org.jeecg.pm.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDeviceRecord; import org.jeecg.pm.entity.PmAccessControlDeviceRecord;
/** /**
* @Description: pm_access_control_device_record * @Description: pm_access_control_device_record
......
package org.jeecg.pm.mapper.event; package org.jeecg.pm.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.pm.entity.event.PmEventInfo; import org.jeecg.pm.entity.PmEventInfo;
/** /**
* @Description: pm_event_info * @Description: pm_event_info
......
package org.jeecg.modules.demo.pm.mapper; package org.jeecg.pm.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice; import org.jeecg.pm.entity.PmMonitoringDevice;
/** /**
* @Description: pm_monitoring_device * @Description: pm_monitoring_device
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.pm.mapper.PmMonitoringDeviceMapper"> <mapper namespace="org.jeecg.pm.mapper.PmAccessControlDeviceMapper">
</mapper> </mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.pm.mapper.event.PmEventInfoMapper"> <mapper namespace="org.jeecg.pm.mapper.PmAccessControlDeviceRecordMapper">
</mapper> </mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.pm.mapper.PmAccessControlDeviceMapper"> <mapper namespace="org.jeecg.pm.mapper.PmEventInfoMapper">
</mapper> </mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.pm.mapper.PmAccessControlDeviceRecordMapper"> <mapper namespace="org.jeecg.pm.mapper.PmMonitoringDeviceMapper">
</mapper> </mapper>
\ No newline at end of file
...@@ -4,11 +4,11 @@ package org.jeecg.pm.mq; ...@@ -4,11 +4,11 @@ package org.jeecg.pm.mq;
import com.chanjx.utils.StringUtils; import com.chanjx.utils.StringUtils;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.pm.entity.eps.EventDis; import org.jeecg.pm.entity.EventDis;
import org.jeecg.pm.entity.event.PmEventInfo; import org.jeecg.pm.entity.PmEventInfo;
import org.jeecg.pm.entity.event.enums.EventLevel; import org.jeecg.pm.entity.enums.EventLevel;
import org.jeecg.pm.entity.event.enums.EventState; import org.jeecg.pm.entity.enums.EventState;
import org.jeecg.pm.service.event.IPmEventInfoService; import org.jeecg.pm.service.IPmEventInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jms.annotation.JmsListener; import org.springframework.jms.annotation.JmsListener;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
package org.jeecg.modules.demo.pm.service; package org.jeecg.pm.service;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDeviceRecord;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.pm.entity.PmAccessControlDeviceRecord;
/** /**
* @Description: pm_access_control_device_record * @Description: pm_access_control_device_record
......
package org.jeecg.modules.demo.pm.service; package org.jeecg.pm.service;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDevice;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.pm.entity.PmAccessControlDevice;
/** /**
* @Description: pm_access_control_device * @Description: pm_access_control_device
......
package org.jeecg.pm.service.event; package org.jeecg.pm.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.pm.entity.eps.EventDis; import org.jeecg.pm.entity.PmEventInfo;
import org.jeecg.pm.entity.event.PmEventInfo;
/** /**
* @Description: pm_event_info * @Description: pm_event_info
......
package org.jeecg.modules.demo.pm.service; package org.jeecg.pm.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice; import org.jeecg.pm.entity.PmMonitoringDevice;
import java.util.List; import java.util.List;
......
package org.jeecg.modules.demo.pm.service.impl; package org.jeecg.pm.service.impl;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDeviceRecord;
import org.jeecg.modules.demo.pm.mapper.PmAccessControlDeviceRecordMapper;
import org.jeecg.modules.demo.pm.service.IPmAccessControlDeviceRecordService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.pm.entity.PmAccessControlDeviceRecord;
import org.jeecg.pm.mapper.PmAccessControlDeviceRecordMapper;
import org.jeecg.pm.service.IPmAccessControlDeviceRecordService;
import org.springframework.stereotype.Service;
/** /**
* @Description: pm_access_control_device_record * @Description: pm_access_control_device_record
......
package org.jeecg.modules.demo.pm.service.impl; package org.jeecg.pm.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.jeecg.modules.demo.pm.entity.PmAccessControlDevice;
import org.jeecg.modules.demo.pm.mapper.PmAccessControlDeviceMapper;
import org.jeecg.modules.demo.pm.service.IPmAccessControlDeviceService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.pm.entity.PmAccessControlDevice;
import org.jeecg.pm.mapper.PmAccessControlDeviceMapper;
import org.jeecg.pm.service.IPmAccessControlDeviceService;
import org.springframework.stereotype.Service;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
package org.jeecg.pm.service.impl.event; package org.jeecg.pm.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.pm.entity.event.PmEventInfo; import org.jeecg.pm.entity.PmEventInfo;
import org.jeecg.pm.mapper.event.PmEventInfoMapper; import org.jeecg.pm.mapper.PmEventInfoMapper;
import org.jeecg.pm.service.event.IPmEventInfoService; import org.jeecg.pm.service.IPmEventInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
......
package org.jeecg.modules.demo.pm.service.impl; package org.jeecg.pm.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice; import org.jeecg.pm.entity.PmMonitoringDevice;
import org.jeecg.modules.demo.pm.mapper.PmMonitoringDeviceMapper;
import org.jeecg.modules.demo.pm.service.IPmMonitoringDeviceService;
import org.jeecg.pm.hikvision.sdk.client.HikvisionClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionClient;
import org.jeecg.pm.mapper.PmMonitoringDeviceMapper;
import org.jeecg.pm.service.IPmMonitoringDeviceService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
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