From a9895296f0e612a724b33a1d634f6874643f241b Mon Sep 17 00:00:00 2001 From: LEED Date: Sat, 19 Jul 2025 11:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysNoticeController.java | 9 + .../src/main/resources/application-dev.yml | 16 +- .../src/main/resources/application-prod.yml | 26 +-- .../consumer/DeviceStatusConsumer.java | 10 +- .../xinda/itsm/controller/DutyController.java | 7 +- .../controller/ExampleReportController.java | 7 +- .../controller/InspectionPlanController.java | 7 +- .../InspectionRecordController.java | 7 +- .../itsm/controller/PrePlanController.java | 7 +- .../controller/ProcessInfoController.java | 7 +- .../controller/RegulationInfoController.java | 7 +- .../controller/RepairOrderController.java | 8 +- .../itsm/controller/ScheduleController.java | 7 +- .../controller/StandardInfoController.java | 17 +- .../main/java/com/xinda/itsm/domain/Duty.java | 4 +- .../com/xinda/itsm/domain/ExampleReport.java | 4 +- .../com/xinda/itsm/domain/InspectionPlan.java | 4 +- .../xinda/itsm/domain/InspectionRecord.java | 3 + .../java/com/xinda/itsm/domain/PrePlan.java | 4 +- .../com/xinda/itsm/domain/ProcessInfo.java | 4 +- .../com/xinda/itsm/domain/RegulationInfo.java | 4 +- .../com/xinda/itsm/domain/RepairOrder.java | 4 +- .../java/com/xinda/itsm/domain/Schedule.java | 4 +- .../com/xinda/itsm/domain/StandardInfo.java | 4 +- .../impl/InspectionPlanServiceImpl.java | 2 + .../main/resources/mapper/itsm/DutyMapper.xml | 11 +- .../mapper/itsm/ExampleReportMapper.xml | 9 + .../mapper/itsm/InspectionPlanMapper.xml | 12 +- .../mapper/itsm/InspectionRecordMapper.xml | 11 +- .../resources/mapper/itsm/PrePlanMapper.xml | 11 +- .../mapper/itsm/ProcessInfoMapper.xml | 11 +- .../mapper/itsm/RegulationInfoMapper.xml | 11 +- .../mapper/itsm/RepairOrderMapper.xml | 11 +- .../resources/mapper/itsm/ScheduleMapper.xml | 11 +- .../mapper/itsm/StandardInfoMapper.xml | 11 +- .../data/controller/DeviceDocController.java | 110 +++++++++++ .../xinda/gkb/IECF6113ProtocolService.java | 11 ++ .../com/xinda/mqtt/server/MqttServer1.java | 180 ++++++++++++++++++ .../java/com/xinda/iot/domain/DeviceDoc.java | 56 ++++++ .../com/xinda/iot/mapper/DeviceDocMapper.java | 61 ++++++ .../xinda/iot/service/IDeviceDocService.java | 61 ++++++ .../service/impl/DeviceDocServiceImpl.java | 96 ++++++++++ .../iot/service/impl/SceneServiceImpl.java | 23 ++- .../resources/mapper/iot/DeviceDocMapper.xml | 97 ++++++++++ .../resources/mapper/iot/DeviceMapper.xml | 12 +- 45 files changed, 929 insertions(+), 70 deletions(-) create mode 100644 xinda-open-api/src/main/java/com/xinda/data/controller/DeviceDocController.java create mode 100644 xinda-server/mqtt-broker/src/main/java/com/xinda/mqtt/server/MqttServer1.java create mode 100644 xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/domain/DeviceDoc.java create mode 100644 xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/mapper/DeviceDocMapper.java create mode 100644 xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/IDeviceDocService.java create mode 100644 xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/DeviceDocServiceImpl.java create mode 100644 xinda-service/xinda-iot-service/src/main/resources/mapper/iot/DeviceDocMapper.xml diff --git a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java index c57caa4..9d56325 100644 --- a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java +++ b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java @@ -50,6 +50,15 @@ public class SysNoticeController extends BaseController return getDataTable(list); } + @GetMapping("/indexList") + public TableDataInfo indexList(SysNotice notice) + { + notice.setDeptId(getDeptId()); + startPage(); + List list = noticeService.selectNoticeList(notice); + return getDataTable(list); + } + /** * 根据通知公告编号获取详细信息 */ diff --git a/xinda-admin/src/main/resources/application-dev.yml b/xinda-admin/src/main/resources/application-dev.yml index 9240ebb..2f3f81b 100644 --- a/xinda-admin/src/main/resources/application-dev.yml +++ b/xinda-admin/src/main/resources/application-dev.yml @@ -11,7 +11,7 @@ spring: password: pRePNKSeawMMpKpJ # url: jdbc:mysql://192.168.200.53:3306/gongkongbang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root -# password: aiot@1234 +# password: ledo@1234 # 从库数据源 slave: enabled: false # 从数据源开关/默认关闭 @@ -19,13 +19,13 @@ spring: username: password: # TDengine数据库 -# tdengine-server: -# enabled: false # 默认不启用TDengine，true=启用，false=不启用 -# driverClassName: com.taosdata.jdbc.TSDBDriver -# url: jdbc:TAOS://xinda:6030/xinda_log?timezone=UTC-8&charset=utf-8 -# username: root -# password: taosdata -# dbName: xinda_log + tdengine-server: + enabled: false # 默认不启用TDengine，true=启用，false=不启用 + driverClassName: com.taosdata.jdbc.TSDBDriver + url: jdbc:TAOS://1.15.36.7:6041/xinda_log?timezone=UTC-8&charset=utf-8 + username: root + password: taosdata + dbName: xinda_log initialSize: 5 # 初始连接数 minIdle: 10 # 最小连接池数量 diff --git a/xinda-admin/src/main/resources/application-prod.yml b/xinda-admin/src/main/resources/application-prod.yml index 1f50193..182a0f1 100644 --- a/xinda-admin/src/main/resources/application-prod.yml +++ b/xinda-admin/src/main/resources/application-prod.yml @@ -6,8 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://127.0.0.1:3306/gongkongbang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: gongkongbang + url: jdbc:mysql://177.7.0.11:3306/gongkongbang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root password: pRePNKSeawMMpKpJ # 从库数据源 slave: @@ -57,10 +57,10 @@ spring: multi-statement-allow: true # redis 配置 redis: - host: localhost # 地址 + host: 177.7.0.10 # 地址 port: 6379 # 端口，默认为6379 database: 0 # 数据库索引 - password: 841503 # 密码 + password: iot@1234 # 密码 timeout: 10s # 连接超时时间 lettuce: pool: @@ -70,17 +70,17 @@ spring: max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） # mqtt 配置 mqtt: - username: xinda # 账号（仅用于后端自认证） - password: xinda # 密码（仅用于后端自认证） - host-url: tcp://127.0.0.1:1883 # 连接 Emqx 消息服务器地址 - # host-url: tcp://192.168.1.103:1883 # 内置netty mqtt broker地址 + username: gkb # 账号（仅用于后端自认证） + password: 888888 # 密码（仅用于后端自认证） +# host-url: tcp://127.0.0.1:1883 # 连接 Emqx 消息服务器地址 + host-url: tcp://177.7.0.13:1883 # 内置netty mqtt broker地址 client-id: ${random.int} # 客户端Id，不能相同，采用随机数 ${random.value} default-topic: test # 默认主题 timeout: 30 # 超时时间 keepalive: 30 # 保持连接 clearSession: true # 清除会话(设置为false,断开连接，重连后使用原来的会话 保留订阅的主题，能接收离线期间的消息) - general-username: gkb # 用户名 - general-password: 888888 + gen-username: gkb # 用户名 + gen-password: 888888 # redisson 配置 redisson: # redis key前缀 @@ -108,8 +108,8 @@ sip: enabled: true # 是否启用视频监控SIP，true为启用 ## 本地调试时，绑定网卡局域网IP，设备在同一局域网，设备接入IP填写绑定IP ## 部署服务端时，默认绑定容器IP，设备接入IP填写服务器公网IP - ip: 1.14.72.242 - # ip: 192.168.1.103 + ip: 177.7.0.15 +# ip: 0.0.0.0 port: 5061 # SIP端口(保持默认) domain: 3402000000 # 由省级、市级、区级、基层编号组成 id: 34020000002000000001 # 同上，另外增加编号，(可保持默认) @@ -126,7 +126,7 @@ logging: # Swagger配置 swagger: enabled: true # 是否开启swagger - pathMapping: /prod-api # 请求前缀 + pathMapping: /prod-api # 请求前缀 liteflow: diff --git a/xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/redischannel/consumer/DeviceStatusConsumer.java b/xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/redischannel/consumer/DeviceStatusConsumer.java index 876ceb0..410ca5e 100644 --- a/xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/redischannel/consumer/DeviceStatusConsumer.java +++ b/xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/redischannel/consumer/DeviceStatusConsumer.java @@ -67,8 +67,14 @@ public class DeviceStatusConsumer { device.setIsShadow(0); device.setIsSimulate(0); device.setLocationWay(1); - device.setProductId(147L); - device.setProductName("测试"); + if(bo.getSerialNumber().startsWith("FS")){ + device.setProductId(148L); + device.setProductName("附属网关"); + device.setAgenciesId(100L); + }else{ + device.setProductId(147L); + device.setProductName("测试"); + } device.setSerialNumber(bo.getSerialNumber()); device.setStatus(1); device.setTenantId(1L); diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java index 7fa419c..572f59b 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/DutyController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class DutyController extends BaseController /** * 查询值班管理列表 */ - @PreAuthorize("@ss.hasPermi('itsm:duty:list')") +// @PreAuthorize("@ss.hasPermi('itsm:duty:list')") @GetMapping("/list") @ApiOperation("查询值班管理列表") public TableDataInfo list(Duty duty) { + SysUser user = getLoginUser().getUser(); + duty.setTenantId(user.getDeptId()); startPage(); List list = dutyService.selectDutyList(duty); return getDataTable(list); @@ -83,6 +86,8 @@ public class DutyController extends BaseController @ApiOperation("新增值班管理") public AjaxResult add(@RequestBody Duty duty) { + SysUser user = getLoginUser().getUser(); + duty.setTenantId(user.getDeptId()); return toAjax(dutyService.insertDuty(duty)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java index 44e27fa..fd926b9 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ExampleReportController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -39,11 +40,13 @@ public class ExampleReportController extends BaseController /** * 查询例报管理列表 */ - @PreAuthorize("@ss.hasPermi('itsm:report:list')") +// @PreAuthorize("@ss.hasPermi('itsm:report:list')") @GetMapping("/list") @ApiOperation("查询例报管理列表") public TableDataInfo list(ExampleReport exampleReport) { + SysUser user = getLoginUser().getUser(); + exampleReport.setTenantId(user.getDeptId()); startPage(); List list = exampleReportService.selectExampleReportList(exampleReport); return getDataTable(list); @@ -81,6 +84,8 @@ public class ExampleReportController extends BaseController @ApiOperation("新增例报管理") public AjaxResult add(@RequestBody ExampleReport exampleReport) { + SysUser user = getLoginUser().getUser(); + exampleReport.setTenantId(user.getDeptId()); return toAjax(exampleReportService.insertExampleReport(exampleReport)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java index 9b0164e..5c20709 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionPlanController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class InspectionPlanController extends BaseController /** * 查询巡检计划列表 */ -@PreAuthorize("@ss.hasPermi('itsm:plan:list')") +//@PreAuthorize("@ss.hasPermi('itsm:plan:list')") @GetMapping("/list") @ApiOperation("查询巡检计划列表") public TableDataInfo list(InspectionPlan inspectionPlan) { + SysUser user = getLoginUser().getUser(); + inspectionPlan.setTenantId(user.getDeptId()); startPage(); List list = inspectionPlanService.selectInspectionPlanList(inspectionPlan); return getDataTable(list); @@ -83,6 +86,8 @@ public class InspectionPlanController extends BaseController @ApiOperation("新增巡检计划") public AjaxResult add(@RequestBody InspectionPlan inspectionPlan) { + SysUser user = getLoginUser().getUser(); + inspectionPlan.setTenantId(user.getDeptId()); return toAjax(inspectionPlanService.insertInspectionPlan(inspectionPlan)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java index 42fa0fb..bde1995 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/InspectionRecordController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class InspectionRecordController extends BaseController /** * 查询巡检记录列表 */ -@PreAuthorize("@ss.hasPermi('itsm:record:list')") +//@PreAuthorize("@ss.hasPermi('itsm:record:list')") @GetMapping("/list") @ApiOperation("查询巡检记录列表") public TableDataInfo list(InspectionRecord inspectionRecord) { + SysUser user = getLoginUser().getUser(); + inspectionRecord.setTenantId(user.getDeptId()); startPage(); List list = inspectionRecordService.selectInspectionRecordList(inspectionRecord); return getDataTable(list); @@ -83,6 +86,8 @@ public class InspectionRecordController extends BaseController @ApiOperation("新增巡检记录") public AjaxResult add(@RequestBody InspectionRecord inspectionRecord) { + SysUser user = getLoginUser().getUser(); + inspectionRecord.setTenantId(user.getDeptId()); return toAjax(inspectionRecordService.insertInspectionRecord(inspectionRecord)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java index 0c7d009..e825ee0 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/PrePlanController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class PrePlanController extends BaseController /** * 查询预案管理列表 */ -@PreAuthorize("@ss.hasPermi('itsm:prePlan:list')") +//@PreAuthorize("@ss.hasPermi('itsm:prePlan:list')") @GetMapping("/list") @ApiOperation("查询预案管理列表") public TableDataInfo list(PrePlan prePlan) { + SysUser user = getLoginUser().getUser(); + prePlan.setTenantId(user.getDeptId()); startPage(); List list = prePlanService.selectPrePlanList(prePlan); return getDataTable(list); @@ -83,6 +86,8 @@ public class PrePlanController extends BaseController @ApiOperation("新增预案管理") public AjaxResult add(@RequestBody PrePlan prePlan) { + SysUser user = getLoginUser().getUser(); + prePlan.setTenantId(user.getDeptId()); return toAjax(prePlanService.insertPrePlan(prePlan)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java index 331d20e..440d87a 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ProcessInfoController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class ProcessInfoController extends BaseController /** * 查询流程管理列表 */ -@PreAuthorize("@ss.hasPermi('itsm:process:list')") +//@PreAuthorize("@ss.hasPermi('itsm:process:list')") @GetMapping("/list") @ApiOperation("查询流程管理列表") public TableDataInfo list(ProcessInfo processInfo) { + SysUser user = getLoginUser().getUser(); + processInfo.setTenantId(user.getDeptId()); startPage(); List list = processInfoService.selectProcessInfoList(processInfo); return getDataTable(list); @@ -83,6 +86,8 @@ public class ProcessInfoController extends BaseController @ApiOperation("新增流程管理") public AjaxResult add(@RequestBody ProcessInfo processInfo) { + SysUser user = getLoginUser().getUser(); + processInfo.setTenantId(user.getDeptId()); return toAjax(processInfoService.insertProcessInfo(processInfo)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java index cc40b68..5260011 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RegulationInfoController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class RegulationInfoController extends BaseController /** * 查询制度管理列表 */ -@PreAuthorize("@ss.hasPermi('itsm:regulation:list')") +//@PreAuthorize("@ss.hasPermi('itsm:regulation:list')") @GetMapping("/list") @ApiOperation("查询制度管理列表") public TableDataInfo list(RegulationInfo regulationInfo) { + SysUser user = getLoginUser().getUser(); + regulationInfo.setTenantId(user.getDeptId()); startPage(); List list = regulationInfoService.selectRegulationInfoList(regulationInfo); return getDataTable(list); @@ -83,6 +86,8 @@ public class RegulationInfoController extends BaseController @ApiOperation("新增制度管理") public AjaxResult add(@RequestBody RegulationInfo regulationInfo) { + SysUser user = getLoginUser().getUser(); + regulationInfo.setTenantId(user.getDeptId()); return toAjax(regulationInfoService.insertRegulationInfo(regulationInfo)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java index e28797e..a562abf 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/RepairOrderController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class RepairOrderController extends BaseController /** * 查询维修工单列表 */ -@PreAuthorize("@ss.hasPermi('itsm:order:list')") +//@PreAuthorize("@ss.hasPermi('itsm:order:list')") @GetMapping("/list") @ApiOperation("查询维修工单列表") public TableDataInfo list(RepairOrder repairOrder) { + SysUser user = getLoginUser().getUser(); + repairOrder.setTenantId(user.getDeptId()); startPage(); List list = repairOrderService.selectRepairOrderList(repairOrder); return getDataTable(list); @@ -72,6 +75,7 @@ public class RepairOrderController extends BaseController @ApiOperation("获取维修工单详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(repairOrderService.selectRepairOrderById(id)); } @@ -83,6 +87,8 @@ public class RepairOrderController extends BaseController @ApiOperation("新增维修工单") public AjaxResult add(@RequestBody RepairOrder repairOrder) { + SysUser user = getLoginUser().getUser(); + repairOrder.setTenantId(user.getDeptId()); return toAjax(repairOrderService.insertRepairOrder(repairOrder)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java index 4c3e503..257a15a 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/ScheduleController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class ScheduleController extends BaseController /** * 查询调度计划管理列表 */ -@PreAuthorize("@ss.hasPermi('itsm:schedule:list')") +//@PreAuthorize("@ss.hasPermi('itsm:schedule:list')") @GetMapping("/list") @ApiOperation("查询调度计划管理列表") public TableDataInfo list(Schedule schedule) { + SysUser user = getLoginUser().getUser(); + schedule.setTenantId(user.getDeptId()); startPage(); List list = scheduleService.selectScheduleList(schedule); return getDataTable(list); @@ -83,6 +86,8 @@ public class ScheduleController extends BaseController @ApiOperation("新增调度计划管理") public AjaxResult add(@RequestBody Schedule schedule) { + SysUser user = getLoginUser().getUser(); + schedule.setTenantId(user.getDeptId()); return toAjax(scheduleService.insertSchedule(schedule)); } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java b/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java index b3fe5ab..0e2f8b3 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/controller/StandardInfoController.java @@ -3,6 +3,7 @@ package com.xinda.itsm.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.xinda.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,11 +42,13 @@ public class StandardInfoController extends BaseController /** * 查询作业规范列表 */ -@PreAuthorize("@ss.hasPermi('itsm:standardInfo:list')") +//@PreAuthorize("@ss.hasPermi('itsm:standard:list')") @GetMapping("/list") @ApiOperation("查询作业规范列表") public TableDataInfo list(StandardInfo standardInfo) { + SysUser user = getLoginUser().getUser(); + standardInfo.setTenantId(user.getDeptId()); startPage(); List list = standardInfoService.selectStandardInfoList(standardInfo); return getDataTable(list); @@ -55,7 +58,7 @@ public class StandardInfoController extends BaseController * 导出作业规范列表 */ @ApiOperation("导出作业规范列表") - @PreAuthorize("@ss.hasPermi('itsm:standardInfo:export')") + @PreAuthorize("@ss.hasPermi('itsm:standard:export')") @PostMapping("/export") public void export(HttpServletResponse response, StandardInfo standardInfo) { @@ -67,7 +70,7 @@ public class StandardInfoController extends BaseController /** * 获取作业规范详细信息 */ - @PreAuthorize("@ss.hasPermi('itsm:standardInfo:query')") + @PreAuthorize("@ss.hasPermi('itsm:standard:query')") @GetMapping(value = "/{standardId}") @ApiOperation("获取作业规范详细信息") public AjaxResult getInfo(@PathVariable("standardId") Long standardId) @@ -78,18 +81,20 @@ public class StandardInfoController extends BaseController /** * 新增作业规范 */ - @PreAuthorize("@ss.hasPermi('itsm:standardInfo:add')") + @PreAuthorize("@ss.hasPermi('itsm:standard:add')") @PostMapping @ApiOperation("新增作业规范") public AjaxResult add(@RequestBody StandardInfo standardInfo) { + SysUser user = getLoginUser().getUser(); + standardInfo.setTenantId(user.getDeptId()); return toAjax(standardInfoService.insertStandardInfo(standardInfo)); } /** * 修改作业规范 */ - @PreAuthorize("@ss.hasPermi('itsm:standardInfo:edit')") + @PreAuthorize("@ss.hasPermi('itsm:standard:edit')") @PutMapping @ApiOperation("修改作业规范") public AjaxResult edit(@RequestBody StandardInfo standardInfo) @@ -100,7 +105,7 @@ public class StandardInfoController extends BaseController /** * 删除作业规范 */ - @PreAuthorize("@ss.hasPermi('itsm:standardInfo:remove')") + @PreAuthorize("@ss.hasPermi('itsm:standard:remove')") @DeleteMapping("/{standardIds}") @ApiOperation("删除作业规范") public AjaxResult remove(@PathVariable Long[] standardIds) diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java index 910ee57..f294f7e 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Duty.java @@ -52,5 +52,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "替班人员") @ApiModelProperty("替班人员") private String relief; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java index b76826d..99e195c 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ExampleReport.java @@ -66,5 +66,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("结束日期") private Date endDate; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java index 0b561cc..726345e 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionPlan.java @@ -81,5 +81,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "状态", readConverterExp = "0=正常,1=停用") @ApiModelProperty("状态") private String status; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java index 880ba65..5479512 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/InspectionRecord.java @@ -87,4 +87,7 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("巡检备注") private String inspectionRemark; + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java index d9f4a1d..ee8aaff 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/PrePlan.java @@ -57,5 +57,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "预案关键词") @ApiModelProperty("预案关键词") private String keywords; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java index 1b499ed..67aec2f 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/ProcessInfo.java @@ -50,5 +50,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "处理人") @ApiModelProperty("处理人") private Long handlePerson; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java index 5ac5d7d..f8bcbe7 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RegulationInfo.java @@ -55,5 +55,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("上传时间") private Date uploadTime; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java index 751dea8..57a75a9 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/RepairOrder.java @@ -78,5 +78,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "工单备注") @ApiModelProperty("工单备注") private String orderRemark; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java index 51545ca..e2d17f4 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/Schedule.java @@ -128,5 +128,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "负责人") @ApiModelProperty("负责人") private String head; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java b/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java index 94c66e0..810b1ef 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/domain/StandardInfo.java @@ -42,5 +42,7 @@ private static final long serialVersionUID = 1L; @Excel(name = "规范文件") @ApiModelProperty("规范文件") private String docOssId; - + /** 租户id */ + @Excel(name = "租户id") + private Long tenantId; } diff --git a/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java b/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java index d3b102e..b813191 100644 --- a/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java +++ b/xinda-itsm/src/main/java/com/xinda/itsm/service/impl/InspectionPlanServiceImpl.java @@ -74,6 +74,7 @@ public class InspectionPlanServiceImpl implements IInspectionPlanService processDateRange(inspectionPlan.getStartDate(), inspectionPlan.getEndDate(), dateList::add); for(Date date : dateList){ InspectionRecord inspectionRecord = getBasicRecord(inspectionPlan, date, "日"); + inspectionRecord.setTenantId(inspectionPlan.getTenantId()); inspectionRecord.setCreateTime(DateUtils.getNowDate()); inspectionRecord.setCreateBy(loginUser.getUsername()); inspectionRecordMapper.insertInspectionRecord(inspectionRecord); @@ -153,6 +154,7 @@ public class InspectionPlanServiceImpl implements IInspectionPlanService record.setInspectionPerson(inspectionPlan.getInspectionPerson()); record.setPlanId(inspectionPlan.getId()); record.setUserId(inspectionPlan.getUserId()); + record.setTenantId(inspectionPlan.getTenantId()); record.setInspectionCycle(cycle); record.setCycle(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, now)); return record; diff --git a/xinda-itsm/src/main/resources/mapper/itsm/DutyMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/DutyMapper.xml index 7309a47..d8251fc 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/DutyMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/DutyMapper.xml @@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select duty_id, duty_date, on_duty, duty_period, type, status, relief, remark, create_by, create_time, update_by, update_time from duty + select duty_id, duty_date, on_duty, duty_period, type, status, relief, remark, create_by, create_time, update_by, update_time,tenant_id from duty @@ -55,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{dutyId}, @@ -69,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -86,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where duty_id = #{dutyId} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml index a4c41c8..634294c 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/ExampleReportMapper.xml @@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -35,6 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and receiver = #{receiver} and start_date = #{startDate} and end_date = #{endDate} + + and ( tenant_id in (SELECT dept_id FROM sys_dept + WHERE FIND_IN_SET(#{tenantId}, ancestors) OR dept_id = #{tenantId}) + ) + @@ -59,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, start_date, end_date, + tenant_id, #{exampleReportId}, @@ -74,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{startDate}, #{endDate}, + #{tenantId}, @@ -92,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, start_date = #{startDate}, end_date = #{endDate}, + tenant_id = #{tenantId}, where example_report_id = #{exampleReportId} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml index cdf4a68..f0216de 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/InspectionPlanMapper.xml @@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, plan_name, plan_content, project_name, start_date, end_date, inspection_cycle, inspection_person,inspection, user_id, set_date, set_time, status, create_by, create_time, update_by, update_time from inspection_plan + select id, plan_name, plan_content, project_name, start_date, end_date, inspection_cycle, inspection_person,inspection, user_id, set_date, set_time, status, create_by, create_time, update_by, update_time,tenant_id from inspection_plan @@ -71,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{id}, @@ -90,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -112,6 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, + where id = #{id} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/InspectionRecordMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/InspectionRecordMapper.xml index a748fbe..64d3c9f 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/InspectionRecordMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/InspectionRecordMapper.xml @@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, plan_id, plan_name, plan_content, project_name, plan_time, inspection_time, inspection_person, user_id, inspection_cycle, cycle, inspection_status, inspection_remark, create_by, create_time, update_by, update_time from inspection_record + select id, plan_id, plan_name, plan_content, project_name, plan_time, inspection_time, inspection_person, user_id, inspection_cycle, cycle, inspection_status, inspection_remark, create_by, create_time, update_by, update_time,tenant_id from inspection_record @@ -71,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{id}, @@ -90,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -112,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where id = #{id} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml index fe58520..3b5a2b8 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/PrePlanMapper.xml @@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select pre_plan_id, number, type, station, device, content, prepared_by, keywords, create_by, create_time, update_by, update_time from pre_plan + select pre_plan_id, number, type, station, device, content, prepared_by, keywords, create_by, create_time, update_by, update_time,tenant_id from pre_plan @@ -56,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{prePlanId}, @@ -70,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -87,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where pre_plan_id = #{prePlanId} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/ProcessInfoMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/ProcessInfoMapper.xml index 1e92222..f7476f8 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/ProcessInfoMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/ProcessInfoMapper.xml @@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select process_id, event_name, event_type, touch_time, handle_result, handle_person, remark, create_by, create_time, update_by, update_time from process_info + select process_id, event_name, event_type, touch_time, handle_result, handle_person, remark, create_by, create_time, update_by, update_time,tenant_id from process_info @@ -52,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{processId}, @@ -65,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -81,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where process_id = #{processId} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/RegulationInfoMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/RegulationInfoMapper.xml index d558561..7b6cf90 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/RegulationInfoMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/RegulationInfoMapper.xml @@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select regulation_id, regulation_code, regulation_name, regulation_describe, regulation_type, doc_oss_id, upload_time, remark, create_by, create_time, update_by, update_time from regulation_info + select regulation_id, regulation_code, regulation_name, regulation_describe, regulation_type, doc_oss_id, upload_time, remark, create_by, create_time, update_by, update_time,tenant_id from regulation_info @@ -55,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{regulationId}, @@ -69,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -86,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where regulation_id = #{regulationId} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/RepairOrderMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/RepairOrderMapper.xml index 4567c29..04c6d28 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/RepairOrderMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/RepairOrderMapper.xml @@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, order_no, order_content, project_name, assign_time, finish_time, finish_by,respon, annex, user_id, order_status, order_remark, create_by, create_time, update_by, update_time from repair_order + select id, order_no, order_content, project_name, assign_time, finish_time, finish_by,respon, annex, user_id, order_status, order_remark, create_by, create_time, update_by, update_time,tenant_id from repair_order @@ -68,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{id}, @@ -86,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -107,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where id = #{id} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/ScheduleMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/ScheduleMapper.xml index 99e6243..df4dc2d 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/ScheduleMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/ScheduleMapper.xml @@ -31,10 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select schedule_id, number, type, cycle, station, status, is_timeout, name, source, content, start_time, end_time, first_reminder, second_reminder, operator, commencement_time, terminator, resolution_time, resolution_content, prepared_by, head, remark, create_by, create_time, update_by, update_time from schedule + select schedule_id, number, type, cycle, station, status, is_timeout, name, source, content, start_time, end_time, first_reminder, second_reminder, operator, commencement_time, terminator, resolution_time, resolution_content, prepared_by, head, remark, create_by, create_time, update_by, update_time,tenant_id from schedule @@ -97,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{scheduleId}, @@ -125,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -156,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where schedule_id = #{scheduleId} diff --git a/xinda-itsm/src/main/resources/mapper/itsm/StandardInfoMapper.xml b/xinda-itsm/src/main/resources/mapper/itsm/StandardInfoMapper.xml index bef4ea7..ae48199 100644 --- a/xinda-itsm/src/main/resources/mapper/itsm/StandardInfoMapper.xml +++ b/xinda-itsm/src/main/resources/mapper/itsm/StandardInfoMapper.xml @@ -15,10 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select standard_id, standard_code, standard_name, standard_describe, doc_oss_id, remark, create_by, create_time, update_by, update_time from standard_info + select standard_id, standard_code, standard_name, standard_describe, doc_oss_id, remark, create_by, create_time, update_by, update_time,tenant_id from standard_info @@ -49,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + tenant_id, #{standardId}, @@ -61,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{tenantId}, @@ -76,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + tenant_id = #{tenantId}, where standard_id = #{standardId} diff --git a/xinda-open-api/src/main/java/com/xinda/data/controller/DeviceDocController.java b/xinda-open-api/src/main/java/com/xinda/data/controller/DeviceDocController.java new file mode 100644 index 0000000..68908f6 --- /dev/null +++ b/xinda-open-api/src/main/java/com/xinda/data/controller/DeviceDocController.java @@ -0,0 +1,110 @@ +package com.xinda.data.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.xinda.common.annotation.Log; +import com.xinda.common.core.controller.BaseController; +import com.xinda.common.core.domain.AjaxResult; +import com.xinda.common.enums.BusinessType; +import com.xinda.iot.domain.DeviceDoc; +import com.xinda.iot.service.IDeviceDocService; +import com.xinda.common.utils.poi.ExcelUtil; +import com.xinda.common.core.page.TableDataInfo; + +/** + * 设备档案管理Controller + * + * @author leed + * @date 2025-07-13 + */ +@RestController +@RequestMapping("/iot/deviecDoc") +@Api(tags = "设备档案管理") +public class DeviceDocController extends BaseController +{ + @Autowired + private IDeviceDocService deviceDocService; + +/** + * 查询设备档案管理列表 + */ +@PreAuthorize("@ss.hasPermi('iot:deviecDoc:list')") +@GetMapping("/list") +@ApiOperation("查询设备档案管理列表") + public TableDataInfo list(DeviceDoc deviceDoc) + { + startPage(); + List list = deviceDocService.selectDeviceDocList(deviceDoc); + return getDataTable(list); + } + + /** + * 导出设备档案管理列表 + */ + @ApiOperation("导出设备档案管理列表") + @PreAuthorize("@ss.hasPermi('iot:deviecDoc:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, DeviceDoc deviceDoc) + { + List list = deviceDocService.selectDeviceDocList(deviceDoc); + ExcelUtil util = new ExcelUtil(DeviceDoc.class); + util.exportExcel(response, list, "设备档案管理数据"); + } + + /** + * 获取设备档案管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('iot:deviecDoc:query')") + @GetMapping(value = "/{id}") + @ApiOperation("获取设备档案管理详细信息") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(deviceDocService.selectDeviceDocById(id)); + } + + /** + * 新增设备档案管理 + */ + @PreAuthorize("@ss.hasPermi('iot:deviecDoc:add')") + @PostMapping + @ApiOperation("新增设备档案管理") + public AjaxResult add(@RequestBody DeviceDoc deviceDoc) + { + return toAjax(deviceDocService.insertDeviceDoc(deviceDoc)); + } + + /** + * 修改设备档案管理 + */ + @PreAuthorize("@ss.hasPermi('iot:deviecDoc:edit')") + @PutMapping + @ApiOperation("修改设备档案管理") + public AjaxResult edit(@RequestBody DeviceDoc deviceDoc) + { + return toAjax(deviceDocService.updateDeviceDoc(deviceDoc)); + } + + /** + * 删除设备档案管理 + */ + @PreAuthorize("@ss.hasPermi('iot:deviecDoc:remove')") + @DeleteMapping("/{ids}") + @ApiOperation("删除设备档案管理") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(deviceDocService.deleteDeviceDocByIds(ids)); + } +} diff --git a/xinda-protocol/xinda-protocol-collect/src/main/java/com/xinda/gkb/IECF6113ProtocolService.java b/xinda-protocol/xinda-protocol-collect/src/main/java/com/xinda/gkb/IECF6113ProtocolService.java index cd77ba4..c53e0a8 100644 --- a/xinda-protocol/xinda-protocol-collect/src/main/java/com/xinda/gkb/IECF6113ProtocolService.java +++ b/xinda-protocol/xinda-protocol-collect/src/main/java/com/xinda/gkb/IECF6113ProtocolService.java @@ -294,11 +294,22 @@ public class IECF6113ProtocolService implements IProtocol { callBack.setSources(msg); callBack.setMessage(msg.getBytes()); } +// if (params.containsKey("TIME")) { +// String msg = "GKB29810,JCZ,{\"TIME\":" + params.get("TIME") + "}"; +// callBack.setSources(msg); +// callBack.setMessage(msg.getBytes()); +// } if (params.containsKey("TIME")) { + String msg = "GKB29810,time,{\"TIME\":" + params.get("TIME") + "}"; + callBack.setSources(msg); + callBack.setMessage(msg.getBytes()); + } + if (params.containsKey("JCZ")) { String msg = "GKB29810,JCZ,{\"TIME\":" + params.get("TIME") + "}"; callBack.setSources(msg); callBack.setMessage(msg.getBytes()); } + // 调用方法检查并获取以前缀开头的键和值 Map result = getKeysAndValuesWithPrefix(params, "Q0."); // 输出结果 diff --git a/xinda-server/mqtt-broker/src/main/java/com/xinda/mqtt/server/MqttServer1.java b/xinda-server/mqtt-broker/src/main/java/com/xinda/mqtt/server/MqttServer1.java new file mode 100644 index 0000000..842178f --- /dev/null +++ b/xinda-server/mqtt-broker/src/main/java/com/xinda/mqtt/server/MqttServer1.java @@ -0,0 +1,180 @@ +//package com.xinda.mqtt.server; +// +////import com.xinda.server.Server; +////import com.xinda.mqtt.handler.adapter.MqttMessageAdapter; +////import io.netty.bootstrap.AbstractBootstrap; +////import io.netty.bootstrap.ServerBootstrap; +////import io.netty.channel.ChannelInitializer; +////import io.netty.channel.ChannelOption; +////import io.netty.channel.EventLoopGroup; +////import io.netty.channel.nio.NioEventLoopGroup; +////import io.netty.channel.socket.nio.NioServerSocketChannel; +////import io.netty.channel.socket.nio.NioSocketChannel; +////import io.netty.handler.codec.mqtt.MqttDecoder; +////import io.netty.handler.codec.mqtt.MqttEncoder; +////import io.netty.handler.logging.LogLevel; +////import io.netty.handler.logging.LoggingHandler; +////import io.netty.handler.timeout.IdleStateHandler; +////import io.netty.util.concurrent.DefaultThreadFactory; +////import lombok.extern.slf4j.Slf4j; +////import org.springframework.beans.factory.annotation.Autowired; +////import org.springframework.stereotype.Component; +//// +////import java.util.concurrent.*; +//// +////@Component +////@Slf4j +////public class MqttServer extends Server { +//// +//// @Autowired +//// private MqttMessageAdapter messageAdapter; +//// +//// private EventLoopGroup bossGroup; +//// private EventLoopGroup workerGroup; +//// +//// @Override +//// protected AbstractBootstrap initialize() { +//// int bossThreads = 1; +//// // Increase worker threads based on CPU cores and expected load +//// int workerThreads = Runtime.getRuntime().availableProcessors() * 4; +//// +//// bossGroup = new NioEventLoopGroup(bossThreads, new DefaultThreadFactory("MQTT-Boss", Thread.MAX_PRIORITY)); +//// workerGroup = new NioEventLoopGroup(workerThreads, new DefaultThreadFactory("MQTT-Worker", Thread.MAX_PRIORITY)); +//// +//// if (config.businessCore > 0) { +//// businessService = new ThreadPoolExecutor( +//// config.businessCore, +//// config.businessCore * 2, // Allow some extra threads for bursty workloads +//// 60L, TimeUnit.SECONDS, // Keep idle threads alive longer +//// new LinkedBlockingQueue<>(2048), // Increase queue length +//// new DefaultThreadFactory("MQTT-Business", true, Thread.NORM_PRIORITY), +//// new ThreadPoolExecutor.CallerRunsPolicy()); // Queue full policy +//// } +//// +//// return new ServerBootstrap() +//// .group(bossGroup, workerGroup) +//// .channel(NioServerSocketChannel.class) +//// .handler(new LoggingHandler(LogLevel.INFO)) +//// .option(ChannelOption.SO_BACKLOG, 2048) // Increase backlog +//// .childOption(ChannelOption.SO_KEEPALIVE, Boolean.TRUE) +//// .childOption(ChannelOption.TCP_NODELAY, true) +//// .childOption(ChannelOption.SO_SNDBUF, 2 * 1024 * 1024) // Increase send buffer size +//// .childOption(ChannelOption.SO_RCVBUF, 2 * 1024 * 1024) // Increase receive buffer size +//// .childHandler(new ChannelInitializer() { +//// @Override +//// protected void initChannel(NioSocketChannel channel) { +//// channel.pipeline() +//// .addFirst(new IdleStateHandler(config.readerIdleTime, config.writerIdleTime, config.allIdleTime, TimeUnit.SECONDS)) +//// .addLast(new MqttDecoder(2 * 1024 * 1024 * 2)) // Increase max frame length +//// .addLast(MqttEncoder.INSTANCE) +//// .addLast(messageAdapter); +//// } +//// }); +//// } +// +//import com.xinda.mqtt.handler.adapter.MqttMessageAdapter; +//import com.xinda.server.Server; +//import io.netty.bootstrap.AbstractBootstrap; +//import io.netty.bootstrap.ServerBootstrap; +//import io.netty.channel.ChannelInitializer; +//import io.netty.channel.ChannelOption; +//import io.netty.channel.EventLoopGroup; +//import io.netty.channel.nio.NioEventLoopGroup; +//import io.netty.channel.socket.nio.NioServerSocketChannel; +//import io.netty.channel.socket.nio.NioSocketChannel; +//import io.netty.handler.codec.mqtt.MqttDecoder; +//import io.netty.handler.codec.mqtt.MqttEncoder; +//import io.netty.handler.logging.LogLevel; +//import io.netty.handler.logging.LoggingHandler; +//import io.netty.handler.timeout.IdleStateHandler; +//import io.netty.util.concurrent.DefaultThreadFactory; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +//import java.util.concurrent.LinkedBlockingQueue; +//import java.util.concurrent.ThreadPoolExecutor; +//import java.util.concurrent.TimeUnit; +// +//@Component +//@Slf4j +//public class MqttServer1 extends Server { +// +// @Autowired +// private MqttMessageAdapter messageAdapter; +// +// private EventLoopGroup bossGroup; +// private EventLoopGroup workerGroup; +// +// +// @Override +// protected AbstractBootstrap initialize() { +// int bossThreads = 1; +// int workerThreads = Runtime.getRuntime().availableProcessors() * 2; +// +// bossGroup = new NioEventLoopGroup(bossThreads, new DefaultThreadFactory("MQTT-Boss", Thread.MAX_PRIORITY)); +// workerGroup = new NioEventLoopGroup(workerThreads, new DefaultThreadFactory("MQTT-Worker", Thread.MAX_PRIORITY)); +// +// if (config.businessCore > 0) { +// businessService = new ThreadPoolExecutor( +// config.businessCore, +// config.businessCore, +// 1L, TimeUnit.SECONDS, +// new LinkedBlockingQueue<>(1024), // 增加队列长度 +// new DefaultThreadFactory("MQTT-Business", true, Thread.NORM_PRIORITY), +// new ThreadPoolExecutor.CallerRunsPolicy()); // 队列满时由调用者处理 +// } +// +// return new ServerBootstrap() +// .group(bossGroup, workerGroup) +// .channel(NioServerSocketChannel.class) +// .handler(new LoggingHandler(LogLevel.INFO)) +// .option(ChannelOption.SO_BACKLOG, 1024) +// .childOption(ChannelOption.SO_KEEPALIVE, Boolean.TRUE) +// .childOption(ChannelOption.TCP_NODELAY, true) +// .childOption(ChannelOption.SO_SNDBUF, 1024 * 1024) +// .childOption(ChannelOption.SO_RCVBUF, 1024 * 1024) +// .childHandler(new ChannelInitializer() { +// @Override +// protected void initChannel(NioSocketChannel channel) { +// channel.pipeline() +// .addFirst(new IdleStateHandler(config.readerIdleTime, config.writerIdleTime, config.allIdleTime, TimeUnit.SECONDS)) +// .addLast(new MqttDecoder(1024 * 1024 * 2)) +// .addLast(MqttEncoder.INSTANCE) +// .addLast(messageAdapter); // 确保 messageAdapter 内部处理异步 +// } +// }); +// } +// +// +// +//// bossGroup = new NioEventLoopGroup(1, new DefaultThreadFactory(config.name, Thread.MAX_PRIORITY)); +//// workerGroup = new NioEventLoopGroup(config.workerCore, new DefaultThreadFactory(config.name, Thread.MAX_PRIORITY)); +//// +//// if (config.businessCore > 0) { +//// businessService = new ThreadPoolExecutor(config.businessCore, config.businessCore, 1L, +//// TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new DefaultThreadFactory(config.name, true, Thread.NORM_PRIORITY)); +//// } +//// return new ServerBootstrap() +//// .group(bossGroup, workerGroup) +//// .channel(NioServerSocketChannel.class) +//// .handler(new LoggingHandler(LogLevel.DEBUG)) +//// .option(ChannelOption.SO_BACKLOG, 511) +//// .childOption(ChannelOption.SO_KEEPALIVE, Boolean.TRUE) +//// .childHandler(new ChannelInitializer() { +//// +//// @Override +//// protected void initChannel(NioSocketChannel channel) { +//// //客户端心跳检测机制 +//// channel.pipeline() +//// .addFirst(XinDaConstant.SERVER.IDLE +//// , new IdleStateHandler(config.readerIdleTime, config.writerIdleTime, config.allIdleTime, TimeUnit.SECONDS)) +//// .addLast(XinDaConstant.SERVER.DECODER, new MqttDecoder(1024 * 1024 * 2)) +//// .addLast(XinDaConstant.SERVER.ENCODER, MqttEncoder.INSTANCE) +//// .addLast(messageAdapter); +//// } +//// }); +//// +//// +//// } +//} diff --git a/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/domain/DeviceDoc.java b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/domain/DeviceDoc.java new file mode 100644 index 0000000..ce4b1ac --- /dev/null +++ b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/domain/DeviceDoc.java @@ -0,0 +1,56 @@ +package com.xinda.iot.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.xinda.common.annotation.Excel; +import com.xinda.common.core.domain.BaseEntity; + +/** + * 设备档案管理对象 iot_device_doc + * + * @author leed + * @date 2025-07-13 + */ +@ApiModel(value = "DeviceDoc",description = "设备档案管理 iot_device_doc") +@Data +public class DeviceDoc extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** id唯一标识 */ + private Long id; + + /** 设备id */ + @Excel(name = "设备id") + @ApiModelProperty("设备id") + private Long deviceId; + + /** 设备编号 */ + @Excel(name = "设备编号") + @ApiModelProperty("设备编号") + private String serialNumber; + + /** 文件名称 */ + @Excel(name = "文件名称") + @ApiModelProperty("文件名称") + private String fileName; + + /** 资源请求路径 */ + @Excel(name = "资源请求路径") + @ApiModelProperty("资源请求路径") + private String resourceUrl; + + /** 租户id */ + @Excel(name = "租户id") + @ApiModelProperty("租户id") + private Long tenantId; + + /** 租户名称 */ + @Excel(name = "租户名称") + @ApiModelProperty("租户名称") + private String tenantName; + +} diff --git a/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/mapper/DeviceDocMapper.java b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/mapper/DeviceDocMapper.java new file mode 100644 index 0000000..56d9c26 --- /dev/null +++ b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/mapper/DeviceDocMapper.java @@ -0,0 +1,61 @@ +package com.xinda.iot.mapper; + +import java.util.List; +import com.xinda.iot.domain.DeviceDoc; + +/** + * 设备档案管理Mapper接口 + * + * @author leed + * @date 2025-07-13 + */ +public interface DeviceDocMapper +{ + /** + * 查询设备档案管理 + * + * @param id 设备档案管理主键 + * @return 设备档案管理 + */ + public DeviceDoc selectDeviceDocById(Long id); + + /** + * 查询设备档案管理列表 + * + * @param deviceDoc 设备档案管理 + * @return 设备档案管理集合 + */ + public List selectDeviceDocList(DeviceDoc deviceDoc); + + /** + * 新增设备档案管理 + * + * @param deviceDoc 设备档案管理 + * @return 结果 + */ + public int insertDeviceDoc(DeviceDoc deviceDoc); + + /** + * 修改设备档案管理 + * + * @param deviceDoc 设备档案管理 + * @return 结果 + */ + public int updateDeviceDoc(DeviceDoc deviceDoc); + + /** + * 删除设备档案管理 + * + * @param id 设备档案管理主键 + * @return 结果 + */ + public int deleteDeviceDocById(Long id); + + /** + * 批量删除设备档案管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeviceDocByIds(Long[] ids); +} diff --git a/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/IDeviceDocService.java b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/IDeviceDocService.java new file mode 100644 index 0000000..6c87110 --- /dev/null +++ b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/IDeviceDocService.java @@ -0,0 +1,61 @@ +package com.xinda.iot.service; + +import java.util.List; +import com.xinda.iot.domain.DeviceDoc; + +/** + * 设备档案管理Service接口 + * + * @author leed + * @date 2025-07-13 + */ +public interface IDeviceDocService +{ + /** + * 查询设备档案管理 + * + * @param id 设备档案管理主键 + * @return 设备档案管理 + */ + public DeviceDoc selectDeviceDocById(Long id); + + /** + * 查询设备档案管理列表 + * + * @param deviceDoc 设备档案管理 + * @return 设备档案管理集合 + */ + public List selectDeviceDocList(DeviceDoc deviceDoc); + + /** + * 新增设备档案管理 + * + * @param deviceDoc 设备档案管理 + * @return 结果 + */ + public int insertDeviceDoc(DeviceDoc deviceDoc); + + /** + * 修改设备档案管理 + * + * @param deviceDoc 设备档案管理 + * @return 结果 + */ + public int updateDeviceDoc(DeviceDoc deviceDoc); + + /** + * 批量删除设备档案管理 + * + * @param ids 需要删除的设备档案管理主键集合 + * @return 结果 + */ + public int deleteDeviceDocByIds(Long[] ids); + + /** + * 删除设备档案管理信息 + * + * @param id 设备档案管理主键 + * @return 结果 + */ + public int deleteDeviceDocById(Long id); +} diff --git a/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/DeviceDocServiceImpl.java b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/DeviceDocServiceImpl.java new file mode 100644 index 0000000..3d3c417 --- /dev/null +++ b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/DeviceDocServiceImpl.java @@ -0,0 +1,96 @@ +package com.xinda.iot.service.impl; + +import java.util.List; +import com.xinda.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xinda.iot.mapper.DeviceDocMapper; +import com.xinda.iot.domain.DeviceDoc; +import com.xinda.iot.service.IDeviceDocService; + +/** + * 设备档案管理Service业务层处理 + * + * @author leed + * @date 2025-07-13 + */ +@Service +public class DeviceDocServiceImpl implements IDeviceDocService +{ + @Autowired + private DeviceDocMapper deviceDocMapper; + + /** + * 查询设备档案管理 + * + * @param id 设备档案管理主键 + * @return 设备档案管理 + */ + @Override + public DeviceDoc selectDeviceDocById(Long id) + { + return deviceDocMapper.selectDeviceDocById(id); + } + + /** + * 查询设备档案管理列表 + * + * @param deviceDoc 设备档案管理 + * @return 设备档案管理 + */ + @Override + public List selectDeviceDocList(DeviceDoc deviceDoc) + { + return deviceDocMapper.selectDeviceDocList(deviceDoc); + } + + /** + * 新增设备档案管理 + * + * @param deviceDoc 设备档案管理 + * @return 结果 + */ + @Override + public int insertDeviceDoc(DeviceDoc deviceDoc) + { + deviceDoc.setCreateTime(DateUtils.getNowDate()); + return deviceDocMapper.insertDeviceDoc(deviceDoc); + } + + /** + * 修改设备档案管理 + * + * @param deviceDoc 设备档案管理 + * @return 结果 + */ + @Override + public int updateDeviceDoc(DeviceDoc deviceDoc) + { + deviceDoc.setUpdateTime(DateUtils.getNowDate()); + return deviceDocMapper.updateDeviceDoc(deviceDoc); + } + + /** + * 批量删除设备档案管理 + * + * @param ids 需要删除的设备档案管理主键 + * @return 结果 + */ + @Override + public int deleteDeviceDocByIds(Long[] ids) + { + return deviceDocMapper.deleteDeviceDocByIds(ids); + } + + /** + * 删除设备档案管理信息 + * + * @param id 设备档案管理主键 + * @return 结果 + */ + @Override + public int deleteDeviceDocById(Long id) + { + return deviceDocMapper.deleteDeviceDocById(id); + } +} diff --git a/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/SceneServiceImpl.java b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/SceneServiceImpl.java index 06805b2..5cc1caa 100644 --- a/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/SceneServiceImpl.java +++ b/xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/SceneServiceImpl.java @@ -279,6 +279,7 @@ public class SceneServiceImpl implements ISceneService { } } // 构建规则链 + LiteFlowChainELBuilder.createChain().setChainName(scene.getChainName()).setEL(scene.getElData()).build(); } @@ -294,13 +295,14 @@ public class SceneServiceImpl implements ISceneService { @Override public String buildElData(Scene scene, List