diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/entity/BusinessEarlyEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/entity/BusinessEarlyEntity.java similarity index 95% rename from hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/entity/BusinessEarlyEntity.java rename to hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/entity/BusinessEarlyEntity.java index c0b0596..b1abce4 100644 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/entity/BusinessEarlyEntity.java +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/entity/BusinessEarlyEntity.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.business.entity; +package com.hnac.hzims.business.early.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/feign/BusinessEarlyClientFallback.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/feign/BusinessEarlyClientFallback.java similarity index 73% rename from hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/feign/BusinessEarlyClientFallback.java rename to hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/feign/BusinessEarlyClientFallback.java index 8bf7032..1be7091 100644 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/feign/BusinessEarlyClientFallback.java +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/feign/BusinessEarlyClientFallback.java @@ -1,6 +1,6 @@ -package com.hnac.hzims.business.feign; +package com.hnac.hzims.business.early.feign; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; +import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; import org.springblade.core.tool.api.R; import org.springframework.stereotype.Component; diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/feign/IBusinessEarlyClient.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/feign/IBusinessEarlyClient.java similarity index 85% rename from hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/feign/IBusinessEarlyClient.java rename to hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/feign/IBusinessEarlyClient.java index cfb3b93..3975b71 100644 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/feign/IBusinessEarlyClient.java +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/feign/IBusinessEarlyClient.java @@ -1,7 +1,7 @@ -package com.hnac.hzims.business.feign; +package com.hnac.hzims.business.early.feign; import com.hnac.hzims.alarm.config.constants.AlarmConstants; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; +import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/vo/BusinessEarlyVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/vo/BusinessEarlyVo.java similarity index 76% rename from hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/vo/BusinessEarlyVo.java rename to hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/vo/BusinessEarlyVo.java index 7cda295..3b65646 100644 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/vo/BusinessEarlyVo.java +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/early/vo/BusinessEarlyVo.java @@ -1,6 +1,6 @@ -package com.hnac.hzims.business.vo; +package com.hnac.hzims.business.early.vo; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; +import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/interruption/entity/InterruptionEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/interruption/entity/InterruptionEntity.java new file mode 100644 index 0000000..106e6a1 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/business/interruption/entity/InterruptionEntity.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.business.interruption.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * @author ysj + */ +@Data +@TableName("hzims_interruption_alarm") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "数据中断告警", description = "数据中断告警对象") +public class InterruptionEntity extends TenantEntity { + +} \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/controller/BusinessEarlyController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/controller/BusinessEarlyController.java index f696b61..ecd8ebd 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/controller/BusinessEarlyController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/controller/BusinessEarlyController.java @@ -4,12 +4,7 @@ package com.hnac.hzims.business.early.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.business.early.service.BusinessEarlyService; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; -import com.hnac.hzims.business.vo.BusinessEarlyVo; -import com.hnac.hzims.common.logs.annotation.OperationAnnotation; -import com.hnac.hzims.common.logs.enums.BusinessType; -import com.hnac.hzims.common.logs.enums.OperatorType; -import com.hnac.hzims.operational.access.vo.ConstructionVo; +import com.hnac.hzims.business.early.vo.BusinessEarlyVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/feign/BusinessEarlyClient.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/feign/BusinessEarlyClient.java index 6a60e98..2ecd584 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/feign/BusinessEarlyClient.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/feign/BusinessEarlyClient.java @@ -1,8 +1,7 @@ package com.hnac.hzims.business.early.feign; import com.hnac.hzims.business.early.service.BusinessEarlyService; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; -import com.hnac.hzims.business.feign.IBusinessEarlyClient; +import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.api.R; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/mapper/BusinessEarlyMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/mapper/BusinessEarlyMapper.java index 0cbe996..e199eff 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/mapper/BusinessEarlyMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/mapper/BusinessEarlyMapper.java @@ -1,7 +1,7 @@ package com.hnac.hzims.business.early.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; +import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; /** * @author ysj diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java index 507af9d..c39935d 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java @@ -1,9 +1,8 @@ package com.hnac.hzims.business.early.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; -import com.hnac.hzims.business.vo.BusinessEarlyVo; -import com.hnac.hzims.operational.access.vo.ConstructionVo; +import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; +import com.hnac.hzims.business.early.vo.BusinessEarlyVo; import org.springblade.core.mp.base.BaseService; /** diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java index de0f0ad..07e9a0e 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java @@ -3,8 +3,8 @@ package com.hnac.hzims.business.early.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.business.early.mapper.BusinessEarlyMapper; import com.hnac.hzims.business.early.service.BusinessEarlyService; -import com.hnac.hzims.business.entity.BusinessEarlyEntity; -import com.hnac.hzims.business.vo.BusinessEarlyVo; +import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; +import com.hnac.hzims.business.early.vo.BusinessEarlyVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/controller/InterruptionController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/controller/InterruptionController.java new file mode 100644 index 0000000..ea7c9f4 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/controller/InterruptionController.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.business.interruption.controller; + + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author ysj + */ +@Api(tags = {"数据中断告警"}) +@RestController +@AllArgsConstructor +@RequestMapping("/interruption") +public class InterruptionController extends BladeController { + + +} \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/mapper/InterruptionMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/mapper/InterruptionMapper.java new file mode 100644 index 0000000..0dc35e1 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/mapper/InterruptionMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.business.interruption.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.business.interruption.entity.InterruptionEntity; + +/** + * @author ysj + */ +public interface InterruptionMapper extends BaseMapper { + +} diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/mapper/InterruptionMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/mapper/InterruptionMapper.xml new file mode 100644 index 0000000..fda3915 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/mapper/InterruptionMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/InterruptionService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/InterruptionService.java new file mode 100644 index 0000000..621fd98 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/InterruptionService.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.business.interruption.service; + +import com.hnac.hzims.business.interruption.entity.InterruptionEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface InterruptionService extends BaseService { + +} diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/impl/InterruptionServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/impl/InterruptionServiceImpl.java new file mode 100644 index 0000000..9767bb6 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/impl/InterruptionServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.business.interruption.service.impl; + +import com.hnac.hzims.business.interruption.entity.InterruptionEntity; +import com.hnac.hzims.business.interruption.mapper.InterruptionMapper; +import com.hnac.hzims.business.interruption.service.InterruptionService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@AllArgsConstructor +@Service +@Slf4j +public class InterruptionServiceImpl extends BaseServiceImpl implements InterruptionService { + +} \ No newline at end of file