Browse Source

1、测试区域、楼栋、楼层、房间、报警编码、仪表规则、报警记录接口;

dev
mh 2 months ago
parent
commit
77c37e4605
  1. 13
      mh-admin/src/main/java/com/mh/web/controller/alarm/AlarmCodeController.java
  2. 6
      mh-admin/src/main/java/com/mh/web/controller/alarm/AlarmRecordsController.java
  3. 13
      mh-admin/src/main/java/com/mh/web/controller/alarm/AlarmRulesController.java
  4. 10
      mh-admin/src/main/java/com/mh/web/controller/device/CollectionParamsManageController.java
  5. 10
      mh-admin/src/main/java/com/mh/web/controller/device/CommunicationParamsController.java
  6. 10
      mh-admin/src/main/java/com/mh/web/controller/device/DeviceInOutManageController.java
  7. 10
      mh-admin/src/main/java/com/mh/web/controller/device/DeviceLedgerController.java
  8. 12
      mh-admin/src/main/java/com/mh/web/controller/device/DeviceQrManageController.java
  9. 10
      mh-admin/src/main/java/com/mh/web/controller/device/GatewayManageController.java
  10. 13
      mh-admin/src/main/java/com/mh/web/controller/device/MaintainInfoController.java
  11. 4
      mh-admin/src/main/java/com/mh/web/controller/device/OperationController.java
  12. 10
      mh-admin/src/main/java/com/mh/web/controller/device/SparePartsManageController.java
  13. 10
      mh-admin/src/main/java/com/mh/web/controller/space/AreaInfoController.java
  14. 10
      mh-admin/src/main/java/com/mh/web/controller/space/BuildingInfoController.java
  15. 10
      mh-admin/src/main/java/com/mh/web/controller/space/CpmSpaceRelationController.java
  16. 10
      mh-admin/src/main/java/com/mh/web/controller/space/FloorInfoController.java
  17. 10
      mh-admin/src/main/java/com/mh/web/controller/space/HouseInfoController.java
  18. 52
      mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmCode.java
  19. 20
      mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmRecords.java
  20. 3
      mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmRules.java
  21. 2
      mh-common/src/main/java/com/mh/common/core/domain/entity/AreaInfo.java
  22. 2
      mh-common/src/main/java/com/mh/common/core/domain/entity/BuildingInfo.java
  23. 2
      mh-common/src/main/java/com/mh/common/core/domain/entity/CollectionParamsManage.java
  24. 2
      mh-common/src/main/java/com/mh/common/core/domain/entity/CommunicationParams.java
  25. 6
      mh-common/src/main/java/com/mh/common/core/domain/entity/CpmSpaceRelation.java
  26. 10
      mh-common/src/main/java/com/mh/common/core/domain/entity/DeviceInOutManage.java
  27. 2
      mh-common/src/main/java/com/mh/common/core/domain/entity/DeviceLedger.java
  28. 10
      mh-common/src/main/java/com/mh/common/core/domain/entity/DeviceQrManage.java
  29. 6
      mh-common/src/main/java/com/mh/common/core/domain/entity/FloorInfo.java
  30. 6
      mh-common/src/main/java/com/mh/common/core/domain/entity/GatewayManage.java
  31. 8
      mh-common/src/main/java/com/mh/common/core/domain/entity/HouseInfo.java
  32. 10
      mh-common/src/main/java/com/mh/common/core/domain/entity/MaintainInfo.java
  33. 6
      mh-common/src/main/java/com/mh/common/core/domain/entity/MqttSubscription.java
  34. 10
      mh-common/src/main/java/com/mh/common/core/domain/entity/SparePartsManage.java
  35. 2
      mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java
  36. 2
      mh-system/src/main/java/com/mh/system/service/device/impl/DeviceInOutManageServiceImpl.java
  37. 2
      mh-system/src/main/java/com/mh/system/service/device/impl/DeviceLedgerServiceImpl.java
  38. 2
      mh-system/src/main/java/com/mh/system/service/device/impl/SparePartsManageServiceImpl.java
  39. 35
      mh-system/src/main/java/com/mh/system/service/operation/impl/AlarmRecordsServiceImpl.java

13
mh-admin/src/main/java/com/mh/web/controller/alarm/AlarmCodeController.java

