diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index b441f9f..c1287e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,15 +13,15 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.dto.BusDeviceImportDTO; +import com.casic.missiles.modular.device.dto.BusGmDeviceExportDTO; import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; +import com.casic.missiles.modular.enums.SysEnum; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; import com.casic.missiles.modular.hik.dto.HikAreaDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; @@ -29,6 +30,7 @@ import com.casic.missiles.modular.hik.service.ISyncAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -121,12 +123,16 @@ Math.floor(1); //获取第校验报错信息 ResponseDataDTO responseDataDTO = ResponseDataDTO.error(null); - responseDataDTO.setMessage(StrUtil.join("\n,",list)); + responseDataDTO.setMessage(StrUtil.join("\n,", list)); return responseDataDTO; } return ResponseDataDTO.success(); } + private final AbstractPermissionContext abstractPermissionContext; + @Value("${casic.sysType:sm}") + private String sysType; + @BussinessLog(value = "设备导出") @ApiOperation(value = "列表查询") @GetMapping(value = "/export") @@ -134,11 +140,17 @@ QueryWrapper query = busDeviceInfoVO.genQuery(); DataScope dataScope = abstractPermissionContext.getAuthService().getLoginUserDataScope(); AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); - query.le("secret_level",user.getSecretLevel()); + query.le("secret_level", user.getSecretLevel()); if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { query.in("dept_id", dataScope.getDeptIds()); } - super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + List infos = busDeviceInfoService.list(query); + if (SysEnum.gm.getCode().equals(sysType)) { + List dtos = BeanUtil.copyToList(infos, BusGmDeviceExportDTO.class); + super.exportExcel(BusGmDeviceExportDTO.class, dtos, "设备列表导出"); + } else { + super.exportExcel(BusDeviceInfo.class, infos, "设备列表导出"); + } } @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index b441f9f..c1287e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,15 +13,15 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.dto.BusDeviceImportDTO; +import com.casic.missiles.modular.device.dto.BusGmDeviceExportDTO; import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; +import com.casic.missiles.modular.enums.SysEnum; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; import com.casic.missiles.modular.hik.dto.HikAreaDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; @@ -29,6 +30,7 @@ import com.casic.missiles.modular.hik.service.ISyncAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -121,12 +123,16 @@ Math.floor(1); //获取第校验报错信息 ResponseDataDTO responseDataDTO = ResponseDataDTO.error(null); - responseDataDTO.setMessage(StrUtil.join("\n,",list)); + responseDataDTO.setMessage(StrUtil.join("\n,", list)); return responseDataDTO; } return ResponseDataDTO.success(); } + private final AbstractPermissionContext abstractPermissionContext; + @Value("${casic.sysType:sm}") + private String sysType; + @BussinessLog(value = "设备导出") @ApiOperation(value = "列表查询") @GetMapping(value = "/export") @@ -134,11 +140,17 @@ QueryWrapper query = busDeviceInfoVO.genQuery(); DataScope dataScope = abstractPermissionContext.getAuthService().getLoginUserDataScope(); AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); - query.le("secret_level",user.getSecretLevel()); + query.le("secret_level", user.getSecretLevel()); if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { query.in("dept_id", dataScope.getDeptIds()); } - super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + List infos = busDeviceInfoService.list(query); + if (SysEnum.gm.getCode().equals(sysType)) { + List dtos = BeanUtil.copyToList(infos, BusGmDeviceExportDTO.class); + super.exportExcel(BusGmDeviceExportDTO.class, dtos, "设备列表导出"); + } else { + super.exportExcel(BusDeviceInfo.class, infos, "设备列表导出"); + } } @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 22ec075..4599368 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -78,6 +78,9 @@ @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(SysUserGroupVO deviceGroupInfoVO) { + if(StrUtil.isNotEmpty(deviceGroupInfoVO.getEndTime())){ + deviceGroupInfoVO.setEndTime(deviceGroupInfoVO.getEndTime()+" 23:59:59"); + } Page page = deviceGroupInfoService.userGroupPage(deviceGroupInfoVO); return ResponseDataDTO.success(super.packForBT(page)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index b441f9f..c1287e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,15 +13,15 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.dto.BusDeviceImportDTO; +import com.casic.missiles.modular.device.dto.BusGmDeviceExportDTO; import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; +import com.casic.missiles.modular.enums.SysEnum; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; import com.casic.missiles.modular.hik.dto.HikAreaDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; @@ -29,6 +30,7 @@ import com.casic.missiles.modular.hik.service.ISyncAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -121,12 +123,16 @@ Math.floor(1); //获取第校验报错信息 ResponseDataDTO responseDataDTO = ResponseDataDTO.error(null); - responseDataDTO.setMessage(StrUtil.join("\n,",list)); + responseDataDTO.setMessage(StrUtil.join("\n,", list)); return responseDataDTO; } return ResponseDataDTO.success(); } + private final AbstractPermissionContext abstractPermissionContext; + @Value("${casic.sysType:sm}") + private String sysType; + @BussinessLog(value = "设备导出") @ApiOperation(value = "列表查询") @GetMapping(value = "/export") @@ -134,11 +140,17 @@ QueryWrapper query = busDeviceInfoVO.genQuery(); DataScope dataScope = abstractPermissionContext.getAuthService().getLoginUserDataScope(); AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); - query.le("secret_level",user.getSecretLevel()); + query.le("secret_level", user.getSecretLevel()); if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { query.in("dept_id", dataScope.getDeptIds()); } - super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + List infos = busDeviceInfoService.list(query); + if (SysEnum.gm.getCode().equals(sysType)) { + List dtos = BeanUtil.copyToList(infos, BusGmDeviceExportDTO.class); + super.exportExcel(BusGmDeviceExportDTO.class, dtos, "设备列表导出"); + } else { + super.exportExcel(BusDeviceInfo.class, infos, "设备列表导出"); + } } @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 22ec075..4599368 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -78,6 +78,9 @@ @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(SysUserGroupVO deviceGroupInfoVO) { + if(StrUtil.isNotEmpty(deviceGroupInfoVO.getEndTime())){ + deviceGroupInfoVO.setEndTime(deviceGroupInfoVO.getEndTime()+" 23:59:59"); + } Page page = deviceGroupInfoService.userGroupPage(deviceGroupInfoVO); return ResponseDataDTO.success(super.packForBT(page)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java index ba3cd0c..a7ab96c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java @@ -20,8 +20,9 @@ @ApiModelProperty(value = "备注", dataType = "String") private String description; - @ExcelProperty("所属组织") + @ExcelProperty("所属单位") private String deptName; + @ExcelProperty("经度") @ApiModelProperty(value = "经度", dataType = "BigDecimal") private String longitude; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index b441f9f..c1287e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,15 +13,15 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.dto.BusDeviceImportDTO; +import com.casic.missiles.modular.device.dto.BusGmDeviceExportDTO; import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; +import com.casic.missiles.modular.enums.SysEnum; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; import com.casic.missiles.modular.hik.dto.HikAreaDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; @@ -29,6 +30,7 @@ import com.casic.missiles.modular.hik.service.ISyncAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -121,12 +123,16 @@ Math.floor(1); //获取第校验报错信息 ResponseDataDTO responseDataDTO = ResponseDataDTO.error(null); - responseDataDTO.setMessage(StrUtil.join("\n,",list)); + responseDataDTO.setMessage(StrUtil.join("\n,", list)); return responseDataDTO; } return ResponseDataDTO.success(); } + private final AbstractPermissionContext abstractPermissionContext; + @Value("${casic.sysType:sm}") + private String sysType; + @BussinessLog(value = "设备导出") @ApiOperation(value = "列表查询") @GetMapping(value = "/export") @@ -134,11 +140,17 @@ QueryWrapper query = busDeviceInfoVO.genQuery(); DataScope dataScope = abstractPermissionContext.getAuthService().getLoginUserDataScope(); AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); - query.le("secret_level",user.getSecretLevel()); + query.le("secret_level", user.getSecretLevel()); if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { query.in("dept_id", dataScope.getDeptIds()); } - super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + List infos = busDeviceInfoService.list(query); + if (SysEnum.gm.getCode().equals(sysType)) { + List dtos = BeanUtil.copyToList(infos, BusGmDeviceExportDTO.class); + super.exportExcel(BusGmDeviceExportDTO.class, dtos, "设备列表导出"); + } else { + super.exportExcel(BusDeviceInfo.class, infos, "设备列表导出"); + } } @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 22ec075..4599368 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -78,6 +78,9 @@ @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(SysUserGroupVO deviceGroupInfoVO) { + if(StrUtil.isNotEmpty(deviceGroupInfoVO.getEndTime())){ + deviceGroupInfoVO.setEndTime(deviceGroupInfoVO.getEndTime()+" 23:59:59"); + } Page page = deviceGroupInfoService.userGroupPage(deviceGroupInfoVO); return ResponseDataDTO.success(super.packForBT(page)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java index ba3cd0c..a7ab96c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java @@ -20,8 +20,9 @@ @ApiModelProperty(value = "备注", dataType = "String") private String description; - @ExcelProperty("所属组织") + @ExcelProperty("所属单位") private String deptName; + @ExcelProperty("经度") @ApiModelProperty(value = "经度", dataType = "BigDecimal") private String longitude; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index fa8d626..694d575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -293,10 +293,10 @@ } //商米校验 - if(SysEnum.sm.equals(sysType)){ + if(SysEnum.sm.getCode().equals(sysType)){ validateSmDevice(errors,result,index); } - if(SysEnum.gm.equals(sysType)){ + if(SysEnum.gm.getCode().equals(sysType)){ validateGmDevice(errors,result,index); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index b441f9f..c1287e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,15 +13,15 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.dto.BusDeviceImportDTO; +import com.casic.missiles.modular.device.dto.BusGmDeviceExportDTO; import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; +import com.casic.missiles.modular.enums.SysEnum; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; import com.casic.missiles.modular.hik.dto.HikAreaDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; @@ -29,6 +30,7 @@ import com.casic.missiles.modular.hik.service.ISyncAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -121,12 +123,16 @@ Math.floor(1); //获取第校验报错信息 ResponseDataDTO responseDataDTO = ResponseDataDTO.error(null); - responseDataDTO.setMessage(StrUtil.join("\n,",list)); + responseDataDTO.setMessage(StrUtil.join("\n,", list)); return responseDataDTO; } return ResponseDataDTO.success(); } + private final AbstractPermissionContext abstractPermissionContext; + @Value("${casic.sysType:sm}") + private String sysType; + @BussinessLog(value = "设备导出") @ApiOperation(value = "列表查询") @GetMapping(value = "/export") @@ -134,11 +140,17 @@ QueryWrapper query = busDeviceInfoVO.genQuery(); DataScope dataScope = abstractPermissionContext.getAuthService().getLoginUserDataScope(); AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); - query.le("secret_level",user.getSecretLevel()); + query.le("secret_level", user.getSecretLevel()); if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { query.in("dept_id", dataScope.getDeptIds()); } - super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + List infos = busDeviceInfoService.list(query); + if (SysEnum.gm.getCode().equals(sysType)) { + List dtos = BeanUtil.copyToList(infos, BusGmDeviceExportDTO.class); + super.exportExcel(BusGmDeviceExportDTO.class, dtos, "设备列表导出"); + } else { + super.exportExcel(BusDeviceInfo.class, infos, "设备列表导出"); + } } @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 22ec075..4599368 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -78,6 +78,9 @@ @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(SysUserGroupVO deviceGroupInfoVO) { + if(StrUtil.isNotEmpty(deviceGroupInfoVO.getEndTime())){ + deviceGroupInfoVO.setEndTime(deviceGroupInfoVO.getEndTime()+" 23:59:59"); + } Page page = deviceGroupInfoService.userGroupPage(deviceGroupInfoVO); return ResponseDataDTO.success(super.packForBT(page)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java index ba3cd0c..a7ab96c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java @@ -20,8 +20,9 @@ @ApiModelProperty(value = "备注", dataType = "String") private String description; - @ExcelProperty("所属组织") + @ExcelProperty("所属单位") private String deptName; + @ExcelProperty("经度") @ApiModelProperty(value = "经度", dataType = "BigDecimal") private String longitude; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index fa8d626..694d575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -293,10 +293,10 @@ } //商米校验 - if(SysEnum.sm.equals(sysType)){ + if(SysEnum.sm.getCode().equals(sysType)){ validateSmDevice(errors,result,index); } - if(SysEnum.gm.equals(sysType)){ + if(SysEnum.gm.getCode().equals(sysType)){ validateGmDevice(errors,result,index); } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 2a687dc..8042c66 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -24,6 +24,7 @@ # serializer: org.springframework.data.redis.serializer.StringRedisSerializer # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: + sysType: gm #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources db: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index b441f9f..c1287e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,15 +13,15 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.dto.BusDeviceImportDTO; +import com.casic.missiles.modular.device.dto.BusGmDeviceExportDTO; import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; +import com.casic.missiles.modular.enums.SysEnum; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; import com.casic.missiles.modular.hik.dto.HikAreaDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; @@ -29,6 +30,7 @@ import com.casic.missiles.modular.hik.service.ISyncAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -121,12 +123,16 @@ Math.floor(1); //获取第校验报错信息 ResponseDataDTO responseDataDTO = ResponseDataDTO.error(null); - responseDataDTO.setMessage(StrUtil.join("\n,",list)); + responseDataDTO.setMessage(StrUtil.join("\n,", list)); return responseDataDTO; } return ResponseDataDTO.success(); } + private final AbstractPermissionContext abstractPermissionContext; + @Value("${casic.sysType:sm}") + private String sysType; + @BussinessLog(value = "设备导出") @ApiOperation(value = "列表查询") @GetMapping(value = "/export") @@ -134,11 +140,17 @@ QueryWrapper query = busDeviceInfoVO.genQuery(); DataScope dataScope = abstractPermissionContext.getAuthService().getLoginUserDataScope(); AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); - query.le("secret_level",user.getSecretLevel()); + query.le("secret_level", user.getSecretLevel()); if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { query.in("dept_id", dataScope.getDeptIds()); } - super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + List infos = busDeviceInfoService.list(query); + if (SysEnum.gm.getCode().equals(sysType)) { + List dtos = BeanUtil.copyToList(infos, BusGmDeviceExportDTO.class); + super.exportExcel(BusGmDeviceExportDTO.class, dtos, "设备列表导出"); + } else { + super.exportExcel(BusDeviceInfo.class, infos, "设备列表导出"); + } } @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 22ec075..4599368 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -78,6 +78,9 @@ @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(SysUserGroupVO deviceGroupInfoVO) { + if(StrUtil.isNotEmpty(deviceGroupInfoVO.getEndTime())){ + deviceGroupInfoVO.setEndTime(deviceGroupInfoVO.getEndTime()+" 23:59:59"); + } Page page = deviceGroupInfoService.userGroupPage(deviceGroupInfoVO); return ResponseDataDTO.success(super.packForBT(page)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java index ba3cd0c..a7ab96c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java @@ -20,8 +20,9 @@ @ApiModelProperty(value = "备注", dataType = "String") private String description; - @ExcelProperty("所属组织") + @ExcelProperty("所属单位") private String deptName; + @ExcelProperty("经度") @ApiModelProperty(value = "经度", dataType = "BigDecimal") private String longitude; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index fa8d626..694d575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -293,10 +293,10 @@ } //商米校验 - if(SysEnum.sm.equals(sysType)){ + if(SysEnum.sm.getCode().equals(sysType)){ validateSmDevice(errors,result,index); } - if(SysEnum.gm.equals(sysType)){ + if(SysEnum.gm.getCode().equals(sysType)){ validateGmDevice(errors,result,index); } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 2a687dc..8042c66 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -24,6 +24,7 @@ # serializer: org.springframework.data.redis.serializer.StringRedisSerializer # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: + sysType: gm #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources db: diff --git a/casic-web/src/main/resources/config/application-shentong200.yml b/casic-web/src/main/resources/config/application-shentong200.yml index 53bf64f..b7f7f61 100644 --- a/casic-web/src/main/resources/config/application-shentong200.yml +++ b/casic-web/src/main/resources/config/application-shentong200.yml @@ -23,6 +23,7 @@ jms: pub-sub-domain: true casic: + sysType: gm #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources db: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index b441f9f..c1287e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,15 +13,15 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.device.dto.BusDeviceImportDTO; +import com.casic.missiles.modular.device.dto.BusGmDeviceExportDTO; import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; +import com.casic.missiles.modular.enums.SysEnum; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; import com.casic.missiles.modular.hik.dto.HikAreaDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; @@ -29,6 +30,7 @@ import com.casic.missiles.modular.hik.service.ISyncAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -121,12 +123,16 @@ Math.floor(1); //获取第校验报错信息 ResponseDataDTO responseDataDTO = ResponseDataDTO.error(null); - responseDataDTO.setMessage(StrUtil.join("\n,",list)); + responseDataDTO.setMessage(StrUtil.join("\n,", list)); return responseDataDTO; } return ResponseDataDTO.success(); } + private final AbstractPermissionContext abstractPermissionContext; + @Value("${casic.sysType:sm}") + private String sysType; + @BussinessLog(value = "设备导出") @ApiOperation(value = "列表查询") @GetMapping(value = "/export") @@ -134,11 +140,17 @@ QueryWrapper query = busDeviceInfoVO.genQuery(); DataScope dataScope = abstractPermissionContext.getAuthService().getLoginUserDataScope(); AuthUser user = abstractPermissionContext.getAuthService().getLoginUser(); - query.le("secret_level",user.getSecretLevel()); + query.le("secret_level", user.getSecretLevel()); if (!ScopeEnums.ALL_TYPE.getCode().equals(dataScope.getScopeEnums().getCode())) { query.in("dept_id", dataScope.getDeptIds()); } - super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + List infos = busDeviceInfoService.list(query); + if (SysEnum.gm.getCode().equals(sysType)) { + List dtos = BeanUtil.copyToList(infos, BusGmDeviceExportDTO.class); + super.exportExcel(BusGmDeviceExportDTO.class, dtos, "设备列表导出"); + } else { + super.exportExcel(BusDeviceInfo.class, infos, "设备列表导出"); + } } @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 22ec075..4599368 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -78,6 +78,9 @@ @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(SysUserGroupVO deviceGroupInfoVO) { + if(StrUtil.isNotEmpty(deviceGroupInfoVO.getEndTime())){ + deviceGroupInfoVO.setEndTime(deviceGroupInfoVO.getEndTime()+" 23:59:59"); + } Page page = deviceGroupInfoService.userGroupPage(deviceGroupInfoVO); return ResponseDataDTO.success(super.packForBT(page)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java index ba3cd0c..a7ab96c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceImportDTO.java @@ -20,8 +20,9 @@ @ApiModelProperty(value = "备注", dataType = "String") private String description; - @ExcelProperty("所属组织") + @ExcelProperty("所属单位") private String deptName; + @ExcelProperty("经度") @ApiModelProperty(value = "经度", dataType = "BigDecimal") private String longitude; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index fa8d626..694d575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -293,10 +293,10 @@ } //商米校验 - if(SysEnum.sm.equals(sysType)){ + if(SysEnum.sm.getCode().equals(sysType)){ validateSmDevice(errors,result,index); } - if(SysEnum.gm.equals(sysType)){ + if(SysEnum.gm.getCode().equals(sysType)){ validateGmDevice(errors,result,index); } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 2a687dc..8042c66 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -24,6 +24,7 @@ # serializer: org.springframework.data.redis.serializer.StringRedisSerializer # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: + sysType: gm #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources db: diff --git a/casic-web/src/main/resources/config/application-shentong200.yml b/casic-web/src/main/resources/config/application-shentong200.yml index 53bf64f..b7f7f61 100644 --- a/casic-web/src/main/resources/config/application-shentong200.yml +++ b/casic-web/src/main/resources/config/application-shentong200.yml @@ -23,6 +23,7 @@ jms: pub-sub-domain: true casic: + sysType: gm #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources db: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 89f95c0..ec29e00 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: shentong200 + active: dev servlet: multipart: max-file-size: 50MB