From 631970c21c7e5c445811ef75c422d55970de0894 Mon Sep 17 00:00:00 2001 From: xins Date: Mon, 4 Sep 2023 13:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A11.?= =?UTF-8?q?0.9=E7=89=88=E6=9C=AC=EF=BC=9A=201=E3=80=81=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E3=80=81=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E4=BB=A3=E7=A0=81=E9=87=8D=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E6=88=90=202=E3=80=81=E7=A7=9F=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=203=E3=80=81hw-api-tdengin?= =?UTF-8?q?e=E5=A2=9E=E5=8A=A0imports=E6=96=87=E4=BB=B6=204=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9Tdengine=E8=A7=A3=E6=9E=90=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RemoteTdEngineFallbackFactory.java | 7 + ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../com/ruoyi/i18n/config/I18nConfig.java | 24 +- .../common/core/constant/HwDictConstants.java | 21 + .../HwElectronicFenceController.java | 18 +- .../controller/HwFenceTargetController.java | 16 +- .../controller/HwTenantController.java | 4 +- .../business/domain/HwElectronicFence.java | 94 ++-- .../ruoyi/business/domain/HwFenceTarget.java | 47 +- .../com/ruoyi/business/domain/HwTenant.java | 34 +- .../mapper/HwElectronicFenceMapper.java | 4 +- .../business/mapper/HwFenceTargetMapper.java | 16 +- .../ruoyi/business/mapper/HwTenantMapper.java | 4 +- .../service/IHwElectronicFenceService.java | 4 +- .../service/IHwFenceTargetService.java | 16 +- .../business/service/IHwTenantService.java | 4 +- .../impl/HwElectronicFenceServiceImpl.java | 4 +- .../impl/HwFenceTargetServiceImpl.java | 22 +- .../service/impl/HwTenantServiceImpl.java | 4 +- .../business/HwElectronicFenceMapper.xml | 62 +-- .../mapper/business/HwFenceTargetMapper.xml | 36 +- .../mapper/business/HwTenantMapper.xml | 8 +- .../com/hw/mqtt/HwMqttBrokerApplication.java | 3 +- .../ruoyi/tdengine/HwTdengineApplication.java | 2 +- .../mapper/tdengine/TdEngineMapper.xml | 231 +++++----- ruoyi-ui/src/api/business/effectiveFence.js | 44 -- ruoyi-ui/src/api/business/fenceTarget.js | 8 +- .../views/business/effectiveFence/index.vue | 408 ------------------ .../src/views/business/fenceTarget/index.vue | 282 ------------ ruoyi-ui/src/views/business/tenant/index.vue | 142 ++---- 30 files changed, 395 insertions(+), 1176 deletions(-) create mode 100644 ruoyi-api/hw-api-tdengine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java delete mode 100644 ruoyi-ui/src/api/business/effectiveFence.js delete mode 100644 ruoyi-ui/src/views/business/effectiveFence/index.vue delete mode 100644 ruoyi-ui/src/views/business/fenceTarget/index.vue diff --git a/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/factory/RemoteTdEngineFallbackFactory.java b/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/factory/RemoteTdEngineFallbackFactory.java index 4a82b59..cea5bb7 100644 --- a/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/factory/RemoteTdEngineFallbackFactory.java +++ b/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/factory/RemoteTdEngineFallbackFactory.java @@ -10,6 +10,13 @@ import org.springframework.stereotype.Component; import java.util.Map; +/** + * @Description: TDengine服务降级处理 + * @ClassName: RemoteTdEngineFallbackFactory + * @Author : xins + * @Date :2023-09-01 14:14 + * @Version :1.0 + */ @Component public class RemoteTdEngineFallbackFactory implements FallbackFactory { diff --git a/ruoyi-api/hw-api-tdengine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/hw-api-tdengine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..e812c49 --- /dev/null +++ b/ruoyi-api/hw-api-tdengine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.tdengine.api.factory.RemoteTdEngineFallbackFactory + diff --git a/ruoyi-common/hw-common-i18n/src/main/java/com/ruoyi/i18n/config/I18nConfig.java b/ruoyi-common/hw-common-i18n/src/main/java/com/ruoyi/i18n/config/I18nConfig.java index 9c0b006..b29a696 100644 --- a/ruoyi-common/hw-common-i18n/src/main/java/com/ruoyi/i18n/config/I18nConfig.java +++ b/ruoyi-common/hw-common-i18n/src/main/java/com/ruoyi/i18n/config/I18nConfig.java @@ -49,18 +49,18 @@ public class I18nConfig implements WebMvcConfigurer return lci; } - @Bean - public MessageSource messageSource() { - ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); - messageSource.setBasenames("classpath:i18n/messages"); - messageSource.setDefaultEncoding("utf-8"); - //设置缓存时间1个小时 1*60*60*1000毫秒 - //可以设置成-1表示永久缓存，设置成0表示每次都从文件中读取 - messageSource.setCacheMillis(1*60*60*1000); - messageSource.setFallbackToSystemLocale(true); - - return messageSource; - } +// @Bean +// public MessageSource messageSource() { +// ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); +// messageSource.setBasenames("classpath:i18n/messages"); +// messageSource.setDefaultEncoding("utf-8"); +// //设置缓存时间1个小时 1*60*60*1000毫秒 +// //可以设置成-1表示永久缓存，设置成0表示每次都从文件中读取 +// messageSource.setCacheMillis(1*60*60*1000); +// messageSource.setFallbackToSystemLocale(true); +// +// return messageSource; +// } @Override diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java new file mode 100644 index 0000000..00417ac --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java @@ -0,0 +1,21 @@ +package com.ruoyi.common.core.constant; + +/** + * @Description: 平台常量字典信息 + * @ClassName: HwDictConstants + * @Author : xins + * @Date :2023-09-03 12:27 + * @Version :1.0 + */ +public class HwDictConstants { + + public static final String EFFECTIVE_TIME_FLAG_LONG = "1";//长期有效 + public static final String EFFECTIVE_TIME_FLAG_RANGE = "2";//时间范围 + + public static final String AREA_SHAPE_FLAG_POLYGN = "1";//多边形 + public static final String AREA_SHAPE_FLAG_CIRCULA = "2";//圆形 + + public static final String DEFAULT_FUNCTION_LONGITUDE_IDENTIFIER = "longitude";//经度标识符 + public static final String DEFAULT_FUNCTION_LATITUDE_IDENTIFIER = "latitude";//纬度标识符 + +} diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwElectronicFenceController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwElectronicFenceController.java index 53f25f7..0068f1a 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwElectronicFenceController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwElectronicFenceController.java @@ -25,11 +25,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo; /** * 电子围栏Controller * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ @RestController -@RequestMapping("/effectiveFence") +@RequestMapping("/electronicFence") public class HwElectronicFenceController extends BaseController { @Autowired @@ -38,7 +38,7 @@ public class HwElectronicFenceController extends BaseController /** * 查询电子围栏列表 */ - @RequiresPermissions("business:effectiveFence:list") + @RequiresPermissions("business:electronicFence:list") @GetMapping("/list") public TableDataInfo list(HwElectronicFence hwElectronicFence) { @@ -50,7 +50,7 @@ public class HwElectronicFenceController extends BaseController /** * 导出电子围栏列表 */ - @RequiresPermissions("business:effectiveFence:export") + @RequiresPermissions("business:electronicFence:export") @Log(title = "电子围栏", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwElectronicFence hwElectronicFence) @@ -63,7 +63,7 @@ public class HwElectronicFenceController extends BaseController /** * 获取电子围栏详细信息 */ - @RequiresPermissions("business:effectiveFence:query") + @RequiresPermissions("business:electronicFence:query") @GetMapping(value = "/{electronicFenceId}") public AjaxResult getInfo(@PathVariable("electronicFenceId") Long electronicFenceId) { @@ -73,7 +73,7 @@ public class HwElectronicFenceController extends BaseController /** * 新增电子围栏 */ - @RequiresPermissions("business:effectiveFence:add") + @RequiresPermissions("business:electronicFence:add") @Log(title = "电子围栏", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwElectronicFence hwElectronicFence) @@ -84,7 +84,7 @@ public class HwElectronicFenceController extends BaseController /** * 修改电子围栏 */ - @RequiresPermissions("business:effectiveFence:edit") + @RequiresPermissions("business:electronicFence:edit") @Log(title = "电子围栏", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwElectronicFence hwElectronicFence) @@ -95,7 +95,7 @@ public class HwElectronicFenceController extends BaseController /** * 删除电子围栏 */ - @RequiresPermissions("business:effectiveFence:remove") + @RequiresPermissions("business:electronicFence:remove") @Log(title = "电子围栏", businessType = BusinessType.DELETE) @DeleteMapping("/{electronicFenceIds}") public AjaxResult remove(@PathVariable Long[] electronicFenceIds) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwFenceTargetController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwFenceTargetController.java index a16d86b..ddb63d0 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwFenceTargetController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwFenceTargetController.java @@ -25,8 +25,8 @@ import com.ruoyi.common.core.web.page.TableDataInfo; /** * 电子围栏目标Controller * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ @RestController @RequestMapping("/fenceTarget") @@ -64,10 +64,10 @@ public class HwFenceTargetController extends BaseController * 获取电子围栏目标详细信息 */ @RequiresPermissions("business:fenceTarget:query") - @GetMapping(value = "/{fenceTargetId}") - public AjaxResult getInfo(@PathVariable("fenceTargetId") Long fenceTargetId) + @GetMapping(value = "/{targetId}") + public AjaxResult getInfo(@PathVariable("targetId") Long targetId) { - return success(hwFenceTargetService.selectHwFenceTargetByFenceTargetId(fenceTargetId)); + return success(hwFenceTargetService.selectHwFenceTargetByTargetId(targetId)); } /** @@ -97,9 +97,9 @@ public class HwFenceTargetController extends BaseController */ @RequiresPermissions("business:fenceTarget:remove") @Log(title = "电子围栏目标", businessType = BusinessType.DELETE) - @DeleteMapping("/{fenceTargetIds}") - public AjaxResult remove(@PathVariable Long[] fenceTargetIds) + @DeleteMapping("/{targetIds}") + public AjaxResult remove(@PathVariable Long[] targetIds) { - return toAjax(hwFenceTargetService.deleteHwFenceTargetByFenceTargetIds(fenceTargetIds)); + return toAjax(hwFenceTargetService.deleteHwFenceTargetByTargetIds(targetIds)); } } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwTenantController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwTenantController.java index ba63aff..2a5c99e 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwTenantController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwTenantController.java @@ -25,8 +25,8 @@ import com.ruoyi.common.core.web.page.TableDataInfo; /** * 租户信息Controller * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ @RestController @RequestMapping("/tenant") diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwElectronicFence.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwElectronicFence.java index 40e4d15..9fe3f33 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwElectronicFence.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwElectronicFence.java @@ -8,8 +8,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity; /** * 电子围栏对象 hw_electronic_fence * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public class HwElectronicFence extends BaseEntity { @@ -22,41 +22,41 @@ public class HwElectronicFence extends BaseEntity @Excel(name = "电子围栏名称") private String electronicFenceName; - /** 所属场景 */ - @Excel(name = "所属场景") + /** 所属场景，关联hw_scene表的scene_id字段 */ + @Excel(name = "所属场景，关联hw_scene表的scene_id字段") private Long sceneId; - /** 规则类型 */ - @Excel(name = "规则类型") - private Long fenceType; + /** 规则类型（1、设备，2、监控单元，3、场景） */ + @Excel(name = "规则类型", readConverterExp = "1=、设备，2、监控单元，3、场景") + private String fenceType; - /** 生效时间标识 */ - @Excel(name = "生效时间标识") - private Long effectiveTimeFlag; + /** 生效时间标识（1、长期有效，2、时间范围） */ + @Excel(name = "生效时间标识", readConverterExp = "1=、长期有效，2、时间范围") + private String effectiveTimeFlag; - /** 生效时间：开始时间_结束时间_状态，多个用|隔开（例如00:00_05:00_1|06:00_08:00_0）,状态：（1、开启、2、关闭） */ - @Excel(name = "生效时间：开始时间_结束时间_状态，多个用|隔开", readConverterExp = "例=如00:00_05:00_1|06:00_08:00_0") + /** 时区 */ + @Excel(name = "时区") + private String timeZone; + + /** 格式：开始时间_结束时间_状态，多个用|隔开（例如00:00_05:00_1|06:00_08:00_0）,状态：（1、开启、2、关闭） */ + @Excel(name = "格式：开始时间_结束时间_状态，多个用|隔开", readConverterExp = "例=如00:00_05:00_1|06:00_08:00_0") private String effectiveTime; /** 触发状态（0、关闭，1、出界，2、入界，3、双向） */ @Excel(name = "触发状态", readConverterExp = "0=、关闭，1、出界，2、入界，3、双向") - private Long triggerStatus; + private String triggerStatus; /** 区域形状（1、多边形，2、圆形） */ @Excel(name = "区域形状", readConverterExp = "1=、多边形，2、圆形") - private Long areaShapeFlag; + private String areaShapeFlag; - /** 为多边形时的区域范围（保存格式，经度_纬度，多个以|隔开） */ - @Excel(name = "为多边形时的区域范围", readConverterExp = "保=存格式，经度_纬度，多个以|隔开") - private String polygonAreaRange; - - /** 为圆形时的中心点和半径，下划线隔开 */ - @Excel(name = "为圆形时的中心点和半径，下划线隔开") - private String circleAreaRange; + /** 区域范围：为多边形时保存格式，经度_纬度，多个以|隔开；为圆形时的中心点和半径，下划线隔开 */ + @Excel(name = "区域范围：为多边形时保存格式，经度_纬度，多个以|隔开；为圆形时的中心点和半径，下划线隔开") + private String areaRange; /** 报警推送标识(1、是，0、否） */ @Excel(name = "报警推送标识(1、是，0、否）") - private Long fencePushFlag; + private String fencePushFlag; /** 报警推送内容 */ @Excel(name = "报警推送内容") @@ -97,24 +97,33 @@ public class HwElectronicFence extends BaseEntity { return sceneId; } - public void setFenceType(Long fenceType) + public void setFenceType(String fenceType) { this.fenceType = fenceType; } - public Long getFenceType() + public String getFenceType() { return fenceType; } - public void setEffectiveTimeFlag(Long effectiveTimeFlag) + public void setEffectiveTimeFlag(String effectiveTimeFlag) { this.effectiveTimeFlag = effectiveTimeFlag; } - public Long getEffectiveTimeFlag() + public String getEffectiveTimeFlag() { return effectiveTimeFlag; } + public void setTimeZone(String timeZone) + { + this.timeZone = timeZone; + } + + public String getTimeZone() + { + return timeZone; + } public void setEffectiveTime(String effectiveTime) { this.effectiveTime = effectiveTime; @@ -124,48 +133,39 @@ public class HwElectronicFence extends BaseEntity { return effectiveTime; } - public void setTriggerStatus(Long triggerStatus) + public void setTriggerStatus(String triggerStatus) { this.triggerStatus = triggerStatus; } - public Long getTriggerStatus() + public String getTriggerStatus() { return triggerStatus; } - public void setAreaShapeFlag(Long areaShapeFlag) + public void setAreaShapeFlag(String areaShapeFlag) { this.areaShapeFlag = areaShapeFlag; } - public Long getAreaShapeFlag() + public String getAreaShapeFlag() { return areaShapeFlag; } - public void setPolygonAreaRange(String polygonAreaRange) + public void setAreaRange(String areaRange) { - this.polygonAreaRange = polygonAreaRange; + this.areaRange = areaRange; } - public String getPolygonAreaRange() + public String getAreaRange() { - return polygonAreaRange; + return areaRange; } - public void setCircleAreaRange(String circleAreaRange) - { - this.circleAreaRange = circleAreaRange; - } - - public String getCircleAreaRange() - { - return circleAreaRange; - } - public void setFencePushFlag(Long fencePushFlag) + public void setFencePushFlag(String fencePushFlag) { this.fencePushFlag = fencePushFlag; } - public Long getFencePushFlag() + public String getFencePushFlag() { return fencePushFlag; } @@ -205,11 +205,11 @@ public class HwElectronicFence extends BaseEntity .append("sceneId", getSceneId()) .append("fenceType", getFenceType()) .append("effectiveTimeFlag", getEffectiveTimeFlag()) + .append("timeZone", getTimeZone()) .append("effectiveTime", getEffectiveTime()) .append("triggerStatus", getTriggerStatus()) .append("areaShapeFlag", getAreaShapeFlag()) - .append("polygonAreaRange", getPolygonAreaRange()) - .append("circleAreaRange", getCircleAreaRange()) + .append("areaRange", getAreaRange()) .append("fencePushFlag", getFencePushFlag()) .append("fencePushContent", getFencePushContent()) .append("fenceRecoverContent", getFenceRecoverContent()) diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwFenceTarget.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwFenceTarget.java index f1c403b..0088e75 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwFenceTarget.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwFenceTarget.java @@ -8,16 +8,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity; /** * 电子围栏目标对象 hw_fence_target * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public class HwFenceTarget extends BaseEntity { private static final long serialVersionUID = 1L; - /** 电子围栏目标ID */ - private Long fenceTargetId; - /** 电子围栏ID */ @Excel(name = "电子围栏ID") private Long electronicFenceId; @@ -26,23 +23,10 @@ public class HwFenceTarget extends BaseEntity @Excel(name = "目标类型", readConverterExp = "1=、设备，2、监控单元") private String targetType; - /** 设备，关联表hw_device字段device_id */ - @Excel(name = "设备，关联表hw_device字段device_id") - private Long deviceId; + /** target_type为1时，关联表hw_device字段device_id +target_type为2时，关联表hw_monitor_unit字段monitor_unit_id */ + private Long targetId; - /** 所属监控单元，关联表hw_monitor_unit字段monitor_unit_id */ - @Excel(name = "所属监控单元，关联表hw_monitor_unit字段monitor_unit_id") - private Long monitorUnitId; - - public void setFenceTargetId(Long fenceTargetId) - { - this.fenceTargetId = fenceTargetId; - } - - public Long getFenceTargetId() - { - return fenceTargetId; - } public void setElectronicFenceId(Long electronicFenceId) { this.electronicFenceId = electronicFenceId; @@ -61,33 +45,22 @@ public class HwFenceTarget extends BaseEntity { return targetType; } - public void setDeviceId(Long deviceId) + public void setTargetId(Long targetId) { - this.deviceId = deviceId; + this.targetId = targetId; } - public Long getDeviceId() + public Long getTargetId() { - return deviceId; - } - public void setMonitorUnitId(Long monitorUnitId) - { - this.monitorUnitId = monitorUnitId; - } - - public Long getMonitorUnitId() - { - return monitorUnitId; + return targetId; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("fenceTargetId", getFenceTargetId()) .append("electronicFenceId", getElectronicFenceId()) .append("targetType", getTargetType()) - .append("deviceId", getDeviceId()) - .append("monitorUnitId", getMonitorUnitId()) + .append("targetId", getTargetId()) .toString(); } } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwTenant.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwTenant.java index 129f419..7d0d79b 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwTenant.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwTenant.java @@ -8,8 +8,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity; /** * 租户信息对象 hw_tenant * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public class HwTenant extends BaseEntity { @@ -18,16 +18,16 @@ public class HwTenant extends BaseEntity /** 租户ID */ private Long tenantId; - /** 租户类型 */ - @Excel(name = "租户类型") - private Long tenantType; + /** 租户类型，(1、企业，2、个人) */ + @Excel(name = "租户类型，(1、企业，2、个人)") + private String tenantType; /** 租户名称 */ @Excel(name = "租户名称") private String tenantName; - /** 行业类型 */ - @Excel(name = "行业类型") + /** 行业类型，关联sys_dict_data的dict_type是hw_tenant_industry的dict_value */ + @Excel(name = "行业类型，关联sys_dict_data的dict_type是hw_tenant_industry的dict_value") private Long tenantIndustry; /** 联系人姓名 */ @@ -42,24 +42,24 @@ public class HwTenant extends BaseEntity @Excel(name = "邮箱地址") private String email; - /** 区域ID */ - @Excel(name = "区域ID") + /** 区域ID，管理区域hw_area */ + @Excel(name = "区域ID，管理区域hw_area") private Long areaId; /** 联系人地址 */ @Excel(name = "联系人地址") private String contactAddress; - /** 状态 */ - @Excel(name = "状态") + /** 状态（1、正常 9、删除） */ + @Excel(name = "状态", readConverterExp = "1=、正常,9=、删除") private String tenantStatus; - /** 是否外部注册 */ - @Excel(name = "是否外部注册") + /** 是否外部注册（1、是 0、否） */ + @Excel(name = "是否外部注册", readConverterExp = "1=、是,0=、否") private String isRegister; - /** 租户等级 */ - @Excel(name = "租户等级") + /** 租户等级，预留字段 */ + @Excel(name = "租户等级，预留字段") private Long tenantGrade; /** 预留字段 */ @@ -75,12 +75,12 @@ public class HwTenant extends BaseEntity { return tenantId; } - public void setTenantType(Long tenantType) + public void setTenantType(String tenantType) { this.tenantType = tenantType; } - public Long getTenantType() + public String getTenantType() { return tenantType; } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwElectronicFenceMapper.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwElectronicFenceMapper.java index dbefa5a..9abc269 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwElectronicFenceMapper.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwElectronicFenceMapper.java @@ -6,8 +6,8 @@ import com.ruoyi.business.domain.HwElectronicFence; /** * 电子围栏Mapper接口 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public interface HwElectronicFenceMapper { diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwFenceTargetMapper.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwFenceTargetMapper.java index de2b72d..c2cb8e7 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwFenceTargetMapper.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwFenceTargetMapper.java @@ -6,18 +6,18 @@ import com.ruoyi.business.domain.HwFenceTarget; /** * 电子围栏目标Mapper接口 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public interface HwFenceTargetMapper { /** * 查询电子围栏目标 * - * @param fenceTargetId 电子围栏目标主键 + * @param targetId 电子围栏目标主键 * @return 电子围栏目标 */ - public HwFenceTarget selectHwFenceTargetByFenceTargetId(Long fenceTargetId); + public HwFenceTarget selectHwFenceTargetByTargetId(Long targetId); /** * 查询电子围栏目标列表 @@ -46,16 +46,16 @@ public interface HwFenceTargetMapper /** * 删除电子围栏目标 * - * @param fenceTargetId 电子围栏目标主键 + * @param targetId 电子围栏目标主键 * @return 结果 */ - public int deleteHwFenceTargetByFenceTargetId(Long fenceTargetId); + public int deleteHwFenceTargetByTargetId(Long targetId); /** * 批量删除电子围栏目标 * - * @param fenceTargetIds 需要删除的数据主键集合 + * @param targetIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteHwFenceTargetByFenceTargetIds(Long[] fenceTargetIds); + public int deleteHwFenceTargetByTargetIds(Long[] targetIds); } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwTenantMapper.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwTenantMapper.java index 379ea16..fe96e2f 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwTenantMapper.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwTenantMapper.java @@ -6,8 +6,8 @@ import com.ruoyi.business.domain.HwTenant; /** * 租户信息Mapper接口 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public interface HwTenantMapper { diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwElectronicFenceService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwElectronicFenceService.java index d8c67b9..2f340b0 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwElectronicFenceService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwElectronicFenceService.java @@ -6,8 +6,8 @@ import com.ruoyi.business.domain.HwElectronicFence; /** * 电子围栏Service接口 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public interface IHwElectronicFenceService { diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwFenceTargetService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwFenceTargetService.java index 25a49a3..26b77d0 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwFenceTargetService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwFenceTargetService.java @@ -6,18 +6,18 @@ import com.ruoyi.business.domain.HwFenceTarget; /** * 电子围栏目标Service接口 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public interface IHwFenceTargetService { /** * 查询电子围栏目标 * - * @param fenceTargetId 电子围栏目标主键 + * @param targetId 电子围栏目标主键 * @return 电子围栏目标 */ - public HwFenceTarget selectHwFenceTargetByFenceTargetId(Long fenceTargetId); + public HwFenceTarget selectHwFenceTargetByTargetId(Long targetId); /** * 查询电子围栏目标列表 @@ -46,16 +46,16 @@ public interface IHwFenceTargetService /** * 批量删除电子围栏目标 * - * @param fenceTargetIds 需要删除的电子围栏目标主键集合 + * @param targetIds 需要删除的电子围栏目标主键集合 * @return 结果 */ - public int deleteHwFenceTargetByFenceTargetIds(Long[] fenceTargetIds); + public int deleteHwFenceTargetByTargetIds(Long[] targetIds); /** * 删除电子围栏目标信息 * - * @param fenceTargetId 电子围栏目标主键 + * @param targetId 电子围栏目标主键 * @return 结果 */ - public int deleteHwFenceTargetByFenceTargetId(Long fenceTargetId); + public int deleteHwFenceTargetByTargetId(Long targetId); } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwTenantService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwTenantService.java index 85c8dcd..423abcb 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwTenantService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwTenantService.java @@ -6,8 +6,8 @@ import com.ruoyi.business.domain.HwTenant; /** * 租户信息Service接口 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ public interface IHwTenantService { diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwElectronicFenceServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwElectronicFenceServiceImpl.java index 2a78619..b30c579 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwElectronicFenceServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwElectronicFenceServiceImpl.java @@ -11,8 +11,8 @@ import com.ruoyi.business.service.IHwElectronicFenceService; /** * 电子围栏Service业务层处理 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ @Service public class HwElectronicFenceServiceImpl implements IHwElectronicFenceService diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwFenceTargetServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwFenceTargetServiceImpl.java index 3827279..0e494f5 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwFenceTargetServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwFenceTargetServiceImpl.java @@ -10,8 +10,8 @@ import com.ruoyi.business.service.IHwFenceTargetService; /** * 电子围栏目标Service业务层处理 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ @Service public class HwFenceTargetServiceImpl implements IHwFenceTargetService @@ -22,13 +22,13 @@ public class HwFenceTargetServiceImpl implements IHwFenceTargetService /** * 查询电子围栏目标 * - * @param fenceTargetId 电子围栏目标主键 + * @param targetId 电子围栏目标主键 * @return 电子围栏目标 */ @Override - public HwFenceTarget selectHwFenceTargetByFenceTargetId(Long fenceTargetId) + public HwFenceTarget selectHwFenceTargetByTargetId(Long targetId) { - return hwFenceTargetMapper.selectHwFenceTargetByFenceTargetId(fenceTargetId); + return hwFenceTargetMapper.selectHwFenceTargetByTargetId(targetId); } /** @@ -70,24 +70,24 @@ public class HwFenceTargetServiceImpl implements IHwFenceTargetService /** * 批量删除电子围栏目标 * - * @param fenceTargetIds 需要删除的电子围栏目标主键 + * @param targetIds 需要删除的电子围栏目标主键 * @return 结果 */ @Override - public int deleteHwFenceTargetByFenceTargetIds(Long[] fenceTargetIds) + public int deleteHwFenceTargetByTargetIds(Long[] targetIds) { - return hwFenceTargetMapper.deleteHwFenceTargetByFenceTargetIds(fenceTargetIds); + return hwFenceTargetMapper.deleteHwFenceTargetByTargetIds(targetIds); } /** * 删除电子围栏目标信息 * - * @param fenceTargetId 电子围栏目标主键 + * @param targetId 电子围栏目标主键 * @return 结果 */ @Override - public int deleteHwFenceTargetByFenceTargetId(Long fenceTargetId) + public int deleteHwFenceTargetByTargetId(Long targetId) { - return hwFenceTargetMapper.deleteHwFenceTargetByFenceTargetId(fenceTargetId); + return hwFenceTargetMapper.deleteHwFenceTargetByTargetId(targetId); } } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwTenantServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwTenantServiceImpl.java index 03463db..5c856e3 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwTenantServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwTenantServiceImpl.java @@ -11,8 +11,8 @@ import com.ruoyi.business.service.IHwTenantService; /** * 租户信息Service业务层处理 * - * @author YINQ - * @date 2023-08-31 + * @author xins + * @date 2023-09-04 */ @Service public class HwTenantServiceImpl implements IHwTenantService diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml index 7383b5c..5c6892e 100644 --- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml +++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml @@ -10,11 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select electronic_fence_id, electronic_fence_name, scene_id, fence_type, effective_time_flag, effective_time, trigger_status, area_shape_flag, polygon_area_range, circle_area_range, fence_push_flag, fence_push_content, fence_recover_content, remark, create_by, create_time, update_by, update_time, fence_field from hw_electronic_fence + select electronic_fence_id, electronic_fence_name, scene_id, fence_type, effective_time_flag, time_zone, effective_time, trigger_status, area_shape_flag, area_range, fence_push_flag, fence_push_content, fence_recover_content, remark, create_by, create_time, update_by, update_time, fence_field from hw_electronic_fence @@ -21,29 +19,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and electronic_fence_id = #{electronicFenceId} and target_type = #{targetType} - and device_id = #{deviceId} - and monitor_unit_id = #{monitorUnitId} - - where fence_target_id = #{fenceTargetId} + where target_id = #{targetId} - + insert into hw_fence_target electronic_fence_id, target_type, - device_id, - monitor_unit_id, + target_id, #{electronicFenceId}, #{targetType}, - #{deviceId}, - #{monitorUnitId}, + #{targetId}, @@ -52,20 +46,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" electronic_fence_id = #{electronicFenceId}, target_type = #{targetType}, - device_id = #{deviceId}, - monitor_unit_id = #{monitorUnitId}, - where fence_target_id = #{fenceTargetId} + where target_id = #{targetId} - - delete from hw_fence_target where fence_target_id = #{fenceTargetId} + + delete from hw_fence_target where target_id = #{targetId} - - delete from hw_fence_target where fence_target_id in - - #{fenceTargetId} + + delete from hw_fence_target where target_id in + + #{targetId} \ No newline at end of file diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwTenantMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwTenantMapper.xml index b3bf180..3c3f0a3 100644 --- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwTenantMapper.xml +++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwTenantMapper.xml @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select last(*) from #{databaseName}.#{tableName} diff --git a/ruoyi-ui/src/api/business/effectiveFence.js b/ruoyi-ui/src/api/business/effectiveFence.js deleted file mode 100644 index b4a0745..0000000 --- a/ruoyi-ui/src/api/business/effectiveFence.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询电子围栏列表 -export function listEffectiveFence(query) { - return request({ - url: '/business/effectiveFence/list', - method: 'get', - params: query - }) -} - -// 查询电子围栏详细 -export function getEffectiveFence(electronicFenceId) { - return request({ - url: '/business/effectiveFence/' + electronicFenceId, - method: 'get' - }) -} - -// 新增电子围栏 -export function addEffectiveFence(data) { - return request({ - url: '/business/effectiveFence', - method: 'post', - data: data - }) -} - -// 修改电子围栏 -export function updateEffectiveFence(data) { - return request({ - url: '/business/effectiveFence', - method: 'put', - data: data - }) -} - -// 删除电子围栏 -export function delEffectiveFence(electronicFenceId) { - return request({ - url: '/business/effectiveFence/' + electronicFenceId, - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/api/business/fenceTarget.js b/ruoyi-ui/src/api/business/fenceTarget.js index 6de7b26..0b1e434 100644 --- a/ruoyi-ui/src/api/business/fenceTarget.js +++ b/ruoyi-ui/src/api/business/fenceTarget.js @@ -10,9 +10,9 @@ export function listFenceTarget(query) { } // 查询电子围栏目标详细 -export function getFenceTarget(fenceTargetId) { +export function getFenceTarget(targetId) { return request({ - url: '/business/fenceTarget/' + fenceTargetId, + url: '/business/fenceTarget/' + targetId, method: 'get' }) } @@ -36,9 +36,9 @@ export function updateFenceTarget(data) { } // 删除电子围栏目标 -export function delFenceTarget(fenceTargetId) { +export function delFenceTarget(targetId) { return request({ - url: '/business/fenceTarget/' + fenceTargetId, + url: '/business/fenceTarget/' + targetId, method: 'delete' }) } diff --git a/ruoyi-ui/src/views/business/effectiveFence/index.vue b/ruoyi-ui/src/views/business/effectiveFence/index.vue deleted file mode 100644 index 0fee529..0000000 --- a/ruoyi-ui/src/views/business/effectiveFence/index.vue +++ /dev/null @@ -1,408 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/business/fenceTarget/index.vue b/ruoyi-ui/src/views/business/fenceTarget/index.vue deleted file mode 100644 index 060eef6..0000000 --- a/ruoyi-ui/src/views/business/fenceTarget/index.vue +++ /dev/null @@ -1,282 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/business/tenant/index.vue b/ruoyi-ui/src/views/business/tenant/index.vue index ac14a29..bf55312 100644 --- a/ruoyi-ui/src/views/business/tenant/index.vue +++ b/ruoyi-ui/src/views/business/tenant/index.vue @@ -1,16 +1,6 @@