diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index daf3952..c36298d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -@Configuration +//@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index daf3952..c36298d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -@Configuration +//@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 8fd8a96..6de153c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -54,7 +54,7 @@ return sysDictMapper.getAlarmContentByName(sName); } - @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId") + @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode") public Map getWellInfoViaCode(String wellCode,Long deptId) { Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index daf3952..c36298d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -@Configuration +//@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 8fd8a96..6de153c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -54,7 +54,7 @@ return sysDictMapper.getAlarmContentByName(sName); } - @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId") + @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode") public Map getWellInfoViaCode(String wellCode,Long deptId) { Map retMap = new HashMap<>(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java index f3ac2a0..d20b2c1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.overview.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.ToolUtil; @@ -64,8 +66,14 @@ @Override public DeviceWellView deviceDetail(Serializable id) { - DeviceWellView detail = this.selectById(id); - // deptName, companyName + List deptIds =permissionService.getCurrUserDataScope().getDeptIds(); + Wrapper wrapper = new EntityWrapper<>(); + wrapper.eq("id",id); + wrapper.in("deptId",deptIds); + List details= this.selectList(wrapper); + DeviceWellView detail = null; + if(details!=null&&details.size()>0) + detail= details.get(0); if(ToolUtil.isNotEmpty(detail.getDeptId())){ detail.setDeptName(permissionService.getDeptName(detail.getDeptId())); List parentDepts = permissionService.getParentDeptIds(detail.getDeptId()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index daf3952..c36298d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -@Configuration +//@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 8fd8a96..6de153c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -54,7 +54,7 @@ return sysDictMapper.getAlarmContentByName(sName); } - @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId") + @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode") public Map getWellInfoViaCode(String wellCode,Long deptId) { Map retMap = new HashMap<>(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java index f3ac2a0..d20b2c1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.overview.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.ToolUtil; @@ -64,8 +66,14 @@ @Override public DeviceWellView deviceDetail(Serializable id) { - DeviceWellView detail = this.selectById(id); - // deptName, companyName + List deptIds =permissionService.getCurrUserDataScope().getDeptIds(); + Wrapper wrapper = new EntityWrapper<>(); + wrapper.eq("id",id); + wrapper.in("deptId",deptIds); + List details= this.selectList(wrapper); + DeviceWellView detail = null; + if(details!=null&&details.size()>0) + detail= details.get(0); if(ToolUtil.isNotEmpty(detail.getDeptId())){ detail.setDeptName(permissionService.getDeptName(detail.getDeptId())); List parentDepts = permissionService.getParentDeptIds(detail.getDeptId()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index fc56b9d..07ed587 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -95,7 +95,7 @@ * 电池电量 */ // @Excel(name = "电池电量", orderNum = "12") -// private String cell; + private String cell; /** * 闸井名称 diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index daf3952..c36298d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; //tomcat启动无需配置 -@Configuration +//@Configuration public class WebSocketConfig { /** * 注入ServerEndpointExporter， diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 8fd8a96..6de153c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -54,7 +54,7 @@ return sysDictMapper.getAlarmContentByName(sName); } - @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId") + @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode") public Map getWellInfoViaCode(String wellCode,Long deptId) { Map retMap = new HashMap<>(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java index f3ac2a0..d20b2c1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/overview/service/impl/DeviceWellViewServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.overview.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.ToolUtil; @@ -64,8 +66,14 @@ @Override public DeviceWellView deviceDetail(Serializable id) { - DeviceWellView detail = this.selectById(id); - // deptName, companyName + List deptIds =permissionService.getCurrUserDataScope().getDeptIds(); + Wrapper wrapper = new EntityWrapper<>(); + wrapper.eq("id",id); + wrapper.in("deptId",deptIds); + List details= this.selectList(wrapper); + DeviceWellView detail = null; + if(details!=null&&details.size()>0) + detail= details.get(0); if(ToolUtil.isNotEmpty(detail.getDeptId())){ detail.setDeptName(permissionService.getDeptName(detail.getDeptId())); List parentDepts = permissionService.getParentDeptIds(detail.getDeptId()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index fc56b9d..07ed587 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -95,7 +95,7 @@ * 电池电量 */ // @Excel(name = "电池电量", orderNum = "12") -// private String cell; + private String cell; /** * 闸井名称 diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx index 7a343e8..58fd703 100644 --- a/casic-web/src/main/resources/config/temp/device_template.xlsx +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