@ -12,6 +12,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
/**
@ -31,7 +32,7 @@ public class AlarmCodeController extends BaseController {
/**
* 获取报警编码记录列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:ac:list')")
@PreAuthorize("@ss.hasPermi('alarm:ac:list')")
@GetMapping("/list")
public TableDataInfo list(AlarmCode alarmCode)
{
@ -43,7 +44,7 @@ public class AlarmCodeController extends BaseController {
/**
* 根据报警编码记录id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:ac:query')")
@PreAuthorize("@ss.hasPermi('alarm:ac:query')")
@GetMapping(value = "/{acId}")
public AjaxResult getInfo(@PathVariable String acId)
{
@ -53,31 +54,33 @@ public class AlarmCodeController extends BaseController {
/**
* 新增报警编码记录
*/
@PreAuthorize("@ss.hasPermi('system:ac:add')")
@PreAuthorize("@ss.hasPermi('alarm:ac:add')")
@Log(title = "报警编码记录管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody AlarmCode alarmCode)
{
alarmCode.setCreateBy(getUsername());
alarmCode.setCreateTime(new Date());
return toAjax(alarmCodeService.insertAlarmCode(alarmCode));
}
/**
* 修改报警编码记录信息
*/
@PreAuthorize("@ss.hasPermi('system:ac:edit')")
@PreAuthorize("@ss.hasPermi('alarm:ac:edit')")
@Log(title = "报警编码记录管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody AlarmCode alarmCode)
{
alarmCode.setUpdateBy(getUsername());
alarmCode.setUpdateTime(new Date());
return toAjax(alarmCodeService.updateAlarmCode(alarmCode));
}
/**
* 删除报警编码记录管理
*/
@PreAuthorize("@ss.hasPermi('system:ac:remove')")
@PreAuthorize("@ss.hasPermi('alarm:ac:remove')")
@Log(title = "报警编码记录管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{acIds}")
public AjaxResult remove(@PathVariable String[] acIds)

6
mh-admin/src/main/java/com/mh/web/controller/alarm/AlarmRecordsController.java

@ -31,7 +31,7 @@ public class AlarmRecordsController extends BaseController {
/**
* 获取报警规则记录列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:ard:list')")
@PreAuthorize("@ss.hasPermi('alarm:ard:list')")
@GetMapping("/list")
public TableDataInfo list(AlarmRecords alarmRecords)
{
@ -43,7 +43,7 @@ public class AlarmRecordsController extends BaseController {
/**
* 根据报警规则记录id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:ard:query')")
@PreAuthorize("@ss.hasPermi('alarm:ard:query')")
@GetMapping(value = "/{acdId}")
public AjaxResult getInfo(@PathVariable String acdId)
{
@ -53,7 +53,7 @@ public class AlarmRecordsController extends BaseController {
/**
* 删除报警规则记录管理
*/
@PreAuthorize("@ss.hasPermi('system:ard:remove')")
@PreAuthorize("@ss.hasPermi('alarm:ard:remove')")
@Log(title = "报警规则记录管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{acdIds}")
public AjaxResult remove(@PathVariable String[] acdIds)

13
mh-admin/src/main/java/com/mh/web/controller/alarm/AlarmRulesController.java

@ -6,6 +6,7 @@ import com.mh.common.core.domain.AjaxResult;
import com.mh.common.core.domain.entity.AlarmRules;
import com.mh.common.core.page.TableDataInfo;
import com.mh.common.enums.BusinessType;
import com.mh.common.utils.DateUtils;
import com.mh.system.service.operation.IAlarmRulesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -31,7 +32,7 @@ public class AlarmRulesController extends BaseController {
/**
* 获取报警规则记录列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:ar:list')")
@PreAuthorize("@ss.hasPermi('alarm:ar:list')")
@GetMapping("/list")
public TableDataInfo list(AlarmRules alarmRules)
{
@ -43,7 +44,7 @@ public class AlarmRulesController extends BaseController {
/**
* 根据报警规则记录id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:ar:query')")
@PreAuthorize("@ss.hasPermi('alarm:ar:query')")
@GetMapping(value = "/{acId}")
public AjaxResult getInfo(@PathVariable String acId)
{
@ -53,31 +54,33 @@ public class AlarmRulesController extends BaseController {
/**
* 新增报警规则记录
*/
@PreAuthorize("@ss.hasPermi('system:ar:add')")
@PreAuthorize("@ss.hasPermi('alarm:ar:add')")
@Log(title = "报警规则记录管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody AlarmRules alarmRules)
{
alarmRules.setCreateBy(getUsername());
alarmRules.setCreateTime(DateUtils.getNowDate());
return toAjax(alarmRulesService.insertAlarmRules(alarmRules));
}
/**
* 修改报警规则记录信息
*/
@PreAuthorize("@ss.hasPermi('system:ar:edit')")
@PreAuthorize("@ss.hasPermi('alarm:ar:edit')")
@Log(title = "报警规则记录管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody AlarmRules alarmRules)
{
alarmRules.setUpdateBy(getUsername());
alarmRules.setUpdateTime(DateUtils.getNowDate());
return toAjax(alarmRulesService.updateAlarmRules(alarmRules));
}
/**
* 删除报警规则记录管理
*/
@PreAuthorize("@ss.hasPermi('system:ar:remove')")
@PreAuthorize("@ss.hasPermi('alarm:ar:remove')")
@Log(title = "报警规则记录管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{acIds}")
public AjaxResult remove(@PathVariable String[] acIds)

10
mh-admin/src/main/java/com/mh/web/controller/device/CollectionParamsManageController.java

@ -32,7 +32,7 @@ public class CollectionParamsManageController extends BaseController {
/**
* 获取列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:cpm:list')")
@PreAuthorize("@ss.hasPermi('device:cpm:list')")
@GetMapping("/list")
public TableDataInfo list(CollectionParamsManage communicationParams)
{
@ -44,7 +44,7 @@ public class CollectionParamsManageController extends BaseController {
/**
* 根据id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:cpm:query')")
@PreAuthorize("@ss.hasPermi('device:cpm:query')")
@GetMapping(value = "/{cpmId}")
public AjaxResult getInfo(@PathVariable String cpmId)
{
@ -54,7 +54,7 @@ public class CollectionParamsManageController extends BaseController {
/**
* 新增设备采集参数
*/
@PreAuthorize("@ss.hasPermi('system:cpm:add')")
@PreAuthorize("@ss.hasPermi('device:cpm:add')")
@Log(title = "设备采集参数管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody CollectionParamsManage communicationParams)
@ -67,7 +67,7 @@ public class CollectionParamsManageController extends BaseController {
/**
* 修改设备采集参数信息
*/
@PreAuthorize("@ss.hasPermi('system:cpm:edit')")
@PreAuthorize("@ss.hasPermi('device:cpm:edit')")
@Log(title = "设备采集参数管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody CollectionParamsManage communicationParams)
@ -80,7 +80,7 @@ public class CollectionParamsManageController extends BaseController {
/**
* 删除设备采集参数管理
*/
@PreAuthorize("@ss.hasPermi('system:cpm:remove')")
@PreAuthorize("@ss.hasPermi('device:cpm:remove')")
@Log(title = "设备采集参数管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{cpmIds}")
public AjaxResult remove(@PathVariable String[] cpmIds)

10
mh-admin/src/main/java/com/mh/web/controller/device/CommunicationParamsController.java

@ -32,7 +32,7 @@ public class CommunicationParamsController extends BaseController {
/**
* 获取列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:cmp:list')")
@PreAuthorize("@ss.hasPermi('device:cmp:list')")
@GetMapping("/list")
public TableDataInfo list(CommunicationParams communicationParams)
{
@ -44,7 +44,7 @@ public class CommunicationParamsController extends BaseController {
/**
* 根据id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:cmp:query')")
@PreAuthorize("@ss.hasPermi('device:cmp:query')")
@GetMapping(value = "/{cmpId}")
public AjaxResult getInfo(@PathVariable String cmpId)
{
@ -54,7 +54,7 @@ public class CommunicationParamsController extends BaseController {
/**
* 新增网关
*/
@PreAuthorize("@ss.hasPermi('system:cmp:add')")
@PreAuthorize("@ss.hasPermi('device:cmp:add')")
@Log(title = "设备通信采集参数管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody CommunicationParams communicationParams)
@ -67,7 +67,7 @@ public class CommunicationParamsController extends BaseController {
/**
* 修改网关信息
*/
@PreAuthorize("@ss.hasPermi('system:cmp:edit')")
@PreAuthorize("@ss.hasPermi('device:cmp:edit')")
@Log(title = "设备通信采集参数管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody CommunicationParams communicationParams)
@ -80,7 +80,7 @@ public class CommunicationParamsController extends BaseController {
/**
* 删除设备通信采集参数管理
*/
@PreAuthorize("@ss.hasPermi('system:cmp:remove')")
@PreAuthorize("@ss.hasPermi('device:cmp:remove')")
@Log(title = "设备通信采集参数管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{cmpIds}")
public AjaxResult remove(@PathVariable String[] cmpIds)

10
mh-admin/src/main/java/com/mh/web/controller/device/DeviceInOutManageController.java

@ -31,7 +31,7 @@ public class DeviceInOutManageController extends BaseController {
/**
* 获取备品/备件出入库管理流水记录列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:spareInOut:list')")
@PreAuthorize("@ss.hasPermi('device:spareInOut:list')")
@GetMapping("/list")
public TableDataInfo list(DeviceInOutManage deviceInOutManage)
{
@ -43,7 +43,7 @@ public class DeviceInOutManageController extends BaseController {
/**
* 根据备品/备件出入库管理流水记录id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:spareInOut:query')")
@PreAuthorize("@ss.hasPermi('device:spareInOut:query')")
@GetMapping(value = "/{spareId}")
public AjaxResult getInfo(@PathVariable String spareId)
{
@ -53,7 +53,7 @@ public class DeviceInOutManageController extends BaseController {
/**
* 新增备品/备件出入库管理流水记录
*/
@PreAuthorize("@ss.hasPermi('system:spareInOut:add')")
@PreAuthorize("@ss.hasPermi('device:spareInOut:add')")
@Log(title = "备品/备件出入库管理流水记录管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody DeviceInOutManage deviceInOutManage)
@ -66,7 +66,7 @@ public class DeviceInOutManageController extends BaseController {
// /**
// * 修改备品/备件出入库管理流水记录信息
// */
// @PreAuthorize("@ss.hasPermi('system:spareInOut:edit')")
// @PreAuthorize("@ss.hasPermi('device:spareInOut:edit')")
// @Log(title = "备品/备件出入库管理流水记录管理", businessType = BusinessType.UPDATE)
// @PutMapping
// public AjaxResult edit(@Validated @RequestBody DeviceInOutManage deviceInOutManage)
@ -78,7 +78,7 @@ public class DeviceInOutManageController extends BaseController {
// /**
// * 删除备品/备件出入库管理流水记录管理
// */
// @PreAuthorize("@ss.hasPermi('system:spareInOut:remove')")
// @PreAuthorize("@ss.hasPermi('device:spareInOut:remove')")
// @Log(title = "备品/备件出入库管理流水记录管理", businessType = BusinessType.DELETE)
// @DeleteMapping("/{spareIds}")
// public AjaxResult remove(@PathVariable String[] spareIds)

10
mh-admin/src/main/java/com/mh/web/controller/device/DeviceLedgerController.java

@ -32,7 +32,7 @@ public class DeviceLedgerController extends BaseController {
/**
* 获取设备台账列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:ledger:list')")
@PreAuthorize("@ss.hasPermi('device:ledger:list')")
@GetMapping("/list")
public TableDataInfo list(DeviceLedger ledgerInfo)
{
@ -44,7 +44,7 @@ public class DeviceLedgerController extends BaseController {
/**
* 根据设备台账id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:ledger:query')")
@PreAuthorize("@ss.hasPermi('device:ledger:query')")
@GetMapping(value = "/{ledgerId}")
public AjaxResult getInfo(@PathVariable String ledgerId)
{
@ -54,7 +54,7 @@ public class DeviceLedgerController extends BaseController {
/**
* 新增设备台账
*/
@PreAuthorize("@ss.hasPermi('system:ledger:add')")
@PreAuthorize("@ss.hasPermi('device:ledger:add')")
@Log(title = "设备台账管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody DeviceLedger deviceLedger)
@ -67,7 +67,7 @@ public class DeviceLedgerController extends BaseController {
/**
* 修改设备台账信息
*/
@PreAuthorize("@ss.hasPermi('system:ledger:edit')")
@PreAuthorize("@ss.hasPermi('device:ledger:edit')")
@Log(title = "设备台账管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody DeviceLedger deviceLedger)
@ -80,7 +80,7 @@ public class DeviceLedgerController extends BaseController {
/**
* 删除设备台账管理
*/
@PreAuthorize("@ss.hasPermi('system:ledger:remove')")
@PreAuthorize("@ss.hasPermi('device:ledger:remove')")
@Log(title = "设备台账管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ledgerIds}")
public AjaxResult remove(@PathVariable String[] ledgerIds)

12
mh-admin/src/main/java/com/mh/web/controller/device/DeviceQrManageController.java

@ -29,7 +29,7 @@ public class DeviceQrManageController extends BaseController {
@Autowired
private IDeviceQrManageService deviceQrManageService;
@PreAuthorize("@ss.hasPermi('system:qr:create')")
@PreAuthorize("@ss.hasPermi('device:qr:create')")
@GetMapping("/create")
public AjaxResult create(@RequestParam Integer qrNum) throws Exception {
return success(deviceQrManageService.createQrCode(qrNum, getUsername()));
@ -39,7 +39,7 @@ public class DeviceQrManageController extends BaseController {
/**
* 获取二维码维护记录列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:qr:list')")
@PreAuthorize("@ss.hasPermi('device:qr:list')")
@GetMapping("/list")
public TableDataInfo list(DeviceQrManage deviceQrManage)
{
@ -51,7 +51,7 @@ public class DeviceQrManageController extends BaseController {
/**
* 根据二维码维护记录id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:qr:query')")
@PreAuthorize("@ss.hasPermi('device:qr:query')")
@GetMapping(value = "/{qrId}")
public AjaxResult getInfo(@PathVariable String qrId)
{
@ -61,7 +61,7 @@ public class DeviceQrManageController extends BaseController {
/**
* 新增二维码维护记录
*/
@PreAuthorize("@ss.hasPermi('system:qr:add')")
@PreAuthorize("@ss.hasPermi('device:qr:add')")
@Log(title = "二维码维护记录管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody DeviceQrManage deviceQrManage)
@ -74,7 +74,7 @@ public class DeviceQrManageController extends BaseController {
/**
* 修改二维码维护记录信息
*/
@PreAuthorize("@ss.hasPermi('system:qr:edit')")
@PreAuthorize("@ss.hasPermi('device:qr:edit')")
@Log(title = "二维码维护记录管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody DeviceQrManage deviceQrManage)
@ -87,7 +87,7 @@ public class DeviceQrManageController extends BaseController {
/**
* 删除二维码维护记录管理
*/
@PreAuthorize("@ss.hasPermi('system:qr:remove')")
@PreAuthorize("@ss.hasPermi('device:qr:remove')")
@Log(title = "二维码维护记录管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{qrIds}")
public AjaxResult remove(@PathVariable String[] qrIds)

10
mh-admin/src/main/java/com/mh/web/controller/device/GatewayManageController.java

@ -34,7 +34,7 @@ public class GatewayManageController extends BaseController {
/**
* 获取网关列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:gw:list')")
@PreAuthorize("@ss.hasPermi('device:gw:list')")
@GetMapping("/list")
public TableDataInfo list(GatewayManage gatewayManage)
{
@ -46,7 +46,7 @@ public class GatewayManageController extends BaseController {
/**
* 根据网关id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:gw:query')")
@PreAuthorize("@ss.hasPermi('device:gw:query')")
@GetMapping(value = "/{gwId}")
public AjaxResult getInfo(@PathVariable String gwId)
{
@ -56,7 +56,7 @@ public class GatewayManageController extends BaseController {
/**
* 新增网关
*/
@PreAuthorize("@ss.hasPermi('system:gw:add')")
@PreAuthorize("@ss.hasPermi('device:gw:add')")
@Log(title = "网关管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody GatewayManage gatewayManage)
@ -69,7 +69,7 @@ public class GatewayManageController extends BaseController {
/**
* 修改网关信息
*/
@PreAuthorize("@ss.hasPermi('system:gw:edit')")
@PreAuthorize("@ss.hasPermi('device:gw:edit')")
@Log(title = "网关管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody GatewayManage gatewayManage)
@ -82,7 +82,7 @@ public class GatewayManageController extends BaseController {
/**
* 删除网关管理
*/
@PreAuthorize("@ss.hasPermi('system:gw:remove')")
@PreAuthorize("@ss.hasPermi('device:gw:remove')")
@Log(title = "网关管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{gatewayIds}")
public AjaxResult remove(@PathVariable String[] gatewayIds)

13
mh-admin/src/main/java/com/mh/web/controller/device/MaintainInfoController.java

@ -33,7 +33,7 @@ public class MaintainInfoController extends BaseController {
/**
* 获取维护设备列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:maintain:list')")
@PreAuthorize("@ss.hasPermi('device:maintain:list')")
@GetMapping("/list")
public TableDataInfo list(MaintainInfo maintainInfo)
{
@ -45,7 +45,7 @@ public class MaintainInfoController extends BaseController {
/**
* 根据维护设备id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:maintain:query')")
@PreAuthorize("@ss.hasPermi('device:maintain:query')")
@GetMapping(value = "/{maintainId}")
public AjaxResult getInfo(@PathVariable String maintainId)
{
@ -55,19 +55,20 @@ public class MaintainInfoController extends BaseController {
/**
* 新增维护设备
*/
@PreAuthorize("@ss.hasPermi('system:maintain:add')")
@PreAuthorize("@ss.hasPermi('device:maintain:add')")
@Log(title = "维护设备管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody MaintainInfo maintainInfo)
{
maintainInfo.setCreateBy(getUsername());
maintainInfo.setCreateTime(new Date());
return toAjax(maintainInfoService.insertMaintainInfo(maintainInfo));
}
/**
* 修改维护设备信息
*/
@PreAuthorize("@ss.hasPermi('system:maintain:edit')")
@PreAuthorize("@ss.hasPermi('device:maintain:edit')")
@Log(title = "维护设备管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody MaintainInfo maintainInfo)
@ -80,7 +81,7 @@ public class MaintainInfoController extends BaseController {
/**
* 删除维护设备管理
*/
@PreAuthorize("@ss.hasPermi('system:maintain:remove')")
@PreAuthorize("@ss.hasPermi('device:maintain:remove')")
@Log(title = "维护设备管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{maintainIds}")
public AjaxResult remove(@PathVariable String[] maintainIds)
@ -91,7 +92,7 @@ public class MaintainInfoController extends BaseController {
/**
* 删除维护设备管理
*/
@PreAuthorize("@ss.hasPermi('system:maintain:remove')")
@PreAuthorize("@ss.hasPermi('device:maintain:remove')")
@Log(title = "维护设备管理", businessType = BusinessType.DELETE)
@GetMapping("/maintainSum")
public AjaxResult sumMaintain(@RequestParam(value= "buildingId", required=false)String buildingId,

4
mh-admin/src/main/java/com/mh/web/controller/device/OperationController.java

@ -45,7 +45,7 @@ public class OperationController extends BaseController {
/**
* 获取监控列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:cpm:list')")
@PreAuthorize("@ss.hasPermi('device:cpm:list')")
@GetMapping("/monitor/list")
public TableDataInfo list(CollectionParamsManage communicationParams)
{
@ -59,7 +59,7 @@ public class OperationController extends BaseController {
* @param changeValues
* @return
*/
@PreAuthorize("@ss.hasPermi('system:cpm:operation')")
@PreAuthorize("@ss.hasPermi('device:cpm:operation')")
@PostMapping("/operation")
@ControlDeviceAno(value = "设备操作")
public AjaxResult operationDevice(@RequestBody List<OrderEntity> changeValues) {

10
mh-admin/src/main/java/com/mh/web/controller/device/SparePartsManageController.java

@ -31,7 +31,7 @@ public class SparePartsManageController extends BaseController {
/**
* 获取备品/备件出入库管理列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:spare:list')")
@PreAuthorize("@ss.hasPermi('device:spare:list')")
@GetMapping("/list")
public TableDataInfo list(SparePartsManage sparePartsManage)
{
@ -43,7 +43,7 @@ public class SparePartsManageController extends BaseController {
/**
* 根据备品/备件出入库管理id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:spare:query')")
@PreAuthorize("@ss.hasPermi('device:spare:query')")
@GetMapping(value = "/{spareId}")
public AjaxResult getInfo(@PathVariable String spareId)
{
@ -53,7 +53,7 @@ public class SparePartsManageController extends BaseController {
/**
* 新增备品/备件出入库管理
*/
@PreAuthorize("@ss.hasPermi('system:spare:add')")
@PreAuthorize("@ss.hasPermi('device:spare:add')")
@Log(title = "备品/备件出入库管理管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SparePartsManage sparePartsManage)
@ -65,7 +65,7 @@ public class SparePartsManageController extends BaseController {
/**
* 修改备品/备件出入库管理信息
*/
@PreAuthorize("@ss.hasPermi('system:spare:edit')")
@PreAuthorize("@ss.hasPermi('device:spare:edit')")
@Log(title = "备品/备件出入库管理管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SparePartsManage sparePartsManage)
@ -77,7 +77,7 @@ public class SparePartsManageController extends BaseController {
/**
* 删除备品/备件出入库管理管理
*/
@PreAuthorize("@ss.hasPermi('system:spare:remove')")
@PreAuthorize("@ss.hasPermi('device:spare:remove')")
@Log(title = "备品/备件出入库管理管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{spareIds}")
public AjaxResult remove(@PathVariable String[] spareIds)

10
mh-admin/src/main/java/com/mh/web/controller/space/AreaInfoController.java

@ -31,7 +31,7 @@ public class AreaInfoController extends BaseController {
/**
* 获取区域管理列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:area:list')")
@PreAuthorize("@ss.hasPermi('space:area:list')")
@GetMapping("/list")
public TableDataInfo list(AreaInfo areaInfo)
{
@ -43,7 +43,7 @@ public class AreaInfoController extends BaseController {
/**
* 根据区域管理id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:area:query')")
@PreAuthorize("@ss.hasPermi('space:area:query')")
@GetMapping(value = "/{areaId}")
public AjaxResult getInfo(@PathVariable String areaId)
{
@ -53,7 +53,7 @@ public class AreaInfoController extends BaseController {
/**
* 新增区域管理
*/
@PreAuthorize("@ss.hasPermi('system:area:add')")
@PreAuthorize("@ss.hasPermi('space:area:add')")
@Log(title = "区域管理管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody AreaInfo AreaInfo)
@ -65,7 +65,7 @@ public class AreaInfoController extends BaseController {
/**
* 修改区域管理信息
*/
@PreAuthorize("@ss.hasPermi('system:area:edit')")
@PreAuthorize("@ss.hasPermi('space:area:edit')")
@Log(title = "区域管理管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody AreaInfo AreaInfo)
@ -77,7 +77,7 @@ public class AreaInfoController extends BaseController {
/**
* 删除区域管理管理
*/
@PreAuthorize("@ss.hasPermi('system:area:remove')")
@PreAuthorize("@ss.hasPermi('space:area:remove')")
@Log(title = "区域管理管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{areaIds}")
public AjaxResult remove(@PathVariable String[] areaIds)

10
mh-admin/src/main/java/com/mh/web/controller/space/BuildingInfoController.java

@ -31,7 +31,7 @@ public class BuildingInfoController extends BaseController {
/**
* 获取楼栋管理列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:building:list')")
@PreAuthorize("@ss.hasPermi('space:building:list')")
@GetMapping("/list")
public TableDataInfo list(BuildingInfo buildingInfo)
{
@ -43,7 +43,7 @@ public class BuildingInfoController extends BaseController {
/**
* 根据楼栋管理id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:building:query')")
@PreAuthorize("@ss.hasPermi('space:building:query')")
@GetMapping(value = "/{buildingId}")
public AjaxResult getInfo(@PathVariable String buildingId)
{
@ -53,7 +53,7 @@ public class BuildingInfoController extends BaseController {
/**
* 新增楼栋管理
*/
@PreAuthorize("@ss.hasPermi('system:building:add')")
@PreAuthorize("@ss.hasPermi('space:building:add')")
@Log(title = "楼栋管理管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody BuildingInfo BuildingInfo)
@ -65,7 +65,7 @@ public class BuildingInfoController extends BaseController {
/**
* 修改楼栋管理信息
*/
@PreAuthorize("@ss.hasPermi('system:building:edit')")
@PreAuthorize("@ss.hasPermi('space:building:edit')")
@Log(title = "楼栋管理管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody BuildingInfo BuildingInfo)
@ -77,7 +77,7 @@ public class BuildingInfoController extends BaseController {
/**
* 删除楼栋管理管理
*/
@PreAuthorize("@ss.hasPermi('system:building:remove')")
@PreAuthorize("@ss.hasPermi('space:building:remove')")
@Log(title = "楼栋管理管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{buildingIds}")
public AjaxResult remove(@PathVariable String[] buildingIds)

10
mh-admin/src/main/java/com/mh/web/controller/space/CpmSpaceRelationController.java

@ -36,7 +36,7 @@ public class CpmSpaceRelationController extends BaseController {
/**
* 获取采集参数区域等关联管理列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:cpmSpaceRelation:list')")
@PreAuthorize("@ss.hasPermi('space:cpmSpaceRelation:list')")
@GetMapping("/list")
public TableDataInfo list(CpmSpaceRelation cpmSpaceRelation)
{
@ -48,7 +48,7 @@ public class CpmSpaceRelationController extends BaseController {
/**
* 根据区域管理id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:cpmSpaceRelation:query')")
@PreAuthorize("@ss.hasPermi('space:cpmSpaceRelation:query')")
@GetMapping(value = "/{cpmSpaceRelationId}")
public AjaxResult getInfo(@PathVariable String cpmSpaceRelationId)
{
@ -58,7 +58,7 @@ public class CpmSpaceRelationController extends BaseController {
/**
* 新增采集参数区域等关联管理
*/
@PreAuthorize("@ss.hasPermi('system:cpmSpaceRelation:add')")
@PreAuthorize("@ss.hasPermi('space:cpmSpaceRelation:add')")
@Log(title = "采集参数、区域等关联管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody CpmSpaceRelation CpmSpaceRelation)
@ -70,7 +70,7 @@ public class CpmSpaceRelationController extends BaseController {
/**
* 修改采集参数区域等关联管理
*/
@PreAuthorize("@ss.hasPermi('system:cpmSpaceRelation:edit')")
@PreAuthorize("@ss.hasPermi('space:cpmSpaceRelation:edit')")
@Log(title = "采集参数、区域等关联管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody CpmSpaceRelation CpmSpaceRelation)
@ -82,7 +82,7 @@ public class CpmSpaceRelationController extends BaseController {
/**
* 删除采集参数区域等关联管理
*/
@PreAuthorize("@ss.hasPermi('system:cpmSpaceRelation:remove')")
@PreAuthorize("@ss.hasPermi('space:cpmSpaceRelation:remove')")
@Log(title = "采集参数、区域等关联管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{cpmSpaceRelationIds}")
public AjaxResult remove(@PathVariable String[] cpmSpaceRelationIds)

10
mh-admin/src/main/java/com/mh/web/controller/space/FloorInfoController.java

@ -31,7 +31,7 @@ public class FloorInfoController extends BaseController {
/**
* 获取楼层管理列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:floor:list')")
@PreAuthorize("@ss.hasPermi('space:floor:list')")
@GetMapping("/list")
public TableDataInfo list(FloorInfo floorInfo)
{
@ -43,7 +43,7 @@ public class FloorInfoController extends BaseController {
/**
* 根据楼层管理id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:floor:query')")
@PreAuthorize("@ss.hasPermi('space:floor:query')")
@GetMapping(value = "/{floorId}")
public AjaxResult getInfo(@PathVariable String floorId)
{
@ -53,7 +53,7 @@ public class FloorInfoController extends BaseController {
/**
* 新增楼层管理
*/
@PreAuthorize("@ss.hasPermi('system:floor:add')")
@PreAuthorize("@ss.hasPermi('space:floor:add')")
@Log(title = "楼层管理管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody FloorInfo FloorInfo)
@ -65,7 +65,7 @@ public class FloorInfoController extends BaseController {
/**
* 修改楼层管理信息
*/
@PreAuthorize("@ss.hasPermi('system:floor:edit')")
@PreAuthorize("@ss.hasPermi('space:floor:edit')")
@Log(title = "楼层管理管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody FloorInfo FloorInfo)
@ -77,7 +77,7 @@ public class FloorInfoController extends BaseController {
/**
* 删除楼层管理管理
*/
@PreAuthorize("@ss.hasPermi('system:floor:remove')")
@PreAuthorize("@ss.hasPermi('space:floor:remove')")
@Log(title = "楼层管理管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{floorIds}")
public AjaxResult remove(@PathVariable String[] floorIds)

10
mh-admin/src/main/java/com/mh/web/controller/space/HouseInfoController.java

@ -31,7 +31,7 @@ public class HouseInfoController extends BaseController {
/**
* 获取房间列表内容数据
*/
@PreAuthorize("@ss.hasPermi('system:house:list')")
@PreAuthorize("@ss.hasPermi('space:house:list')")
@GetMapping("/list")
public TableDataInfo list(HouseInfo houseInfo)
{
@ -43,7 +43,7 @@ public class HouseInfoController extends BaseController {
/**
* 根据房间id获取详细信息
*/
@PreAuthorize("@ss.hasPermi('system:house:query')")
@PreAuthorize("@ss.hasPermi('space:house:query')")
@GetMapping(value = "/{houseId}")
public AjaxResult getInfo(@PathVariable String houseId)
{
@ -53,7 +53,7 @@ public class HouseInfoController extends BaseController {
/**
* 新增房间
*/
@PreAuthorize("@ss.hasPermi('system:house:add')")
@PreAuthorize("@ss.hasPermi('space:house:add')")
@Log(title = "房间信息管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody HouseInfo HouseInfo)
@ -65,7 +65,7 @@ public class HouseInfoController extends BaseController {
/**
* 修改房间信息
*/
@PreAuthorize("@ss.hasPermi('system:house:edit')")
@PreAuthorize("@ss.hasPermi('space:house:edit')")
@Log(title = "房间信息管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody HouseInfo HouseInfo)
@ -77,7 +77,7 @@ public class HouseInfoController extends BaseController {
/**
* 删除房间信息管理
*/
@PreAuthorize("@ss.hasPermi('system:house:remove')")
@PreAuthorize("@ss.hasPermi('space:house:remove')")
@Log(title = "房间信息管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{houseIds}")
public AjaxResult remove(@PathVariable String[] houseIds)

52
mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmCode.java

@ -1,11 +1,16 @@
package com.mh.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.Map;
/**
* @author LJF
* @version 1.0
@ -49,6 +54,50 @@ public class AlarmCode extends BaseEntity {
*/
private String msgContent;
@JsonIgnore
@TableField(exist = false)
private String remark;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 请求参数 */
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
@Override
public String getSearchValue() {
return searchValue;
}
@Override
public void setSearchValue(String searchValue) {
this.searchValue = searchValue;
}
@Override
public Map<String, Object> getParams() {
return params;
}
@Override
public void setParams(Map<String, Object> params) {
this.params = params;
}
public String getId() {
return id;
}
@ -115,6 +164,9 @@ public class AlarmCode extends BaseEntity {
.append("alarmLevel", alarmLevel)
.append("msgTitle", msgTitle)
.append("msgContent", msgContent)
.append("remark", remark)
.append("searchValue", searchValue)
.append("params", params)
.toString();
}
}

20
mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmRecords.java

@ -1,12 +1,16 @@
package com.mh.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
/**
* @author LJF
@ -31,6 +35,7 @@ public class AlarmRecords implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@ -68,6 +73,19 @@ public class AlarmRecords implements Serializable {
*/
private String cpmName;
/** 请求参数 */
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
public Map<String, Object> getParams() {
return params;
}
public void setParams(Map<String, Object> params) {
this.params = params;
}
public String getId() {
return id;
}
@ -161,6 +179,8 @@ public class AlarmRecords implements Serializable {
.append("deviceName", deviceName)
.append("cpmId", cpmId)
.append("cpmName", cpmName)
.append("params", params)
.toString();
}
}

3
mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmRules.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -124,9 +125,11 @@ public class AlarmRules extends BaseEntity {
*/
private Integer status;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 请求参数 */
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)

2
mh-common/src/main/java/com/mh/common/core/domain/entity/AreaInfo.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -38,6 +39,7 @@ public class AreaInfo extends BaseEntity {
*/
private String parentId;
@JsonIgnore
@TableField(exist = false)
private String searchValue;

2
mh-common/src/main/java/com/mh/common/core/domain/entity/BuildingInfo.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -36,6 +37,7 @@ public class BuildingInfo extends BaseEntity {
private Integer pumpCount; // 水泵数量,记录楼栋内安装的水泵数量。
private BigDecimal lowTankHeight; // 低区水箱高度,记录低区水箱的具体高度。
@JsonIgnore
@TableField(exist = false)
private String searchValue;

2
mh-common/src/main/java/com/mh/common/core/domain/entity/CollectionParamsManage.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -160,6 +161,7 @@ public class CollectionParamsManage extends BaseEntity {
*/
private Integer grade;
@JsonIgnore
@TableField(exist = false)
private String searchValue;

2
mh-common/src/main/java/com/mh/common/core/domain/entity/CommunicationParams.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -51,6 +52,7 @@ public class CommunicationParams extends BaseEntity {
*/
private String parity;
@JsonIgnore
@TableField(exist = false)
private String searchValue;

6
mh-common/src/main/java/com/mh/common/core/domain/entity/CpmSpaceRelation.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import lombok.Getter;
@ -60,10 +61,13 @@ public class CpmSpaceRelation extends BaseEntity {
@TableField(exist = false)
private String remark;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

10
mh-common/src/main/java/com/mh/common/core/domain/entity/DeviceInOutManage.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -48,14 +49,19 @@ public class DeviceInOutManage extends BaseEntity {
*/
private Integer inventoryLevels;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 备注 */
/**
* 备注
*/
@TableField(exist = false)
private String remark;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

2
mh-common/src/main/java/com/mh/common/core/domain/entity/DeviceLedger.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -86,6 +87,7 @@ public class DeviceLedger extends BaseEntity {
*/
private Integer isCalcEnergy;
@JsonIgnore
@TableField(exist = false)
private String searchValue;

10
mh-common/src/main/java/com/mh/common/core/domain/entity/DeviceQrManage.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -54,14 +55,19 @@ public class DeviceQrManage extends BaseEntity {
*/
private Integer status;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 备注 */
/**
* 备注
*/
@TableField(exist = false)
private String remark;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

6
mh-common/src/main/java/com/mh/common/core/domain/entity/FloorInfo.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import lombok.Getter;
@ -68,10 +69,13 @@ public class FloorInfo extends BaseEntity {
*/
private String parentId = "0";
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

6
mh-common/src/main/java/com/mh/common/core/domain/entity/GatewayManage.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -35,10 +36,13 @@ public class GatewayManage extends BaseEntity {
private int grade; // 标志位(连接状态) 0:正常;1:不在线;2:异常
private Integer status; // (连接状态) 0:正常;1:不在线;2:异常
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

8
mh-common/src/main/java/com/mh/common/core/domain/entity/HouseInfo.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import lombok.Getter;
@ -69,7 +70,7 @@ public class HouseInfo extends BaseEntity {
private BigDecimal usableArea;
/**
*建造年份
* 建造年份
*/
private String builtYear;
@ -78,10 +79,13 @@ public class HouseInfo extends BaseEntity {
*/
private Integer status;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

10
mh-common/src/main/java/com/mh/common/core/domain/entity/MaintainInfo.java

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -31,14 +32,19 @@ public class MaintainInfo extends BaseEntity {
private Integer spendTimes; // 花费时间
private String buildingId; // 楼栋id
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 备注 */
/**
* 备注
*/
@TableField(exist = false)
private String remark;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

6
mh-common/src/main/java/com/mh/common/core/domain/entity/MqttSubscription.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -31,10 +32,13 @@ public class MqttSubscription extends BaseEntity {
private String status;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

10
mh-common/src/main/java/com/mh/common/core/domain/entity/SparePartsManage.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.mh.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -67,14 +68,19 @@ public class SparePartsManage extends BaseEntity {
*/
private BigDecimal unitPrice;
@JsonIgnore
@TableField(exist = false)
private String searchValue;
/** 备注 */
/**
* 备注
*/
@TableField(exist = false)
private String remark;
/** 请求参数 */
/**
* 请求参数
*/
@TableField(exist = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;

2
mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java

@ -74,7 +74,7 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag
queryWrapper.like("remark", communicationParams.getRemark());
}
// 添加时间范围
if (!communicationParams.getParams().isEmpty()) {
if (communicationParams.getParams() != null && !communicationParams.getParams().isEmpty()) {
String beginTimeStr = (String) communicationParams.getParams().get("beginTime");
String endTimeStr = (String) communicationParams.getParams().get("endTime");

2
mh-system/src/main/java/com/mh/system/service/device/impl/DeviceInOutManageServiceImpl.java

@ -48,7 +48,7 @@ public class DeviceInOutManageServiceImpl implements IDeviceInOutManageService {
}
// 出入库时间范围
// 添加时间范围
if (!deviceInOutManage.getParams().isEmpty()) {
if (deviceInOutManage.getParams() != null && !deviceInOutManage.getParams().isEmpty()) {
String beginTimeStr = (String) deviceInOutManage.getParams().get("beginTime");
String endTimeStr = (String) deviceInOutManage.getParams().get("endTime");

2
mh-system/src/main/java/com/mh/system/service/device/impl/DeviceLedgerServiceImpl.java

@ -44,7 +44,7 @@ public class DeviceLedgerServiceImpl implements IDeviceLedgerService {
queryWrapper.like("device_type", ledgerInfo.getDeviceType());
}
// 出入库时间范围
if (!ledgerInfo.getParams().isEmpty()) {
if (ledgerInfo.getParams() != null && !ledgerInfo.getParams().isEmpty()) {
String beginTimeStr = (String) ledgerInfo.getParams().get("beginTime");
String endTimeStr = (String) ledgerInfo.getParams().get("endTime");

2
mh-system/src/main/java/com/mh/system/service/device/impl/SparePartsManageServiceImpl.java

@ -41,7 +41,7 @@ public class SparePartsManageServiceImpl implements ISparePartsManageService {
}
// 入库时间范围
// 添加时间范围
if (!sparePartsManage.getParams().isEmpty()) {
if (sparePartsManage.getParams() != null && !sparePartsManage.getParams().isEmpty()) {
String beginTimeStr = (String) sparePartsManage.getParams().get("beginTime");
String endTimeStr = (String) sparePartsManage.getParams().get("endTime");

35
mh-system/src/main/java/com/mh/system/service/operation/impl/AlarmRecordsServiceImpl.java

@ -2,12 +2,15 @@ package com.mh.system.service.operation.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mh.common.core.domain.entity.AlarmRecords;
import com.mh.common.utils.StringUtils;
import com.mh.system.mapper.operation.AlarmRecordsMapper;
import com.mh.system.service.operation.IAlarmRecordsService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@ -56,40 +59,48 @@ public class AlarmRecordsServiceImpl implements IAlarmRecordsService {
}
QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
// 报警类型
if (!alarmRecords.getAlarmType().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getAlarmType())) {
queryWrapper.eq("alarm_type", alarmRecords.getAlarmType());
}
// 事件类型
if (!alarmRecords.getEventType().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getEventType())) {
queryWrapper.eq("event_type", alarmRecords.getEventType());
}
// 报警等级
if (!alarmRecords.getAlarmLevel().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getAlarmLevel())) {
queryWrapper.eq("alarm_level", alarmRecords.getAlarmLevel());
}
// 设备名称
if (!alarmRecords.getDeviceName().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getDeviceName())) {
queryWrapper.like("device_name", alarmRecords.getDeviceName());
}
// 报警时间
if (alarmRecords.getCreateTime() != null) {
queryWrapper.apply("to_char(create_time, 'YYYY-MM-DD HH24') = {0}",
new SimpleDateFormat("yyyy-MM-dd HH").format(alarmRecords.getCreateTime()));
// 报警时间范围
if (alarmRecords.getParams() != null && !alarmRecords.getParams().isEmpty()) {
String beginTimeStr = (String) alarmRecords.getParams().get("beginTime");
String endTimeStr = (String) alarmRecords.getParams().get("endTime");
if (StringUtils.isNotEmpty(beginTimeStr) && StringUtils.isNotEmpty(endTimeStr)) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDate beginTime = LocalDate.parse(beginTimeStr, formatter);
LocalDate endTime = LocalDate.parse(endTimeStr, formatter);
queryWrapper.between("create_time", java.sql.Date.valueOf(beginTime), java.sql.Date.valueOf(endTime));
}
}
// 台账id
if (!alarmRecords.getLedgerId().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getLedgerId())) {
queryWrapper.eq("ledger_id", alarmRecords.getLedgerId());
}
// 仪表参数id
if (!alarmRecords.getCpmId().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getCpmId())) {
queryWrapper.eq("cpm_id", alarmRecords.getCpmId());
}
// 仪表参数名称
if (!alarmRecords.getCpmName().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getCpmName())) {
queryWrapper.like("cpm_name", alarmRecords.getCpmName());
}
// 报警内容
if (!alarmRecords.getContent().isEmpty()) {
if (!StringUtils.isEmpty(alarmRecords.getContent())) {
queryWrapper.like("content", alarmRecords.getContent());
}
queryWrapper.orderByDesc("create_time");

Loading…
Cancel
Save