diff --git a/start/src/main/resources/templates/iotalarm.html b/start/src/main/resources/templates/iotalarm.html index ad3dd48..49ea399 100644 --- a/start/src/main/resources/templates/iotalarm.html +++ b/start/src/main/resources/templates/iotalarm.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/start/src/main/resources/templates/iotalarm/static/jjb.config.js b/start/src/main/resources/templates/iotalarm/static/jjb.config.js index 703a23f..2e94cce 100644 --- a/start/src/main/resources/templates/iotalarm/static/jjb.config.js +++ b/start/src/main/resources/templates/iotalarm/static/jjb.config.js @@ -1 +1 @@ -module.exports={javaGit:"",javaGitName:"",environment:{development:{javaGitBranch:"",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"",API_HOST:""}},appIdentifier:"iotalarm",contextInject:{appKey:"",fileUrl:"https://jpfz.qhdsafety.com/gbsFileTest/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8088",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}}; \ No newline at end of file +module.exports={javaGit:"",javaGitName:"",environment:{development:{javaGitBranch:"",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"",API_HOST:""}},appIdentifier:"iotalarm",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8088",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}}; \ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java b/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java index a6b273a..c204f98 100644 --- a/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java +++ b/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java @@ -5,6 +5,7 @@ import com.alibaba.cola.dto.SingleResponse; import com.zcloud.api.SensorDeviceServiceI; import com.zcloud.dto.*; import com.zcloud.dto.clientobject.SensorDeviceCO; +import com.zcloud.dto.clientobject.SensorDeviceScreenCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -87,4 +88,10 @@ public class SensorDeviceController { public SingleResponse info(@PathVariable("id") Long id) { return sensorDeviceService.info(id); } + + @ApiOperation("可视化大屏-传感器设备查询") + @PostMapping("/screenList") + public PageResponse screenList(@Validated @RequestBody SensorDeviceScreenQry qry) { + return sensorDeviceService.screenList(qry); + } } diff --git a/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java index 1d8a223..b96a238 100644 --- a/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java +++ b/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java @@ -5,7 +5,9 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.dto.SensorDevicePageQry; +import com.zcloud.dto.SensorDeviceScreenQry; import com.zcloud.dto.clientobject.SensorDeviceCO; +import com.zcloud.dto.clientobject.SensorDeviceScreenCO; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.persistence.dataobject.SensorDeviceDO; import com.zcloud.persistence.repository.SensorDeviceRepository; @@ -34,6 +36,12 @@ public class SensorDeviceQueryExe { List sensorDeviceCOs = BeanUtil.copyToList(pageResponse.getData(), SensorDeviceCO.class); return PageResponse.of(sensorDeviceCOs, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse screenList(SensorDeviceScreenQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = sensorDeviceRepository.screenList(params); + return PageResponse.of(pageResponse.getData(), pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } public SingleResponse getById(Long id) { SensorDeviceDO d = sensorDeviceRepository.getById(id); diff --git a/web-app/src/main/java/com/zcloud/service/SensorDeviceServiceImpl.java b/web-app/src/main/java/com/zcloud/service/SensorDeviceServiceImpl.java index c48d85d..78d8dcc 100644 --- a/web-app/src/main/java/com/zcloud/service/SensorDeviceServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/service/SensorDeviceServiceImpl.java @@ -11,6 +11,7 @@ import com.zcloud.command.query.SensorDeviceQueryExe; import com.zcloud.command.SensorDeviceAddExe; import com.zcloud.dto.*; import com.zcloud.dto.clientobject.SensorDeviceCO; +import com.zcloud.dto.clientobject.SensorDeviceScreenCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -30,6 +31,11 @@ public class SensorDeviceServiceImpl implements SensorDeviceServiceI { return sensorDeviceQueryExe.execute(qry); } + @Override + public PageResponse screenList(SensorDeviceScreenQry qry) { + return sensorDeviceQueryExe.screenList(qry); + } + @Override public SingleResponse add(SensorDeviceAddCmd cmd) { sensorDeviceAddExe.execute(cmd); diff --git a/web-client/src/main/java/com/zcloud/api/SensorDeviceServiceI.java b/web-client/src/main/java/com/zcloud/api/SensorDeviceServiceI.java index b98f327..7be2f86 100644 --- a/web-client/src/main/java/com/zcloud/api/SensorDeviceServiceI.java +++ b/web-client/src/main/java/com/zcloud/api/SensorDeviceServiceI.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.dto.*; import com.zcloud.dto.clientobject.SensorDeviceCO; +import com.zcloud.dto.clientobject.SensorDeviceScreenCO; /** * SensorDeviceServiceI - 传感器设备服务接口 @@ -19,6 +20,8 @@ public interface SensorDeviceServiceI { */ PageResponse listPage(SensorDevicePageQry qry); + PageResponse screenList(SensorDeviceScreenQry qry); + /** * 新增 * @param cmd diff --git a/web-client/src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java b/web-client/src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java new file mode 100644 index 0000000..91b77e7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java @@ -0,0 +1,28 @@ +package com.zcloud.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.AssertTrue; + +/** + * 可视化大屏传感器设备查询请求 + * + * @Author wangyan + * @Date 2026-07-20 + */ +@Data +public class SensorDeviceScreenQry extends PageQuery { + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; + + @AssertTrue(message = "企业id和港区至少传一个") + public boolean isCorpinfoIdOrPortAreaPresent() { + return corpinfoId != null || portArea != null; + } +} diff --git a/web-client/src/main/java/com/zcloud/dto/clientobject/SensorDeviceScreenCO.java b/web-client/src/main/java/com/zcloud/dto/clientobject/SensorDeviceScreenCO.java new file mode 100644 index 0000000..72d6772 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/dto/clientobject/SensorDeviceScreenCO.java @@ -0,0 +1,19 @@ +package com.zcloud.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 可视化大屏传感器设备返回对象 + * + * @Author wangyan + * @Date 2026-07-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class SensorDeviceScreenCO extends SensorDeviceCO { + + @ApiModelProperty(value = "企业名称") + private String corpName; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java b/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java index 334d974..3ac36fb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; +import com.zcloud.dto.clientobject.SensorDeviceScreenCO; import com.zcloud.persistence.dataobject.SensorDeviceDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,4 +24,6 @@ import java.util.Map; public interface SensorDeviceMapper extends BaseMapper { IPage listPage(IPage page, @Param("params") Map params, @Param("menuPerms") String menuPerms); + + IPage screenList(IPage page, @Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java index a0435ce..c1611d3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java @@ -2,6 +2,7 @@ package com.zcloud.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.dto.clientobject.SensorDeviceScreenCO; import com.zcloud.persistence.dataobject.SensorDeviceDO; import java.util.Map; @@ -14,4 +15,6 @@ import java.util.Map; public interface SensorDeviceRepository extends BaseRepository { PageResponse listPage(Map params); + + PageResponse screenList(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java index 3431510..1e76a91 100644 --- a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.domain.enums.MenuEnum; +import com.zcloud.dto.clientobject.SensorDeviceScreenCO; import com.zcloud.persistence.dataobject.SensorDeviceDO; import com.zcloud.persistence.mapper.SensorDeviceMapper; import com.zcloud.persistence.repository.SensorDeviceRepository; @@ -35,4 +36,11 @@ public class SensorDeviceRepositoryImpl extends BaseRepositoryImpl result = sensorDeviceMapper.listPage(page, params, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public PageResponse screenList(Map params) { + IPage page = new Query().getPage(params); + IPage result = sensorDeviceMapper.screenList(page, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } } diff --git a/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml b/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml index 6c86d77..c8eb831 100644 --- a/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml @@ -35,4 +35,26 @@ ORDER BY CASE WHEN sd.sensor_status = 'NORMAL' AND sd.alarm_switch = 1 THEN 0 ELSE 1 END, sd.create_time DESC + +