diff --git a/fys-admin/src/main/resources/application-dev.yml b/fys-admin/src/main/resources/application-dev.yml index 43b5507..52b2877 100644 --- a/fys-admin/src/main/resources/application-dev.yml +++ b/fys-admin/src/main/resources/application-dev.yml @@ -49,9 +49,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://120.79.224.186:3366/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: root + password: 1fys@QWER.. # # 从库数据源 # slave: # lazy: true @@ -98,13 +98,13 @@ spring: spring.data: redis: # 地址 - host: 123.207.99.140 + host: 120.79.224.186 # 端口，默认为6379 - port: 6379 + port: 26379 # 数据库索引 database: 2 # redis 密码必须配置 - password: ccxx11234 + password: 1fys@QWER.. # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/fys-modules/fys-equipment/pom.xml b/fys-modules/fys-equipment/pom.xml index f1f5e8c..fe09466 100644 --- a/fys-modules/fys-equipment/pom.xml +++ b/fys-modules/fys-equipment/pom.xml @@ -38,6 +38,11 @@ fys-common-translation + + com.fuyuanshen + fys-system + + com.fuyuanshen diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java index 62f6bc3..f93b997 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java @@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuyuanshen.common.core.constant.ResponseMessageConstants; import com.fuyuanshen.common.core.domain.PageResult; import com.fuyuanshen.common.core.domain.ResponseVO; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.dto.ImportResult; import com.fuyuanshen.equipment.domain.form.DeviceForm; import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; import com.fuyuanshen.equipment.domain.vo.CustomerVo; import com.fuyuanshen.equipment.service.DeviceService; +import com.fuyuanshen.system.domain.vo.SysOssVo; +import com.fuyuanshen.system.service.ISysOssService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -37,21 +40,23 @@ import java.util.List; @RequestMapping("/api/device") public class DeviceController { + private final ISysOssService ossService; private final DeviceService deviceService; @Operation(summary = "分页查询设备列表", security = {@SecurityRequirement(name = "bearer-key")}) @GetMapping - public ResponseVO> queryDevice(DeviceQueryCriteria criteria) { - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - PageResult devices = null; - try { - devices = deviceService.queryAll(criteria, page); - } catch (IOException e) { - log.error("queryDevice error: " + e.getMessage()); - return ResponseVO.fail(""); - } - return ResponseVO.success(devices); + public TableDataInfo queryDevice(DeviceQueryCriteria criteria) throws IOException { + Page page = new Page<>(criteria.getPage(), criteria.getSize()); + // PageResult devices = null; + // try { + // devices = deviceService.queryAll(criteria, page); + // } catch (IOException e) { + // log.error("queryDevice error: " + e.getMessage()); + // return ResponseVO.fail(""); + // } + // return ResponseVO.success(devices); + return deviceService.queryAll(criteria, page); } @@ -159,6 +164,8 @@ public class DeviceController { @PostMapping(value = "/import", consumes = "multipart/form-data") public ResponseVO importData(@Parameter(name = "文件", required = true) @RequestPart("file") MultipartFile file) { + SysOssVo upload = ossService.upload(file); + // String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); // if (!("xlsx".equalsIgnoreCase(suffix))) { // throw new BadRequestException("只能上传Excel——xlsx格式文件"); diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java index 3ff0fe3..4185f8d 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java @@ -3,6 +3,7 @@ package com.fuyuanshen.equipment.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuyuanshen.common.core.domain.PageResult; import com.fuyuanshen.common.core.domain.ResponseVO; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.equipment.domain.DeviceType; import com.fuyuanshen.equipment.domain.form.DeviceTypeForm; import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria; @@ -32,9 +33,9 @@ public class DeviceTypeController { @GetMapping @Operation(summary = "分页查询设备类型") - public ResponseVO> queryDeviceType(DeviceTypeQueryCriteria criteria) { - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return ResponseVO.success(deviceTypeService.queryAll(criteria, page)); + public TableDataInfo queryDeviceType(DeviceTypeQueryCriteria criteria) { + Page page = new Page<>(criteria.getPage(), criteria.getSize()); + return deviceTypeService.queryAll(criteria, page); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java index 075d305..66fdb0d 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java @@ -2,9 +2,7 @@ package com.fuyuanshen.equipment.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fuyuanshen.common.tenant.core.TenantEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -45,6 +43,10 @@ public class DeviceType extends TenantEntity { @Schema(name = "通讯方式", example = "0:4G;1:蓝牙") private String communicationMode; + /** + * 创建人名称 + */ + private String createByName; public void copy(DeviceType source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java index 1cccbca..c473541 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java @@ -25,7 +25,7 @@ public interface DeviceMapper extends BaseMapper { * @param page * @return */ - IPage findAll(@Param("criteria") DeviceQueryCriteria criteria, Page page); + IPage findAll(@Param("criteria") DeviceQueryCriteria criteria, Page page); List findAll(@Param("criteria") DeviceQueryCriteria criteria); diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeMapper.java index 7efd78d..15f0fd1 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeMapper.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeMapper.java @@ -25,7 +25,7 @@ public interface DeviceTypeMapper extends BaseMapper { * @param page * @return */ - IPage findAll(@Param("criteria") DeviceTypeQueryCriteria criteria, Page page); + IPage findAll(@Param("criteria") DeviceTypeQueryCriteria criteria, Page page); /** diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java index fec0c52..af53adb 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java @@ -3,6 +3,7 @@ package com.fuyuanshen.equipment.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuyuanshen.common.core.domain.PageResult; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.form.DeviceForm; import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; @@ -25,7 +26,7 @@ public interface DeviceService extends IService { * @param page 分页参数 * @return PageResult */ - PageResult queryAll(DeviceQueryCriteria criteria, Page page) throws IOException; + TableDataInfo queryAll(DeviceQueryCriteria criteria, Page page) throws IOException; /** * 查询所有设备信息 diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java index 25569ea..aa2b622 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java @@ -3,6 +3,7 @@ package com.fuyuanshen.equipment.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuyuanshen.common.core.domain.PageResult; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.equipment.domain.DeviceType; import com.fuyuanshen.equipment.domain.form.DeviceTypeForm; import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria; @@ -23,7 +24,7 @@ public interface DeviceTypeService extends IService { * @param page 分页参数 * @return PageResult */ - PageResult queryAll(DeviceTypeQueryCriteria criteria, Page page); + TableDataInfo queryAll(DeviceTypeQueryCriteria criteria, Page page); /** * 查询所有数据不分页 diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index f5b91f3..cd99a56 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuyuanshen.common.core.domain.PageResult; import com.fuyuanshen.common.core.utils.PageUtil; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.customer.domain.vo.ConsumerVo; import com.fuyuanshen.equipment.constants.DeviceConstants; import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.DeviceType; @@ -63,7 +65,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme * @throws IOException */ @Override - public PageResult queryAll(DeviceQueryCriteria criteria, Page page) throws IOException { + public TableDataInfo queryAll(DeviceQueryCriteria criteria, Page page) throws IOException { // criteria.setCustomerId(LoginHelper.getUserId()); criteria.setCurrentOwnerId(LoginHelper.getUserId()); @@ -76,7 +78,8 @@ public class DeviceServiceImpl extends ServiceImpl impleme } } - return PageUtil.toPage(devices); + // return PageUtil.toPage(devices); + return new TableDataInfo(records, devices.getTotal()); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java index 975b58f..7c607d3 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java @@ -1,10 +1,13 @@ package com.fuyuanshen.equipment.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuyuanshen.common.core.domain.PageResult; +import com.fuyuanshen.common.core.domain.model.LoginUser; import com.fuyuanshen.common.core.utils.PageUtil; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.DeviceType; @@ -43,9 +46,11 @@ public class DeviceTypeServiceImpl extends ServiceImpl queryAll(DeviceTypeQueryCriteria criteria, Page page) { + public TableDataInfo queryAll(DeviceTypeQueryCriteria criteria, Page page) { criteria.setCustomerId(LoginHelper.getUserId()); - return PageUtil.toPage(deviceTypeMapper.findAll(criteria, page)); + // return + IPage deviceTypeIPage = deviceTypeMapper.findAll(criteria, page); + return new TableDataInfo(deviceTypeIPage.getRecords(), deviceTypeIPage.getTotal()); } @@ -77,9 +82,10 @@ public class DeviceTypeServiceImpl extends ServiceImpl