Merge remote-tracking branch 'origin/master' into test

# Conflicts:
#	device-api-service/src/main/java/com/xy/entity/DeviceChargingConfig.java
#	device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingHistoryServiceImpl.java
#	device-api-service/src/main/java/com/xy/service/DeviceChargingConfigServiceImpl.java
#	device-api-service/src/main/java/com/xy/service/DeviceChargingHistoryServiceImpl.java
#	device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java
#	device-api-service/src/main/java/com/xy/service/DeviceSimChargeServiceImpl.java
#	device-api-service/src/main/java/com/xy/service/DeviceTypeAlgorithmBeforConfigServiceImpl.java
#	device-api/src/main/java/com/xy/dto/DeviceChargingHistoryDto.java
#	device-api/src/main/java/com/xy/dto/DeviceDataDto.java
#	device-api/src/main/java/com/xy/dto/DeviceSimChargeDto.java

device-api-service/src/main/java/com/xy/entity/DeviceAdminActivate.java

@@ -1,8 +1,5 @@
 package com.xy.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 管理员设备激活记录表1

device-api-service/src/main/java/com/xy/entity/DeviceChargingConfig.java

@@ -1,14 +1,14 @@
 package com.xy.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 设备计费配置表
@@ -36,7 +36,7 @@ public class DeviceChargingConfig implements Serializable {
 
     @ApiModelProperty(value = "赠送天数/预充金额")
     private Integer configValue;
-    
+
     @ApiModelProperty(value = "代理商额外费用")
     private Integer extraMoney;
 

device-api-service/src/main/java/com/xy/entity/DeviceTypeAlgorithmBeforConfig.java

@@ -1,8 +1,5 @@
 package com.xy.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 设备类型算法预充配置

device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingHistoryServiceImpl.java

@@ -73,10 +73,10 @@ public class DeviceAlgorithmChargingHistoryServiceImpl extends ServiceImpl<Devic
         if (chooseMercId == null) {
             mercIds = R.feignCheckData(mercService.getChildMercIds(new MercDto.QuerySubDTO().setParentMercID(curMercId)));
         } else {
-            //指定商户ID
+            // 指定商户ID
             mercIds.add(chooseMercId);
         }
-        if(CollUtil.isEmpty(mercIds)){
+        if (CollUtil.isEmpty(mercIds)) {
             return R.ok();
         }
         PageBean pageBean = page.getPage();
@@ -90,7 +90,7 @@ public class DeviceAlgorithmChargingHistoryServiceImpl extends ServiceImpl<Devic
         PageBean<DeviceAlgorithmChargingHistoryDto.PageByTopMercVO> voPageBean = toPageBean(DeviceAlgorithmChargingHistoryDto.PageByTopMercVO.class, iPage);
         List<DeviceAlgorithmChargingHistoryDto.PageByTopMercVO> records = voPageBean.getRecords();
         if (Emptys.check(records)) {
-            //佣金配置查询
+            // 佣金配置查询
             List<MercFeeConfigDto.ListFeeConfigByMercVO> feeConfigByMercVOS = R.feignCheckData(mercFeeConfigService.listFeeConfigByMerc(new MercFeeConfigDto.ListFeeConfigByMercDTO().setMercId(curMercId)));
             Map<Long, MercFeeConfigDto.ListFeeConfigByMercVO> configByMercVOMap = MapUtil.newHashMap();
             if (CollUtil.isNotEmpty(feeConfigByMercVOS)) {
@@ -109,7 +109,7 @@ public class DeviceAlgorithmChargingHistoryServiceImpl extends ServiceImpl<Devic
                             , DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getMercId, DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                     .builder();
             for (DeviceAlgorithmChargingHistoryDto.PageByTopMercVO record : records) {
-                //初始0 佣金费用
+                // 初始0 佣金费用
                 int extraMoney = 0;
                 Long mercId = record.getMercId();
                 MercFeeConfigDto.ListFeeConfigByMercVO listFeeConfigByMercVO = configByMercVOMap.get(mercId);
@@ -132,7 +132,7 @@ public class DeviceAlgorithmChargingHistoryServiceImpl extends ServiceImpl<Devic
     public R<PageBean<DeviceAlgorithmChargingHistoryDto.MySpendPageVO>> mySpendPage(DeviceAlgorithmChargingHistoryDto.PageByTopMerc page) {
         Long curMercId = page.getCurMercId();
         List<Long> mercIds = new ArrayList<>();
-        //指定商户ID
+        // 指定商户ID
         mercIds.add(curMercId);
         PageBean pageBean = page.getPage();
         LambdaQueryWrapper<DeviceAlgorithmChargingHistory> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceAlgorithmChargingHistory.class)

device-api-service/src/main/java/com/xy/service/DeviceChargingConfigServiceImpl.java

@@ -2,27 +2,23 @@ package com.xy.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
-import com.alipay.api.domain.Person;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yitter.idgen.YitIdHelper;
-import com.xy.annotation.LogOperate;
 import com.xy.device.EnumDeviceCharging;
 import com.xy.device.EnumDeviceChargingConfigType;
 import com.xy.dto.DeviceChargingConfigDto;
-import com.xy.dto.DeviceTypeAlgorithmBeforConfigDto;
-import com.xy.dto.MemberFeedBackDto;
 import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceChargingConfig;
-import com.xy.entity.DeviceTypeAlgorithmBeforConfig;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceChargingConfigMapper;
 import com.xy.service.be.MercService;
-import com.xy.utils.*;
+import com.xy.utils.Beans;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.R;
+import com.xy.utils.SysDictUtils;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -34,9 +30,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import static com.xy.utils.Beans.copy;
 
@@ -76,12 +70,12 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
     public R<DeviceChargingConfigDto.DeviceManagerFeeConfigVO> listByFeeConfig(@RequestBody @Validated DeviceChargingConfigDto.ListByFeeConfigDTO dto) {
         DeviceChargingConfigDto.DeviceManagerFeeConfigVO data = new DeviceChargingConfigDto.DeviceManagerFeeConfigVO();
         List<Integer> deviceTypes = dto.getDeviceTypes();
-        //设备管理费-平台默认配置
+        // 设备管理费-平台默认配置
         List<DeviceChargingConfigDto.DeviceManagerFeePlatformVO> dmFeePlatforms = new ArrayList<>();
-        for (Integer type : deviceTypes) {//默认年费，赠送天数
+        for (Integer type : deviceTypes) {// 默认年费，赠送天数
             DeviceChargingConfigDto.DeviceManagerFeePlatformVO vo = new DeviceChargingConfigDto.DeviceManagerFeePlatformVO();
             int defaultMoney = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), String.valueOf(type), Integer.class);
-            //默认赠送天数
+            // 默认赠送天数
             int giveDays = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_X.getCode(), Integer.class);
             vo.setDefFee(defaultMoney);
             vo.setDefGiveDay(giveDays);
@@ -96,16 +90,16 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
                 .in(DeviceChargingConfig::getDeviceType, deviceTypes)
                 .eq(DeviceChargingConfig::getMercCode, merc.getMercCode())
                 .build();
-        //默认配置 type 2预充 1赠送天数
+        // 默认配置 type 2预充 1赠送天数
         List<DeviceChargingConfig> list = list(lambdaQueryWrapper);
         if (CollUtil.isNotEmpty(list)) {
             for (DeviceChargingConfig dcc : list) {
                 Integer type = dcc.getType();
                 Integer deviceType = dcc.getDeviceType();
-                //预充
+                // 预充
                 if (String.valueOf(type).equals(EnumDeviceChargingConfigType.N_2.getCode())) {
                     int defaultMoney = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), String.valueOf(deviceType), Integer.class);
-                    //默认赠送天数
+                    // 默认赠送天数
                     int giveDays = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_X.getCode(), Integer.class);
                     DeviceChargingConfigDto.DeviceManagerFeeMercVO vo = new DeviceChargingConfigDto.DeviceManagerFeeMercVO();
                     BeanUtil.copyProperties(dcc, vo);
@@ -146,9 +140,9 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
             throw new CommRuntimeException("该类型配置已存在，请勿重复添加！");
         }
 
-        //默认赠送天数
+        // 默认赠送天数
         int giveDays = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_X.getCode(), Integer.class);
-        //新增赠送天数
+        // 新增赠送天数
         DeviceChargingConfig newDc = new DeviceChargingConfig().setDeviceType(deviceType).setConfigValue(giveDays).setMercCode(mercCode)
                 .setType(Integer.valueOf(EnumDeviceChargingConfigType.N_1.getCode())).setCreateTime(now)
                 .setUpdateTime(now).setMercCode(mercCode);

device-api-service/src/main/java/com/xy/service/DeviceChargingHistoryServiceImpl.java

@@ -113,7 +113,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
         if (chooseMercId == null) {
             mercIds = R.feignCheckData(mercService.getChildMercIds(new MercDto.QuerySubDTO().setParentMercID(curMercId)));
         } else {
-            //指定商户ID
+            // 指定商户ID
             mercIds.add(chooseMercId);
         }
         if (CollUtil.isEmpty(mercIds)) {
@@ -130,7 +130,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
         PageBean<DeviceChargingHistoryDto.PageVo> pageBean = toPageBean(DeviceChargingHistoryDto.PageVo.class, iPage);
         List<DeviceChargingHistoryDto.PageVo> records = pageBean.getRecords();
         if (Emptys.check(records)) {
-            //佣金配置查询
+            // 佣金配置查询
             List<MercFeeConfigDto.ListFeeConfigByMercVO> feeConfigByMercVOS = R.feignCheckData(mercFeeConfigService.listFeeConfigByMerc(new MercFeeConfigDto.ListFeeConfigByMercDTO().setMercId(curMercId)));
             Map<Long, MercFeeConfigDto.ListFeeConfigByMercVO> configByMercVOMap = MapUtil.newHashMap();
             if (CollUtil.isNotEmpty(feeConfigByMercVOS)) {
@@ -157,15 +157,15 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
             for (DeviceChargingHistoryDto.PageVo record : records) {
                 Long mercId = record.getMercId();
                 Long deviceId = record.getDeviceId();
-                //初始0 设备管理费佣金
+                // 初始0 设备管理费佣金
                 record.setAgentMoney(0);
                 if (!configByMercVOMap.isEmpty() && configByMercVOMap.get(mercId) != null) {
                     MercFeeConfigDto.ListFeeConfigByMercVO listFeeConfigByMercVO = configByMercVOMap.get(mercId);
                     Integer extraMoney = listFeeConfigByMercVO.getFeeConfig().getFeeDevice();
-                    //设备管理费佣金
+                    // 设备管理费佣金
                     record.setAgentMoney(extraMoney);
                 }
-                //封装过期状态说明
+                // 封装过期状态说明
                 String timeoutStatus;
                 DeviceCharging dc = deviceChargingMap.get(deviceId);
                 if (dc != null) {
@@ -178,9 +178,9 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
                     } else {
                         timeoutStatus = s <= value * 86400 ? "即将到期(" + s / 86400 + "天)" : "正常(" + s / 86400 + "天)";
                     }
-                    //过期状态说明
+                    // 过期状态说明
                     record.setTimeoutStatus(timeoutStatus);
-                    //过期时间
+                    // 过期时间
                     record.setTimeout(timeout);
                 }
             }
@@ -193,7 +193,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
     public R<PageBean<DeviceChargingHistoryDto.MySpendPageVO>> mySpendPage(DeviceChargingHistoryDto.PageByTopMerc page) {
         Long curMercId = page.getCurMercId();
         List<Long> mercIds = new ArrayList<>();
-        //指定商户ID
+        // 指定商户ID
         mercIds.add(curMercId);
         LambdaQueryWrapper<DeviceChargingHistory> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceChargingHistory.class)
                 .ge(DeviceChargingHistory::getCreateTime, page.getBeginCreateTime())
@@ -221,7 +221,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
             }
             for (DeviceChargingHistoryDto.MySpendPageVO record : records) {
                 Long deviceId = record.getDeviceId();
-                //封装过期状态说明
+                // 封装过期状态说明
                 String timeoutStatus;
                 DeviceCharging dc = deviceChargingMap.get(deviceId);
                 if (dc != null) {
@@ -234,9 +234,9 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
                     } else {
                         timeoutStatus = s <= value * 86400 ? "即将到期(" + s / 86400 + "天)" : "正常(" + s / 86400 + "天)";
                     }
-                    //过期状态说明
+                    // 过期状态说明
                     record.setTimeoutStatus(timeoutStatus);
-                    //过期时间
+                    // 过期时间
                     record.setTimeout(timeout);
                 }
             }
@@ -251,7 +251,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
     @PostMapping("moonCountPage")
     public R<PageBean<DeviceChargingHistoryDto.MoonCountVo>> moonCountPage(@RequestBody DeviceChargingHistoryDto.MoonCountPage moonCountPage) {
         JList<DeviceChargingHistoryDto.MoonCountVo> moonCountVos = new JArrayList<>();
-        //查询数据
+        // 查询数据
         List<String> attrNames = Arrays.asList(
                 LambdaUtils.getUnderlineCaseName(DeviceChargingHistory::getMercId)
         );
@@ -279,7 +279,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
                     .setChargingMoney(deviceChargingHistory.getChargingMoney());
             moonCountVos.add(moonCountVo);
         });
-        //翻译商户名称
+        // 翻译商户名称
         Beans.copy(moonCountVos).target(() -> mercService.list(new MercDto.SelectList().setMercIds(moonCountVos.getProperty(DeviceChargingHistoryDto.MoonCountVo::getMercId).comparing())).getData(),
                         DeviceChargingHistoryDto.MoonCountVo::getMercId, DeviceChargingHistoryDto.MoonCountVo::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                 .builder();
@@ -295,7 +295,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
     @PostMapping("moonCount")
     public R<List<DeviceChargingHistoryDto.MoonCountVo>> moonCount(@RequestBody DeviceChargingHistoryDto.MoonCount moonCount) {
         JList<DeviceChargingHistoryDto.MoonCountVo> moonCountVos = new JArrayList<>();
-        //查询数据
+        // 查询数据
         List<String> attrNames = Arrays.asList(
                 LambdaUtils.getUnderlineCaseName(DeviceChargingHistory::getMercId),
                 "DATE_FORMAT(" + LambdaUtils.getUnderlineCaseName(DeviceChargingHistory::getCreateTime) + ", '%Y-%m')"
@@ -325,7 +325,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
             });
         }));
         execute.end();
-        //翻译商户名称
+        // 翻译商户名称
         Beans.copy(moonCountVos).target(() -> mercService.list(new MercDto.SelectList().setMercIds(moonCountVos.getProperty(DeviceChargingHistoryDto.MoonCountVo::getMercId).comparing())).getData(),
                         DeviceChargingHistoryDto.MoonCountVo::getMercId, DeviceChargingHistoryDto.MoonCountVo::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                 .builder();
@@ -336,7 +336,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
     @ApiOperation("月统计导出")
     @PostMapping("moonCountDownload")
     public void moonCountDownload(@RequestBody DeviceChargingHistoryDto.MoonCount moonCount) {
-        //生成excel
+        // 生成excel
         String name = YitIdHelper.nextId() + ".xlsx";
         String path = fileConfig.getPath() + File.separator + name;
         ExcelUtils.SheetAndData<MoonCountData> sheetAndData = ExcelUtils.create(path, MoonCountData.class);
@@ -347,7 +347,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
             }
             return Beans.copy(MoonCountData.class, data);
         }).builder();
-        //下载文件
+        // 下载文件
         InputStream inputStream = IoUtils.inputStream(path).get();
         response.setHeader("Content-Disposition", "attachment; filename=" + "设备管理费月统计数据.xlsx");
         response.setContentType("application/xlsx");
@@ -359,7 +359,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
         }
         inputStream.close();
         outputStream.close();
-        //删除文件
+        // 删除文件
         new File(path).delete();
     }
 

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -129,7 +129,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             }
         });
 
-        //没有管理员的的设置默认值
+        // 没有管理员的的设置默认值
         deviceInfoList.stream().filter(s -> s.getAdminName() == null).forEach(s -> s.setAdminName(noAdmin));
         return R.ok(deviceInfoList);
     }
@@ -149,7 +149,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             }
         });
 
-        //没有管理员的的设置默认值
+        // 没有管理员的的设置默认值
         deviceInfoList.getRecords().stream().filter(s -> s.getAdminName() == null).forEach(s -> s.setAdminName(noAdmin));
         return R.ok(toPageBean(DeviceInfoDto.ListByAdminName.class, deviceInfoList));
     }
@@ -159,10 +159,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     public R<List<DeviceInfoDto.GroupByAdminNameVo>> groupByAdminName(@RequestBody @Validated DeviceInfoDto.GroupByAdminNameDto dto) {
         String noAdmin = "未分配管理员";
         List<DeviceInfoDto.ListByAdminName> deviceInfoList = listByAdminName(dto).getData();
-        //根据管理员名字分组
+        // 根据管理员名字分组
         Map<String, List<DeviceInfoDto.ListByAdminName>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfoDto.ListByAdminName::getAdminName));
         List<DeviceInfoDto.GroupByAdminNameVo> list = new ArrayList<>();
-        //不包含未分配管理员的
+        // 不包含未分配管理员的
         deviceMap.forEach(
                 (k, i) -> {
                     DeviceInfoDto.GroupByAdminNameVo vo = new DeviceInfoDto.GroupByAdminNameVo();
@@ -174,7 +174,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     }
                 }
         );
-        //包含分配管理员的
+        // 包含分配管理员的
         List<DeviceInfoDto.ListByAdminName> noAdminNamesList = deviceMap.get(noAdmin);
         if (Emptys.check(noAdminNamesList)) {
             DeviceInfoDto.GroupByAdminNameVo vo = new DeviceInfoDto.GroupByAdminNameVo();
@@ -190,10 +190,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     public R<List<DeviceInfoDto.GroupByAdminNameVo>> groupByAdminCount(@RequestBody @Validated DeviceInfoDto.GroupByAdminNameDto dto) {
         String noAdmin = "未分配管理员";
         List<DeviceInfoDto.ListByAdminName> deviceInfoList = listByAdminName(dto).getData();
-        //根据管理员名字分组
+        // 根据管理员名字分组
         Map<String, List<DeviceInfoDto.ListByAdminName>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfoDto.ListByAdminName::getAdminName));
         List<DeviceInfoDto.GroupByAdminNameVo> list = new ArrayList<>();
-        //不包含未分配管理员的
+        // 不包含未分配管理员的
         deviceMap.forEach(
                 (k, i) -> {
                     DeviceInfoDto.GroupByAdminNameVo vo = new DeviceInfoDto.GroupByAdminNameVo();
@@ -205,7 +205,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     }
                 }
         );
-        //包含分配管理员的
+        // 包含分配管理员的
         List<DeviceInfoDto.ListByAdminName> noAdminNamesList = deviceMap.get(noAdmin);
         if (Emptys.check(noAdminNamesList)) {
             DeviceInfoDto.GroupByAdminNameVo vo = new DeviceInfoDto.GroupByAdminNameVo();
@@ -252,7 +252,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         String searchKey = dto.getSearchKey();
         Integer thirdStatus = dto.getThirdStatus();
         List<String> statusList = new ArrayList<>();
-        //1待审核，2已审核
+        // 1待审核，2已审核
         if (thirdStatus != null && thirdStatus.intValue() == 1) {
             statusList = CollUtil.newArrayList("1000", "2000", "3000", "5000");
         }
@@ -283,8 +283,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                  */
                 String tyStatus = deviceInfo.getThirdStatus();
                 if (!"4000".equals(tyStatus)) {
-                    //未登记成功的需要实时查询
-                    //查询登记设备
+                    // 未登记成功的需要实时查询
+                    // 查询登记设备
                     DeviceQueryVO deviceQueryVO = tyApiService.deviceQuery(new DeviceQueryDTO().setCpuId(String.valueOf(deviceId)));
                     Integer status = deviceQueryVO.getStatus();
                     String message = deviceQueryVO.getMessage();
@@ -320,7 +320,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         List<GoodsDeviceDto.Vo> goodsDevices = R.feignCheckData(goodsDeviceService.list(selectList));
         if (type == 2 && CollUtil.isEmpty(goodsDevices)) {
-            //右侧已选的
+            // 右侧已选的
             return R.ok(new PageBean<>());
         }
         List<Long> deviceIds = goodsDevices.stream().map(GoodsDeviceDto.Vo::getDeviceId).collect(Collectors.toList());
@@ -328,7 +328,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         LambdaQueryWrapper<DeviceInfo> lqw = new MybatisPlusQuery().eqWrapper(dto, DeviceInfo.class)
                 .build();
         lqw.in(type == 2 && CollUtil.isNotEmpty(deviceIds), DeviceInfo::getDeviceId, deviceIds);
-        //左侧排除掉已关联的
+        // 左侧排除掉已关联的
         lqw.notIn(type == 1 && CollUtil.isNotEmpty(deviceIds), DeviceInfo::getDeviceId, deviceIds);
         lqw.and(StrUtil.isNotEmpty(searchKey), wrapper -> wrapper
                 .eq(DeviceInfo::getDeviceId, searchKey)
@@ -349,7 +349,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("设备列表带卡包数")
     public R<PageBean<DeviceInfoDto.AlgorithmChargingVo>> algorithmChargingDevice(@RequestBody @Validated DeviceInfoDto.AlgorithmCharging algorithmCharging) {
         PageBean pageBean = algorithmCharging.getPage();
-        //查询设备
+        // 查询设备
         Integer value = SysDictUtils.getValue(EnumDeviceActiveStatus.Code.CODE.getCode(), EnumDeviceActiveStatus.N_1.getCode(), Integer.class);
         LambdaUpdateWrapper<DeviceInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<DeviceInfo>()
                 .eq(DeviceInfo::getMercId, algorithmCharging.getMercId())
@@ -362,7 +362,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         if (!Emptys.check(algorithmChargingVos)) {
             return R.ok(algorithmChargingVoPageBean);
         }
-        //查询卡包数量
+        // 查询卡包数量
         List<DeviceAlgorithmChargingDto.CountVo> data = deviceAlgorithmChargingService.count(new DeviceAlgorithmChargingDto.Count()
                 .setDeviceIds(new JArrayList<>(algorithmChargingVos).getProperty(DeviceInfoDto.AlgorithmChargingVo::getDeviceId))
                 .setMercId(algorithmCharging.getMercId())
@@ -423,7 +423,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         List<Long> mercIds = new ArrayList<>();
         Long chooseMercId = dto.getChooseMercId();
         if (chooseMercId == null) {
-            //未指定商户 查下级商户含自身
+            // 未指定商户 查下级商户含自身
             mercIds = R.feignCheckData(mercService.getAllSubMercIds(new MercDto.QuerySubDTO().setParentMercID(curMercId)));
         } else {
             mercIds.add(chooseMercId);
@@ -450,7 +450,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     if (placeId == null) {
                         continue;
                     }
-                    //点位 区域 反显
+                    // 点位 区域 反显
                     MercPlaceDto.Vo placeVo = placeMap.get(placeId);
                     if (placeVo != null) {
                         record.setDistrictName(placeVo.getRegionName());
@@ -481,7 +481,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
 
         if (BooleanUtil.isFalse(choosed)) {
-            //未选择 排除已选择
+            // 未选择 排除已选择
             if (CollUtil.isNotEmpty(deviceIds)) {
                 lqw.notIn(DeviceInfo::getDeviceId, deviceIds);
             } else {
@@ -491,8 +491,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 lqw.in(DeviceInfo::getDeviceId, myDeviceIds);
             }
         } else {
-            //已选择
-            //指定设备 已选择
+            // 已选择
+            // 指定设备 已选择
             if (CollUtil.isNotEmpty(deviceIds)) {
                 lqw.in(DeviceInfo::getDeviceId, deviceIds);
             } else {
@@ -500,7 +500,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             }
         }
 
-        //设备搜索
+        // 设备搜索
         lqw.and(StrUtil.isNotEmpty(deviceSearch),
                 wrapper -> wrapper
                         .likeRight(DeviceInfo::getDeviceName, deviceSearch)
@@ -514,7 +514,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @Override
     @ApiOperation("对象查询")
     public R<DeviceInfoDto.Vo> obj(DeviceInfoDto.Obj obj) {
-        //设备信息
+        // 设备信息
         LambdaQueryWrapper<DeviceInfo> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(obj, DeviceInfo.class).build();
         List<DeviceInfo> list = list(lambdaQueryWrapper);
         if (!Emptys.check(list)) {
@@ -535,21 +535,21 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             ThreadPoolUtils.Execute execute = ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, num);
             if (obj.getIsSysinfo()) {
                 execute.execute(() -> {
-                    //系统信息
+                    // 系统信息
                     DeviceSysinfoDto.Vo deviceSysinfo = deviceSysinfoService.get(new DeviceSysinfoDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
                     deviceInfo.setDeviceSysinfo(deviceSysinfo);
                 });
             }
             if (obj.getIsStatus()) {
                 execute.execute(() -> {
-                    //状态信息
+                    // 状态信息
                     DeviceStatusDto.Vo deviceStatus = deviceStatusService.obj(new DeviceStatusDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
                     deviceInfo.setDeviceStatus(deviceStatus);
                 });
             }
             if (obj.getIsRegister()) {
                 execute.execute(() -> {
-                    //注册信息
+                    // 注册信息
                     DeviceRegisterDto.Vo deviceRegister = deviceRegisterService.obj(new DeviceRegisterDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
                     deviceInfo.setDeviceRegister(deviceRegister);
                 });
@@ -579,14 +579,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @Override
     @ApiOperation("设备访问历史添加")
     public R history(DeviceInfoDto.Obj obj) {
-        //获取字典
+        // 获取字典
         SysDictRedis sysDictRedis = SysDictUtils.get(EnumDataClearSize.Code.CODE.getCode(), EnumDataClearSize.DEVICE_HISTORY_TWIG.getCode());
         Integer value = Integer.valueOf(sysDictRedis.getValue());
-        //获取redis
+        // 获取redis
         String key = keyPrefix + AuthorizeUtils.getLoginId(Long.class);
         List<String> list = redisService.getList(key);
         list.add(0, String.valueOf(obj.getDeviceId()));
-        //去重
+        // 去重
         List<String> redisList = new ArrayList<>();
         JList<String> comparing = new JArrayList<>(list).comparing();
         if (comparing.size() > value) {
@@ -613,7 +613,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         DeviceStatusDto.Vo deviceStatus = deviceInfo.getDeviceStatus();
         SysDictRedis qualitySets = SysDictUtils.get(EnumQualityMercSets.Code.CODE.getCode(), EnumQualityMercSets.MERC_CODE.getCode());
-        //设备当前商户是质检时不检查
+        // 设备当前商户是质检时不检查
         if (!qualitySets.getValue().equals(deviceInfo.getMercCode())) {
             check(deviceInfo.getActiveState(), 2, "设备未激活");
             check(deviceInfo.getFreezeStatus(), 2, "设备已冻结");
@@ -631,13 +631,13 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @PostMapping("historyList")
     @ApiOperation("设备访问历史查询")
     public R<List<DeviceInfoDto.Vo>> historyList() {
-        //获取redis
+        // 获取redis
         String key = keyPrefix + AuthorizeUtils.getLoginId(Long.class);
         List<String> deviceIds = redisService.getList(key);
         if (!Emptys.check(deviceIds)) {
             return R.ok();
         }
-        //查询数据库
+        // 查询数据库
         List<DeviceInfo> list = list(new LambdaQueryWrapper<DeviceInfo>().in(DeviceInfo::getDeviceId, deviceIds));
         return R.ok(copy(DeviceInfoDto.Vo.class, list));
     }
@@ -656,15 +656,15 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @PostMapping("update")
     public R update(@RequestBody @Validated DeviceInfoDto.Update update) {
         DeviceInfo deviceInfo = getById(update.getDeviceId());
-        //判断是否更新了点位
+        // 判断是否更新了点位
         if (Emptys.check(update.getPlaceId()) && !Objects.equals(deviceInfo.getPlaceId(), update.getPlaceId())) {
-            //把设备绑定给点位管理员
+            // 把设备绑定给点位管理员
             MercUserBindDeviceDto.BindByDeviceUpdate bindByPlaceIdDTto = new MercUserBindDeviceDto.BindByDeviceUpdate();
             bindByPlaceIdDTto.setDeviceId(update.getDeviceId())
                     .setPlaceId(update.getPlaceId())
                     .setMercId(deviceInfo.getMercId());
             mercUserBindDeviceService.bindByDeviceUpdate(bindByPlaceIdDTto);
-            //更新坐标为点位的坐标
+            // 更新坐标为点位的坐标
             MercPlaceDto.ObjVo place = mercPlaceService.obj(new MercPlaceDto.Obj().setId(update.getPlaceId())).getData();
             update.setLat(place.getLat()).setLon(place.getLon());
         }
@@ -677,19 +677,19 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         DeviceInfoDto.Vo device = R.feignCheckData(this.obj(new DeviceInfoDto.Obj().setDeviceId(deviceId).setIsSysinfo(true)));
         Long algorithmId = update.getAlgorithmId();
         if (algorithmId != null && AlgorithmTypeEnum.CLOUD.getId() == algorithmId) {
-            //云从算法
+            // 云从算法
             boolean b = cloudWalkApiService.checkDeviceExist(deviceId);
             if (!b) {
-                //货柜不存在，新增
+                // 货柜不存在，新增
                 cloudWalkApiService.containerAdd(new ContainerAddDTO().setContainerCode(String.valueOf(deviceId)));
             }
         } else if (algorithmId != null && AlgorithmTypeEnum.TY.getId() == algorithmId) {
-            //拓元算法
-            //查询登记设备
+            // 拓元算法
+            // 查询登记设备
             DeviceQueryVO deviceQueryVO = tyApiService.deviceQuery(new DeviceQueryDTO().setCpuId(String.valueOf(deviceId)));
             Integer status = deviceQueryVO.getStatus();
             if (status != null && 1000 == status.intValue()) {
-                //未知的设备CPUID,进行登记
+                // 未知的设备CPUID,进行登记
                 tyApiService.deviceReg(new DeviceRegDTO()
                         .setCpuId(String.valueOf(deviceId))
                         .setDeviceNumber(String.valueOf(deviceId))
@@ -739,20 +739,20 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("更新商户线路")
     public R updateLine(@RequestBody @Validated DeviceInfoDto.UpdateLine updateLine) {
         LambdaUpdateWrapper<DeviceInfo> luw = new LambdaUpdateWrapper<DeviceInfo>().eq(DeviceInfo::getMercId, updateLine.getMercId());
-        //绑定线路,更换线路
+        // 绑定线路,更换线路
         if (DeviceInfoDto.UPDATE.equals(updateLine.getType())) {
             DeviceInfo deviceInfo = new DeviceInfo();
             deviceInfo.setPlaceLineId(updateLine.getPlaceLineId());
             luw.in(DeviceInfo::getDeviceId, updateLine.getDeviceIds());
             baseMapper.update(deviceInfo, luw);
         }
-        //删除线路
+        // 删除线路
         if (DeviceInfoDto.DEL.equals(updateLine.getType())) {
             luw.eq(DeviceInfo::getPlaceLineId, updateLine.getWherePlaceLineId());
             luw.set(DeviceInfo::getPlaceLineId, null);
             baseMapper.update(null, luw);
         }
-        //解绑线路 设置线路ID为null
+        // 解绑线路 设置线路ID为null
         if (DeviceInfoDto.CLEAR.equals(updateLine.getType())) {
             luw.in(DeviceInfo::getDeviceId, updateLine.getDeviceIds());
             luw.set(DeviceInfo::getPlaceLineId, null);
@@ -766,20 +766,20 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("更新商户点位")
     public R updatePlace(@RequestBody @Validated DeviceInfoDto.UpdatePlace updatePlace) {
         LambdaUpdateWrapper<DeviceInfo> luw = new LambdaUpdateWrapper<DeviceInfo>().eq(DeviceInfo::getMercId, updatePlace.getMercId());
-        //绑定点位,更换点位
+        // 绑定点位,更换点位
         if (DeviceInfoDto.UPDATE.equals(updatePlace.getType())) {
             DeviceInfo deviceInfo = new DeviceInfo();
             deviceInfo.setPlaceId(updatePlace.getPlaceId());
             luw.in(DeviceInfo::getDeviceId, updatePlace.getDeviceIds());
             baseMapper.update(deviceInfo, luw);
         }
-        //删除点位
+        // 删除点位
         if (DeviceInfoDto.DEL.equals(updatePlace.getType())) {
             luw.eq(DeviceInfo::getPlaceId, updatePlace.getWherePlaceId());
             luw.set(DeviceInfo::getPlaceId, null);
             baseMapper.update(null, luw);
         }
-        //解绑点位 设置点位ID为null
+        // 解绑点位 设置点位ID为null
         if (DeviceInfoDto.CLEAR.equals(updatePlace.getType())) {
             luw.in(DeviceInfo::getDeviceId, updatePlace.getDeviceIds());
             luw.set(DeviceInfo::getPlaceId, null);
@@ -811,13 +811,13 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         PageBean<DeviceInfoDto.Vo2> pageBean = queryPage(page);
         List<DeviceInfoDto.Vo2> records = pageBean.getRecords();
         List<DeviceInfoDto.DeviceExcelVO> deviceExcelVOS = BeanUtil.copyToList(records, DeviceInfoDto.DeviceExcelVO.class);
-        //异步导出参数封装
+        // 异步导出参数封装
         ExcelDTO<DeviceInfoDto.DeviceExcelVO> excelDTO = new ExcelDTO<>();
         excelDTO.setData(deviceExcelVOS);
         excelDTO.setHead(DeviceInfoDto.DeviceExcelVO.class);
         excelDTO.setSheetName(FileExportType.DEVICE_INFO.getDescription());
         excelDTO.setFileExportType(FileExportType.DEVICE_INFO);
-        //执行导出
+        // 执行导出
         fileExportService.exportExcelAsync(excelDTO);
     }
 
@@ -838,16 +838,16 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         String mercCode = auth.getMercCode();
         Long algorithmId = auth.getAlgorithmId();
         String mercName = auth.getMercName();
-        //商户最终设备列表
+        // 商户最终设备列表
         List<Long> deviceIds = auth.getDeviceIds();
         List<DeviceInfo> devices = getDevicesByMercId(mercId);
-        //取消商户设备授权
+        // 取消商户设备授权
         if (CollUtil.isEmpty(deviceIds)) {
             if (CollUtil.isEmpty(devices)) {
                 return R.ok(Boolean.TRUE);
             }
         }
-        //更新商户设备授权
+        // 更新商户设备授权
         List<DeviceInfo> deviceInfos = this.listByIds(deviceIds);
         List<DeviceStatus> deviceStatuses = new ArrayList<>();
         for (DeviceInfo deviceInfo : deviceInfos) {
@@ -855,24 +855,24 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             Long deviceId = deviceInfo.getDeviceId();
 
             if (ObjectUtil.equals(deviceType, DeviceTypeEnum.TYPE5.getCode())) {
-                //支付宝设备算法
+                // 支付宝设备算法
                 algorithmId = AlgorithmTypeEnum.ALIPAY.getId();
             } else {
-                //非支付宝算法
+                // 非支付宝算法
                 if (AlgorithmTypeEnum.CLOUD.getId() == algorithmId) {
-                    //云从算法
+                    // 云从算法
                     boolean b = cloudWalkApiService.checkDeviceExist(deviceId);
                     if (!b) {
-                        //货柜不存在，新增
+                        // 货柜不存在，新增
                         cloudWalkApiService.containerAdd(new ContainerAddDTO().setContainerCode(String.valueOf(deviceId)));
                     }
                 } else if (AlgorithmTypeEnum.TY.getId() == algorithmId) {
-                    //拓元算法
-                    //查询登记设备
+                    // 拓元算法
+                    // 查询登记设备
                     DeviceQueryVO deviceQueryVO = tyApiService.deviceQuery(new DeviceQueryDTO().setCpuId(String.valueOf(deviceId)));
                     Integer status = deviceQueryVO.getStatus();
                     if (status != null && 1000 == status.intValue()) {
-                        //未知的设备CPUID,进行登记
+                        // 未知的设备CPUID,进行登记
                         tyApiService.deviceReg(new DeviceRegDTO()
                                 .setCpuId(String.valueOf(deviceId))
                                 .setDeviceNumber(String.valueOf(deviceId))
@@ -884,7 +884,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             String refMercCode = deviceInfo.getMercCode();
 
             if (BooleanUtil.isFalse(auth.getMercOperate())) {
-                //非商户操作
+                // 非商户操作
                 //  只有解绑后，才能给顶级商户授权
                 if (refMercId != -1 && refMercId != mercId.intValue()) {
                     StrBuilder sb = StrBuilder.create();
@@ -895,20 +895,20 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                             .append(deviceInfo.getMercName())
                             .append("]绑定，请先进行解绑！")
                             .toString();
-                    //非质检商户需要进行判断，质检商户跳过
+                    // 非质检商户需要进行判断，质检商户跳过
                     if (!QA_MERC_CODE.equals(refMercCode)) {
-                        //已关联别商户
+                        // 已关联别商户
                         return R.fail(errMsg, Boolean.FALSE);
                     }
 
                 }
             } else {
-                //商户操作直接转移给子商户
+                // 商户操作直接转移给子商户
             }
 
-            //绑定关系
+            // 绑定关系
             deviceInfo.setMercId(mercId).setMercCode(mercCode).setAlgorithmId(algorithmId).setMercName(mercName);
-            //标记机器可交易
+            // 标记机器可交易
             DeviceStatus deviceStatus = new DeviceStatus()
                     .setDeviceId(deviceInfo.getDeviceId())
                     .setIsPay(true);
@@ -955,13 +955,13 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     private Boolean removeMerDevicesByDeviceIds(DeviceInfoDto.MercDeviceUnBindDto dto, List<DeviceInfo> deviceInfos) {
         if (CollUtil.isNotEmpty(deviceInfos)) {
             deviceInfos.forEach(deviceInfo -> {
-                //回收 到当前操作商户
+                // 回收 到当前操作商户
                 deviceInfo.setMercId(dto.getMercId());
                 deviceInfo.setMercDeviceCode(StrUtil.EMPTY);
                 deviceInfo.setMercName(dto.getMercName());
                 deviceInfo.setMercCode(dto.getMercCode());
             });
-            //批量更新
+            // 批量更新
             return updateBatchById(deviceInfos);
         }
 
@@ -979,13 +979,13 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         MercDto.Vo mercCheck = R.feignCheckData(mercFeignService.obj(new MercDto.ListDTO().setMercCode(QA_MERC_CODE)));
         if (CollUtil.isNotEmpty(deviceInfos)) {
             deviceInfos.forEach(deviceInfo -> {
-                //回收
+                // 回收
                 deviceInfo.setMercId(mercCheck.getId());
                 deviceInfo.setMercDeviceCode(StrUtil.EMPTY);
                 deviceInfo.setMercName(mercCheck.getName());
                 deviceInfo.setMercCode(QA_MERC_CODE);
             });
-            //批量更新
+            // 批量更新
             return updateBatchById(deviceInfos);
         }
 
@@ -1002,7 +1002,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     private Boolean removeMerRefDevices(List<DeviceInfo> deviceInfos, Long parentId) {
         if (CollUtil.isNotEmpty(deviceInfos) && parentId != null) {
             deviceInfos.forEach(deviceInfo -> {
-                //非顶级兴元商户，解绑后，机器归父商户
+                // 非顶级兴元商户，解绑后，机器归父商户
                 if (parentId != 1) {
                     MercDto.Vo mercParent = R.feignCheckData(mercFeignService.obj(new MercDto.ListDTO().setId(parentId)));
                     if (mercParent != null) {
@@ -1016,7 +1016,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     }
 
                 }
-                //一级商户，解绑后，直接释放
+                // 一级商户，解绑后，直接释放
                 if (parentId == 0) {
                     MercDto.Vo mercCheck = R.feignCheckData(mercFeignService.obj(new MercDto.ListDTO().setMercCode(QA_MERC_CODE)));
                     if (mercCheck != null) {
@@ -1032,7 +1032,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 }
 
             });
-            //批量更新
+            // 批量更新
             return updateBatchById(deviceInfos);
         }
 
@@ -1065,7 +1065,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 //            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getPlaceLineId), placeLineIds);
 //        }
 
-        //fixed
+        // fixed
         if (StrUtil.isNotEmpty(deviceSearch)) {
             queryWrapper.and(wrapper -> wrapper.likeRight(LambdaUtils.getUnderlineCaseName(DeviceInfo::getDeviceName), deviceSearch).or()
                     .eq(LambdaUtils.getUnderlineCaseName(DeviceInfo::getDeviceId), deviceSearch));
@@ -1099,7 +1099,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     public R<DeviceInfoDto.MercHomeStatisticalVO> mercHomeStatistical(DeviceInfoDto.MercHomeQueryDTO dto) {
         Long mercId = dto.getMercId();
         List<Long> myDeviceIds = dto.getMyDeviceIds();
-        //初始化数据
+        // 初始化数据
         DeviceInfoDto.MercHomeStatisticalVO mercHomeStatisticalVO = new DeviceInfoDto.MercHomeStatisticalVO()
                 .setClosedNum(0).setOfflineNum(0)
                 .setOnlineNum(0).setOperatingNum(0).setNeedToFillNum(0);
@@ -1113,9 +1113,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
 
 
-        //在线、离线
+        // 在线、离线
         List<DeviceStatus> deviceStatuses = deviceStatusService.listByIds(myDeviceIds);
-        //分组统计
+        // 分组统计
         Map<Integer, Long> countNetstateMap = deviceStatuses.stream().collect(Collectors
                 .groupingBy(DeviceStatus::getNetState, Collectors.counting()));
         Integer onlineDictValue = SysDictUtils.getValue(EnumDeviceOnlineStatus.Code.CODE.getCode(), EnumDeviceOnlineStatus.CONNECTED.getCode(), Integer.class);
@@ -1126,20 +1126,20 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         mercHomeStatisticalVO.setOnlineNum(onlineNum);
         mercHomeStatisticalVO.setOfflineNum(offlineNum);
 
-        //锁机、未锁机
+        // 锁机、未锁机
 //        Map<Integer, Long> countLockLstateMap = deviceStatuses.stream().collect(Collectors
 //                .groupingBy(DeviceStatus::getLockStateL, Collectors.counting()));
 //        Long lockLStateNum = countLockLstateMap.get(DeviceLockState.LOCK.getCode());
 //        Long unLockLStateNum = countLockLstateMap.get(DeviceLockState.UN_LOCK.getCode());
         Map<Integer, Long> countLockLstateMap = mercDevices.stream().collect(Collectors
                 .groupingBy(DeviceInfo::getBusyState, Collectors.counting()));
-        //运营
+        // 运营
         Long operatingNum = countLockLstateMap.get(DeviceBusySateType.OPERATING.getCode());
-        //停运
+        // 停运
         Long suspendedNum = countLockLstateMap.get(DeviceBusySateType.SUSPENDED.getCode());
         mercHomeStatisticalVO.setOperatingNum(operatingNum == null ? 0 : operatingNum.intValue());
         mercHomeStatisticalVO.setClosedNum(suspendedNum == null ? 0 : suspendedNum.intValue());
-        //待补货
+        // 待补货
         Integer deviceNum = R.feignCheckData(goodsDeviceService.countOutOfStockDevice(new GoodsDeviceDto.CountOutOfStockDevice().setMercId(mercId).setDeviceIds(myDeviceIds)));
         mercHomeStatisticalVO.setNeedToFillNum(deviceNum);
         return R.ok(mercHomeStatisticalVO);
@@ -1153,7 +1153,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         String deviceName = dto.getDeviceName();
         Long deviceId = dto.getDeviceId();
         List<Long> searchPlaceIdList = new ArrayList<>();
-        //根据管理员名字查询点位ID列表
+        // 根据管理员名字查询点位ID列表
         if (Emptys.check(dto.getAdminName())) {
             MercPlaceDto.ListDto placeDto = new MercPlaceDto.ListDto();
             placeDto.setMercId(mercId).setAdminName(dto.getAdminName());
@@ -1173,7 +1173,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         List<Long> searchDeviceIds = new ArrayList<>();
         if (StrUtil.isNotEmpty(searchKey) || StrUtil.isNotEmpty(dto.getAdminName())) {
-            //名称或者编号搜索设备
+            // 名称或者编号搜索设备
             LambdaQueryWrapper<DeviceInfo> deviceLqw = Wrappers.<DeviceInfo>lambdaQuery()
                     .eq(DeviceInfo::getMercId, mercId)
                     .in(Emptys.check(searchPlaceIdList), DeviceInfo::getPlaceId, searchPlaceIdList);
@@ -1198,7 +1198,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         Integer busyStatus = dto.getBusyStatus();
         Integer onlineStatus = dto.getOnlineStatus();
         Integer deviceType = dto.getDeviceType();
-        //条件查询 在线状态，运营状态，设备类型，
+        // 条件查询 在线状态，运营状态，设备类型，
         List<Long> deviceIdList = new ArrayList<>();
         if (deviceId != null && myDeviceIds.indexOf(deviceId) > 0) {
             deviceIdList.add(deviceId);
@@ -1219,7 +1219,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                         queryDeviceIds.add(id);
                     }
                 }
-                //无符合权限的搜索设备，返空
+                // 无符合权限的搜索设备，返空
                 if (CollUtil.isEmpty(queryDeviceIds)) {
                     return R.ok(new ArrayList<>());
                 } else {
@@ -1253,7 +1253,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         List<DeviceInfoDto.MercHomeListVO> dataList = new ArrayList<>(list.size());
 
         LambdaQueryWrapper<DeviceInfo> lqw = new LambdaQueryWrapper<>();
-        //非质检商户才需要激活
+        // 非质检商户才需要激活
         lqw.eq(!isQa, DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode());
         lqw.eq(mercId != null, DeviceInfo::getMercId, mercId);
         lqw.eq(busyStatus != null, DeviceInfo::getBusyState, busyStatus);
@@ -1261,15 +1261,15 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         lqw.in(CollUtil.isNotEmpty(deviceIdList), DeviceInfo::getDeviceId, deviceIdList);
         lqw.like(StrUtil.isNotEmpty(deviceName), DeviceInfo::getDeviceName, deviceName).orderByAsc(true, DeviceInfo::getDeviceName, DeviceInfo::getDeviceId);
         List<DeviceInfoDto.Vo> deviceInfoList = copy(DeviceInfoDto.Vo.class, this.list(lqw));
-        //根据点位ID查询管理员名字
+        // 根据点位ID查询管理员名字
         List<Long> placeIdList = deviceInfoList.stream().map(DeviceInfoDto.Vo::getPlaceId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
         List<MercPlaceDto.Vo> mercPlaceList = mercPlaceService.list(new MercPlaceDto.ListDto().setIds(placeIdList)).getData();
         if (Emptys.check(mercPlaceList)) {
-            //Map<Long, String> mercPlaceMap = mercPlaceList.stream().collect(Collectors.toMap(i -> i.getId(), i -> i.getAdminName()));
+            // Map<Long, String> mercPlaceMap = mercPlaceList.stream().collect(Collectors.toMap(i -> i.getId(), i -> i.getAdminName()));
             Map<Long, String> mercPlaceMap = mercPlaceList.stream().collect(HashMap::new, (map, item) -> map.put(item.getId(), item.getAdminName()), HashMap::putAll);
             deviceInfoList.forEach(i -> i.setAdminName(mercPlaceMap.get(i.getPlaceId())));
         }
-        //没有管理员的的设置默认值
+        // 没有管理员的的设置默认值
         deviceInfoList.stream().filter(s -> s.getAdminName() == null).forEach(s -> s.setAdminName("未分配管理员"));
         List<String> adminNameList = deviceInfoList.stream().map(DeviceInfoDto.Vo::getAdminName).distinct().collect(Collectors.toList());
         List<Long> dIds = deviceInfoList.stream().map(DeviceInfoDto.Vo::getDeviceId).distinct().collect(Collectors.toList());
@@ -1279,7 +1279,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             deviceSysInfoMap = deviceSysList.stream().collect(Collectors.toMap(DeviceSysinfoDto.Vo::getDeviceId, i -> i));
         }
 
-        //根据管理员名字分组
+        // 根据管理员名字分组
         Map<String, List<DeviceInfoDto.Vo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfoDto.Vo::getAdminName));
 
         DateTime date = DateTime.now();
@@ -1288,18 +1288,18 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         for (String adminName : adminNameList) {
             DeviceInfoDto.MercHomeListVO vo = new DeviceInfoDto.MercHomeListVO();
             vo.setAdminName(adminName);
-            //区域下的设备列表
+            // 区域下的设备列表
             List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = BeanUtil.copyToList(deviceMap.get(adminName), DeviceInfoDto.MercHomeDeviceVo.class);
             vo.setDeviceNum(deviceInfos.size());
             if (CollUtil.isEmpty(deviceInfos)) {
                 continue;
             }
 
-            //设备销售统计
+            // 设备销售统计
             List<Long> deviceIds = deviceInfos.stream().map(DeviceInfoDto.MercHomeDeviceVo::getDeviceId).collect(Collectors.toList());
 
 
-            //设备状态查询
+            // 设备状态查询
             List<DeviceStatusDto.Vo> deviceStatusList = deviceStatusService.list(new DeviceStatusDto.SelectList().setDeviceIds(deviceIds)).getData();
             Map<Long, DeviceStatusDto.Vo> datdeviceStatusMap = new HashMap<>();
             if (CollUtil.isNotEmpty(deviceStatusList)) {
@@ -1313,10 +1313,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
             for (DeviceInfoDto.MercHomeDeviceVo device : deviceInfos) {
                 Long dId = device.getDeviceId();
-                //设备类型 反显
+                // 设备类型 反显
                 SysDictRedis dictDeviceType = SysDictUtils.get(DictConsts.DEVICE_TYPE, String.valueOf(device.getDeviceType()));
                 device.setDeviceTypeName(dictDeviceType.getMsg());
-                //运营状态 反显
+                // 运营状态 反显
                 SysDictRedis dictBusyState = SysDictUtils.get(DictConsts.DEVICE_BUSY_STATUS, String.valueOf(device.getBusyState()));
                 device.setBusyStateName(dictBusyState.getMsg());
 
@@ -1325,10 +1325,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 CountDto.OrderByCreateTimeAndMercId orderByCreateTimeAndMercId = new CountDto.OrderByCreateTimeAndMercId()
                         .setMerdId(mercId).setBeginTime(start).setEndTime(end).setDeviceIds(CollUtil.newArrayList(dId));
                 log.info("设备订单统计：{}", JSONUtil.toJsonPrettyStr(orderByCreateTimeAndMercId));
-                //完成订单
+                // 完成订单
                 CountDto.SuccessVo successVo = R.feignCheckData(countApiService.orderBySuccess(orderByCreateTimeAndMercId));
 
-                //今日销售、库存情况 反显
+                // 今日销售、库存情况 反显
                 device.setDayOrderNum(successVo != null ? successVo.getOrdersSize() : zero);
                 device.setDaySalesPrice(successVo != null ? successVo.getOrderTotalMoney() : zero);
                 DeviceStatusDto.Vo deviceStatus = datdeviceStatusMap.get(device.getDeviceId());
@@ -1339,7 +1339,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                         device.setFillNum(goodsDevice.stream().mapToInt(GoodsDeviceDto.Vo::getFillCount).sum());
                     }
                 }
-                //温控仪 反显
+                // 温控仪 反显
                 DeviceSysinfoDto.Vo dSysInfo = deviceSysInfoMap.get(dId);
                 if (dSysInfo == null) {
                     device.setIsHaveTemp(false);
@@ -1347,14 +1347,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     device.setIsHaveTemp(BooleanUtil.isTrue(dSysInfo.getIsHaveTemp()));
                 }
 
-                //算法類型
+                // 算法類型
                 Long algorithmId = device.getAlgorithmId();
                 if (algorithmId != null) {
                     String name = algorithmListMap.get(algorithmId);
                     device.setAlgorithmAlias(name);
                 }
 
-                //联网状态
+                // 联网状态
                 Integer netState = deviceStatus == null ? DeviceNetSateType.DISCONNECT.getCode() : deviceStatus.getNetState();
                 device.setNetState(netState);
                 if (netState == null) {
@@ -1371,7 +1371,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     device.setDeviceStateR(deviceStateR);
                     Boolean isUseBattery = deviceStatus.getIsUseBattery();
                     if (BooleanUtil.isTrue(isUseBattery)) {
-                        //使用电池。即断电状态
+                        // 使用电池。即断电状态
                         device.setSysPower(2);
                     } else {
                         device.setSysPower(1);
@@ -1386,7 +1386,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
             }
 
-            //名称排序
+            // 名称排序
             if (CollUtil.isNotEmpty(deviceInfos)) {
                 deviceInfos = ListUtil.sortByProperty(deviceInfos, LambdaUtils.getProperty(DeviceInfoDto.MercHomeDeviceVo::getDeviceName));
                 deviceInfos = ListUtil.sortByProperty(deviceInfos, LambdaUtils.getProperty(DeviceInfoDto.MercHomeDeviceVo::getDeviceId));
@@ -1444,16 +1444,16 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @Override
     public R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {
         PageBean<DeviceInfoDto.MerHomeSearchVO> pageData = new PageBean<>();
-        //小程序独有查询字段 缺货状态：stockStatus ，是否查故障设备：fault
+        // 小程序独有查询字段 缺货状态：stockStatus ，是否查故障设备：fault
         Boolean fault = page.getFault();
         Long mercId = page.getMercId();
         List<Long> myDeviceIds = page.getMyDeviceIds();
         if (CollUtil.isEmpty(myDeviceIds)) {
-            //无设备
+            // 无设备
             return R.ok(pageData);
         }
         if (BooleanUtil.isTrue(fault)) {
-            //查询故障设备
+            // 查询故障设备
             List<DeviceEventMsg> deviceEventMsgs = deviceEventMsgService.list(Wrappers.<DeviceEventMsg>lambdaQuery()
                     .eq(mercId != null, DeviceEventMsg::getMercId, page.getMercId())
                     .in(DeviceEventMsg::getDeviceId, myDeviceIds));
@@ -1478,12 +1478,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             List<Long> deviceIds = records.stream().map(DeviceInfoDto.Vo2::getDeviceId).collect(Collectors.toList());
             String type = EnumDeviceDataType.DAY.getCode();
             String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
-            //查询当天
+            // 查询当天
             DeviceDataDto.ListDTO dto = new DeviceDataDto.ListDTO()
                     .setDeviceIds(deviceIds).setType(type).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
             List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(dto);
             Map<Long, DeviceDataDto.Vo> dataMap = MapUtil.newHashMap();
-            //统计数据反显
+            // 统计数据反显
             if (CollUtil.isNotEmpty(deviceDataList)) {
                 dataMap = deviceDataList.stream().collect(Collectors.toMap(DeviceDataDto.Vo::getDeviceId, d -> d));
             }
@@ -1492,7 +1492,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 Long deviceId = v.getDeviceId();
                 DeviceDataDto.Vo vo = dataMap.get(deviceId);
                 if (vo != null) {
-                    //今日订单数
+                    // 今日订单数
                     v.setDayOrderNum(vo != null ? vo.getSalesCount() : 0);
                     v.setDaySalesPrice(vo != null ? vo.getSalesMoney() : 0);
                     BeanUtil.copyProperties(vo, merHomeSearchVO);
@@ -1530,19 +1530,19 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         Integer type = dto.getType();
         switch (type) {
             case 1:
-                //经营数据
+                // 经营数据
                 return R.ok(dataCount1(dto));
             case 2:
-                //经营图表
+                // 经营图表
                 return R.ok(dataCount2(dto));
             case 3:
-                //温度图表
+                // 温度图表
                 return R.ok(dataCount3(dto));
             case 4:
-                //信号图表
+                // 信号图表
                 return R.ok(dataCount4(dto));
             case 5:
-                //商品管理
+                // 商品管理
                 return R.ok(dataCount5(dto));
             default:
                 break;
@@ -1560,7 +1560,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         Long deviceId = dto.getDeviceId();
         Long mercId = dto.getMercId();
         DeviceInfoDto.DeviceDataCountVO vo = new DeviceInfoDto.DeviceDataCountVO();
-        //当天
+        // 当天
 
 
         DateTime date = DateTime.now();
@@ -1570,7 +1570,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         CountDto.OrderByCreateTimeAndMercId orderByCreateTimeAndMercId = new CountDto.OrderByCreateTimeAndMercId()
                 .setMerdId(mercId).setBeginTime(start).setEndTime(end).setDeviceIds(deviceIds);
 
-        //完成订单
+        // 完成订单
         CountDto.SuccessVo successVo = R.feignCheckData(countApiService.orderBySuccess(orderByCreateTimeAndMercId));
 
         DeviceDataDto.Vo dayData = new DeviceDataDto.Vo();
@@ -1581,16 +1581,16 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
 
 
-        //当月
+        // 当月
         DeviceDataDto.Vo monthData = new DeviceDataDto.Vo();
 
-        //月度统计
+        // 月度统计
         DateTime startM = DateUtil.beginOfMonth(date);
         DateTime endM = DateUtil.endOfMonth(date);
 
         CountDto.OrderByCreateTimeAndMercId monthOrder = new CountDto.OrderByCreateTimeAndMercId()
                 .setMerdId(mercId).setBeginTime(startM).setEndTime(endM).setDeviceIds(deviceIds);
-        //完成订单
+        // 完成订单
         CountDto.SuccessVo successVoM = R.feignCheckData(countApiService.orderBySuccess(monthOrder));
 
 
@@ -1612,7 +1612,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
      */
     private DeviceInfoDto.DeviceDataCountVO dataCount2(DeviceInfoDto.DeviceDataCountDTO dto) {
         Long deviceId = dto.getDeviceId();
-        //近一个月 （销售额，订单数，退款金额，退款数）
+        // 近一个月 （销售额，订单数，退款金额，退款数）
         DeviceInfoDto.DeviceDataCountVO vo = new DeviceInfoDto.DeviceDataCountVO();
         DeviceInfoDto.BusinessChart businessChart = new DeviceInfoDto.BusinessChart();
         List<String> categories = DataTime.dayListByLastDay(30);
@@ -1630,7 +1630,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             return vo;
         }
 
-        //每天的数据
+        // 每天的数据
         Map<Integer, DeviceDataDto.Vo> dataDayMap = listByDay.stream().collect(Collectors.toMap(DeviceDataDto.Vo::getDateValue, i -> i));
 
         List<DeviceInfoDto.MyChartSeries3> series = new ArrayList<>();
@@ -1638,12 +1638,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         String[] names = {"销售额", "订单数", "退款金额", "退款数"};
         for (int i = 0; i < names.length; i++) {
             DeviceInfoDto.MyChartSeries3 myChartSeries = new DeviceInfoDto.MyChartSeries3();
-            //某个类型每天的数据
+            // 某个类型每天的数据
             List<String> data = new ArrayList<>();
             if (i == 0) {
-                //销售额
+                // 销售额
                 dateList.forEach(d -> {
-                    //每日数据填充
+                    // 每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
 
                     if (deviceData == null) {
@@ -1655,9 +1655,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     }
                 });
             } else if (i == 1) {
-                //订单数
+                // 订单数
                 dateList.forEach(d -> {
-                    //每日数据填充
+                    // 每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
                     String value = "0";
                     if (deviceData == null) {
@@ -1669,9 +1669,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
                 });
             } else if (i == 2) {
-                //退款金额
+                // 退款金额
                 dateList.forEach(d -> {
-                    //每日数据填充
+                    // 每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
                     if (deviceData == null) {
                         data.add(String.valueOf(BigDecimal.ZERO));
@@ -1683,9 +1683,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
                 });
             } else if (i == 3) {
-                //退款数
+                // 退款数
                 dateList.forEach(d -> {
-                    //每日数据填充
+                    // 每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
                     if (deviceData == null) {
                         data.add("0");
@@ -1719,7 +1719,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         String startTime = choosDate + " 00:00:00";
         String endTime = choosDate + " 23:59:59";
-        //查询选定日期的温度数据
+        // 查询选定日期的温度数据
         List<DeviceTempRecords> deviceTempRecords = deviceTempRecordsService.list(Wrappers.<DeviceTempRecords>lambdaQuery()
                 .eq(DeviceTempRecords::getDeviceId, deviceId).between(DeviceTempRecords::getCreateTime, startTime, endTime)
                 .orderBy(true, true, DeviceTempRecords::getCreateTime));
@@ -1766,7 +1766,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         String startTime = choosDate + " 00:00:00";
         String endTime = choosDate + " 23:59:59";
-        //查询选定日期的温度数据
+        // 查询选定日期的温度数据
         List<DeviceNetRecord> deviceNetRecords = deviceNetRecordService.list(Wrappers.<DeviceNetRecord>lambdaQuery()
                 .eq(DeviceNetRecord::getDeviceId, deviceId).between(DeviceNetRecord::getCreateTime, startTime, endTime)
                 .orderBy(true, true, DeviceNetRecord::getCreateTime));
@@ -1809,8 +1809,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         Long deviceId = dto.getDeviceId();
         DeviceInfoDto.DeviceDataCountVO vo = new DeviceInfoDto.DeviceDataCountVO();
         DeviceInfoDto.GoodsData goodsData = new DeviceInfoDto.GoodsData();
-        //在售商品种类
-        //根据设备ID查商品id
+        // 在售商品种类
+        // 根据设备ID查商品id
         GoodsDeviceDto.SelectList selectList = new GoodsDeviceDto.SelectList();
         selectList.setDeviceIds(CollUtil.newArrayList(deviceId));
         selectList.setMercId(dto.getMercId());

device-api-service/src/main/java/com/xy/service/DeviceSimChargeServiceImpl.java

@@ -109,7 +109,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
         if (chooseMercId == null) {
             mercIds = R.feignCheckData(mercService.getChildMercIds(new MercDto.QuerySubDTO().setParentMercID(curMercId)));
         } else {
-            //指定商户ID
+            // 指定商户ID
             mercIds.add(chooseMercId);
         }
         if (CollUtil.isEmpty(mercIds)) {
@@ -127,7 +127,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
         List<DeviceSimChargeDto.PageByTopMercVO> records = voPageBean.getRecords();
 
         if (Emptys.check(records)) {
-            //佣金配置查询
+            // 佣金配置查询
             List<MercFeeConfigDto.ListFeeConfigByMercVO> feeConfigByMercVOS = R.feignCheckData(mercFeeConfigService.listFeeConfigByMerc(new MercFeeConfigDto.ListFeeConfigByMercDTO().setMercId(curMercId)));
             Map<Long, MercFeeConfigDto.ListFeeConfigByMercVO> configByMercVOMap = MapUtil.newHashMap();
             if (CollUtil.isNotEmpty(feeConfigByMercVOS)) {
@@ -152,7 +152,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
             for (DeviceSimChargeDto.PageByTopMercVO record : records) {
                 Long mercId = record.getMercId();
                 String simId = record.getSimId();
-                //佣金初始化
+                // 佣金初始化
                 Integer extraMoney = 0;
                 MercFeeConfigDto.ListFeeConfigByMercVO listFeeConfigByMercVO = configByMercVOMap.get(mercId);
                 if (listFeeConfigByMercVO != null) {
@@ -160,7 +160,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
                     record.setAgentMoney(extraMoney);
                 }
                 DeviceSim sim = deviceSimMap.get(simId);
-                //封装过期状态说明
+                // 封装过期状态说明
                 if (Emptys.check(sim)) {
                     LocalDateTime timeout = sim.getTimeout();
                     if (timeout == null) {
@@ -194,7 +194,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
     public R<PageBean<DeviceSimChargeDto.MySpendPageVO>> mySpendPage(DeviceSimChargeDto.PageByTopMerc page) {
         Long curMercId = page.getCurMercId();
         List<Long> mercIds = new ArrayList<>();
-        //指定商户ID
+        // 指定商户ID
         mercIds.add(curMercId);
         PageBean pageBean = page.getPage();
         LambdaQueryWrapper<DeviceSimCharge> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceSimCharge.class)
@@ -228,7 +228,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
                 Long mercId = record.getMercId();
                 String simId = record.getSimId();
                 DeviceSim sim = deviceSimMap.get(simId);
-                //封装过期状态说明
+                // 封装过期状态说明
                 if (Emptys.check(sim)) {
                     LocalDateTime timeout = sim.getTimeout();
                     if (timeout == null) {
@@ -257,7 +257,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
     @PostMapping("moonCountPage")
     public R<PageBean<DeviceSimChargeDto.MoonCountVo>> moonCountPage(@RequestBody DeviceSimChargeDto.MoonCountPage moonCountPage) {
         JList<DeviceSimChargeDto.MoonCountVo> moonCountVos = new JArrayList<>();
-        //查询数据
+        // 查询数据
         List<String> attrNames = Arrays.asList(
                 LambdaUtils.getUnderlineCaseName(DeviceSimCharge::getMercId)
         );
@@ -285,7 +285,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
                     .setMoney(deviceSimCharge.getMoney());
             moonCountVos.add(moonCountVo);
         });
-        //翻译商户名称
+        // 翻译商户名称
         Beans.copy(moonCountVos).target(() -> mercService.list(new MercDto.SelectList().setMercIds(moonCountVos.getProperty(DeviceSimChargeDto.MoonCountVo::getMercId).comparing())).getData(),
                         DeviceSimChargeDto.MoonCountVo::getMercId, DeviceSimChargeDto.MoonCountVo::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                 .builder();
@@ -301,7 +301,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
     @PostMapping("moonCount")
     public R<List<DeviceSimChargeDto.MoonCountVo>> moonCount(@RequestBody DeviceSimChargeDto.MoonCount moonCount) {
         JList<DeviceSimChargeDto.MoonCountVo> moonCountVos = new JArrayList<>();
-        //查询数据
+        // 查询数据
         List<String> attrNames = Arrays.asList(
                 LambdaUtils.getUnderlineCaseName(DeviceSimCharge::getMercId),
                 "DATE_FORMAT(" + LambdaUtils.getUnderlineCaseName(DeviceSimCharge::getCreateTime) + ", '%Y-%m')"
@@ -331,7 +331,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
             });
         }));
         execute.end();
-        //翻译商户名称
+        // 翻译商户名称
         Beans.copy(moonCountVos).target(() -> mercService.list(new MercDto.SelectList().setMercIds(moonCountVos.getProperty(DeviceSimChargeDto.MoonCountVo::getMercId).comparing())).getData(),
                         DeviceSimChargeDto.MoonCountVo::getMercId, DeviceSimChargeDto.MoonCountVo::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                 .builder();
@@ -342,7 +342,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
     @ApiOperation("月统计导出")
     @PostMapping("moonCountDownload")
     public void moonCountDownload(@RequestBody DeviceSimChargeDto.MoonCount moonCount) {
-        //生成excel
+        // 生成excel
         String name = YitIdHelper.nextId() + ".xlsx";
         String path = fileConfig.getPath() + File.separator + name;
         ExcelUtils.SheetAndData<MoonCountData> sheetAndData = ExcelUtils.create(path, MoonCountData.class);
@@ -353,7 +353,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
             }
             return Beans.copy(MoonCountData.class, data);
         }).builder();
-        //下载文件
+        // 下载文件
         InputStream inputStream = IoUtils.inputStream(path).get();
         response.setHeader("Content-Disposition", "attachment; filename=" + "设备管理费月统计数据.xlsx");
         response.setContentType("application/xlsx");
@@ -365,7 +365,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
         }
         inputStream.close();
         outputStream.close();
-        //删除文件
+        // 删除文件
         new File(path).delete();
     }
 

device-api-service/src/main/java/com/xy/service/DeviceSimServiceImpl.java

@@ -116,16 +116,16 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
     @Override
     @ApiOperation("购买回调")
     public R payNotice(DeviceSimDto.PayNotice payNotice) {
-        //查询设备流量卡充值表
+        // 查询设备流量卡充值表
         List<DeviceSimCharge> list = deviceSimChargeService.list(new LambdaQueryWrapper<DeviceSimCharge>().eq(DeviceSimCharge::getOrderId, payNotice.getOrderId()));
         if (!Emptys.check(list)) {
             return R.ok();
         }
-        //查询设备流量卡
+        // 查询设备流量卡
         JList<DeviceSimCharge> deviceSimCharges = new JArrayList<>(list);
         JMap<String, DeviceSimCharge> deviceSimChargesJMaps = deviceSimCharges.toMap(DeviceSimCharge::getSimId).cover();
         List<DeviceSim> deviceSims = listByIds(deviceSimCharges.getProperty(DeviceSimCharge::getSimId));
-        //循环处理
+        // 循环处理
         LocalDateTime now = LocalDateTime.now();
         deviceSims.forEach(deviceSim -> {
             DeviceSimCharge deviceSimCharge = deviceSimChargesJMaps.get(deviceSim.getId());
@@ -140,9 +140,9 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     .setLastRenewalTime(now)
                     .setUpdateTime(now);
         });
-        //修改设备流量卡信息
+        // 修改设备流量卡信息
         updateBatchById(deviceSims);
-        //修改设备流量卡充值
+        // 修改设备流量卡充值
         Integer status = SysDictUtils.getValue(EnumDeviceChargingHistoryStatus.Code.CODE.getCode(), EnumDeviceChargingHistoryStatus.N_2.getCode(), Integer.class);
         deviceSimCharges.forEach(deviceSimCharge -> deviceSimCharge.setStatus(status).setUpdateTime(now));
         deviceSimChargeService.updateBatchById(deviceSimCharges);
@@ -179,7 +179,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
             String name = deviceSimPayVO.getName();
             Integer money = deviceSimPayVO.getMoney();
             records.forEach(record -> {
-                //封装过期状态说明
+                // 封装过期状态说明
                 DeviceSimDto.Vo sim = record.getSim();
                 if (Emptys.check(sim)) {
                     LocalDateTime timeout = sim.getTimeout();
@@ -196,7 +196,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                         record.getSim().setTimeoutStatus(timeoutStatus);
                     }
                 }
-                //封装计费标准
+                // 封装计费标准
                 record.setChargingName(name).setChargingMoney(money);
             });
         }
@@ -218,7 +218,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
             String name = deviceSimPayVO.getName();
             Integer money = deviceSimPayVO.getMoney();
             records.forEach(record -> {
-                //封装计费标准
+                // 封装计费标准
                 record.setChargingName(name).setChargingMoney(money);
             });
         }
@@ -231,17 +231,17 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         Map<String, SysDictRedis> simConfig = SysDictUtils.get(EnumSimConfig.Code.CODE.getCode());
         Integer value = Integer.valueOf(simConfig.get(EnumSimConfig.N_200.getCode()).getValue());
         String theTime = DataTime.getStringAround(0, 0, value, 0, 0, 0);
-        //并行数据
+        // 并行数据
         DeviceSimDto.PageCountVo pageCountVo = new DeviceSimDto.PageCountVo();
         ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 6)
                 .execute(() -> {
-                    //全部
+                    // 全部
                     DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount);
                     int count = baseMapper.pageCount(paramsObj);
                     pageCountVo.setAllCount(count);
                 })
                 .execute(() -> {
-                    //即将过期
+                    // 即将过期
                     DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount)
                             .setChargingStatus(1)
                             .setThisTime(LocalDateTime.now())
@@ -250,7 +250,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     pageCountVo.setBeTimeoutCount(count);
                 })
                 .execute(() -> {
-                    //已过期
+                    // 已过期
                     DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount)
                             .setChargingStatus(2)
                             .setThisTime(LocalDateTime.now())
@@ -259,21 +259,21 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     pageCountVo.setTimeoutCount(count);
                 })
                 .execute(() -> {
-                    //已激活
+                    // 已激活
                     DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount)
                             .setIsActivate(true);
                     int count = baseMapper.pageCount(paramsObj);
                     pageCountVo.setIsActivate(count);
                 })
                 .execute(() -> {
-                    //未激活
+                    // 未激活
                     DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount)
                             .setIsActivate(false);
                     int count = baseMapper.pageCount(paramsObj);
                     pageCountVo.setIsNotActivate(count);
                 })
                 .execute(() -> {
-                    //未初始化
+                    // 未初始化
                     DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount);
                     int count = baseMapper.pageCount2(paramsObj);
                     pageCountVo.setNotInitCount(count);
@@ -286,12 +286,12 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
     @ApiOperation("导出流量卡数据")
     @PostMapping("download")
     public void download(@RequestBody DeviceSimDto.Download download) {
-        //生成excel
+        // 生成excel
         String name = YitIdHelper.nextId() + ".xlsx";
         String path = fileConfig.getPath() + File.separator + name;
         ExcelUtils.SheetAndData<UploadSim> sheetAndData = ExcelUtils.create(path, UploadSim.class);
         sheetAndData.sheet("流量卡数据", () -> {
-            //生成导出数据
+            // 生成导出数据
             List<DeviceSimDto.PageVo> pageVos;
             if (download.getIsNotInit()) {
                 pageVos = baseMapper.page2(download);
@@ -317,7 +317,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                 }
                 uploadSims.add(uploadSim);
             });
-            //修改批次号
+            // 修改批次号
             String updateBatchNo = download.getUpdateBatchNo();
             Boolean isUpdateBatchNo = download.getIsUpdateBatchNo();
             if (Emptys.check(updateBatchNo) && Emptys.check(isUpdateBatchNo) && isUpdateBatchNo) {
@@ -335,7 +335,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
             }
             return uploadSims;
         }).builder();
-        //下载文件
+        // 下载文件
         InputStream inputStream = IoUtils.inputStream(path).get();
         response.setHeader("Content-Disposition", "attachment; filename=" + "sim_data.xlsx");
         response.setContentType("application/xlsx");
@@ -347,7 +347,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         }
         inputStream.close();
         outputStream.close();
-        //删除文件
+        // 删除文件
         new File(path).delete();
     }
 

device-api-service/src/main/java/com/xy/service/DeviceTypeAlgorithmBeforConfigServiceImpl.java

@@ -7,14 +7,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.annotation.LogOperate;
-import com.xy.collections.list.JList;
 import com.xy.device.EnumAlgorithmPayConfig;
 import com.xy.device.EnumAlgorithmTypes;
 import com.xy.dto.AlgorithmDto;
 import com.xy.dto.DeviceAlgorithmChargingDto;
 import com.xy.dto.DeviceTypeAlgorithmBeforConfigDto;
 import com.xy.dto.be.MercDto;
-import com.xy.entity.DeviceInfo;
 import com.xy.entity.DeviceTypeAlgorithmBeforConfig;
 import com.xy.entity.SysDictRedis;
 import com.xy.error.CommRuntimeException;
@@ -25,7 +23,6 @@ import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.R;
 import com.xy.utils.SysDictUtils;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -80,7 +77,7 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
     public R<List<DeviceTypeAlgorithmBeforConfigDto.Vo>> list(@RequestBody DeviceTypeAlgorithmBeforConfigDto.SelectList selectList) {
         List<String> mercCodes = selectList.getMercCodes();
         if (CollUtil.isNotEmpty(mercCodes)) {
-            //优先编码查询
+            // 优先编码查询
             selectList.setMercId(null);
         }
         LambdaQueryWrapper<DeviceTypeAlgorithmBeforConfig> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, DeviceTypeAlgorithmBeforConfig.class).build()
@@ -96,7 +93,7 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
         Long mercId = dto.getMercId();
         LambdaQueryWrapper<DeviceTypeAlgorithmBeforConfig> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(dto, DeviceTypeAlgorithmBeforConfig.class).build();
         List<DeviceTypeAlgorithmBeforConfig> list = list(lambdaQueryWrapper);
-        //查询默认算法信息
+        // 查询默认算法信息
         List<AlgorithmDto.ListNameId> listNameIds = R.feignCheckData(algorithmService.ListNameId());
         List<Long> algorithmIds = listNameIds.stream().map(AlgorithmDto.ListNameId::getId).collect(Collectors.toList());
         Map<Long, String> agMap = listNameIds.stream().collect(Collectors.toMap(AlgorithmDto.ListNameId::getId, AlgorithmDto.ListNameId::getName));
@@ -104,7 +101,7 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
         Map<Long, String> algorithmPayConfigMap = new HashMap<>();
         for (Long algorithmId : algorithmIds) {
             SysDictRedis moonAlgorithmTypes = SysDictUtils.get(EnumAlgorithmTypes.Code.CODE.getCode(), String.valueOf(algorithmId));
-            //算法类型对应的字典配置的默认激活费（无设备类型）
+            // 算法类型对应的字典配置的默认激活费（无设备类型）
             SysDictRedis algorithmPayConfig = SysDictUtils.get(EnumAlgorithmPayConfig.Code.CODE.getCode(), String.valueOf(algorithmId));
 //            if (Emptys.check(moonAlgorithmTypes)) {
 //                moonAlgorithmTypesMap.put(algorithmId, moonAlgorithmTypes.getMsg());
@@ -115,7 +112,7 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
         }
 
 
-        //字典默认配置
+        // 字典默认配置
         List<DeviceTypeAlgorithmBeforConfigDto.DeviceActiveDictVO> deviceActiveDicts = new ArrayList<>();
 
         for (Long algorithmId : algorithmIds) {
@@ -131,10 +128,10 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
             dictVO.setSize(inf.getSize());
             deviceActiveDicts.add(dictVO);
         }
-        //平台给商家定义的配置
+        // 平台给商家定义的配置
         List<DeviceTypeAlgorithmBeforConfigDto.DeviceActiveMercFeeVO> deviceActiveMercFees = new ArrayList<>();
         if (CollUtil.isNotEmpty(list)) {
-            //平台给商家自定义的设备激活费用，多了个设备类型
+            // 平台给商家自定义的设备激活费用，多了个设备类型
             BeanUtil.copyToList(list, DeviceTypeAlgorithmBeforConfigDto.DeviceActiveMercFeeVO.class);
             for (DeviceTypeAlgorithmBeforConfig db : list) {
                 DeviceTypeAlgorithmBeforConfigDto.DeviceActiveMercFeeVO dbData = new DeviceTypeAlgorithmBeforConfigDto.DeviceActiveMercFeeVO();

device-api/src/main/java/com/xy/dto/DeviceChargingHistoryDto.java

@@ -204,7 +204,7 @@ public class DeviceChargingHistoryDto {
         @NumberFormat("#0.00")
         @ApiModelProperty(value = "续费金额")
         private Integer chargingMoney;
-         
+
         @ExcelProperty("续费数量(年)")
         @ApiModelProperty(value = "续费数量")
         private Integer chargingSize;
@@ -337,7 +337,7 @@ public class DeviceChargingHistoryDto {
         @ApiModelProperty(value = "商户名称")
         private String mercName;
 
-        //size -1 不分页
+        // size -1 不分页
         public PageBean getPage() {
             if (!this.exportPage) {
                 this.page.setSize(-1L);

device-api/src/main/java/com/xy/dto/DeviceDataDto.java

@@ -482,46 +482,35 @@ public class DeviceDataDto {
 
         @ApiModelProperty("是否导出当前页")
         private Boolean exportPage = true;
-
-        //size -1 不分页
-        public PageBean getPage() {
-            if (!this.exportPage) {
-                this.page.setSize(-1L);
-            }
-            return page;
-        }
-
-
         @ApiModelProperty(value = "设备ID")
         private Long deviceId;
-
         @ApiModelProperty(value = "月份-起")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime beginCreateTime;
-
         @ApiModelProperty(value = "月份-止")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime endCreateTime;
-
-
         @ApiModelProperty(value = "投放时间-起")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime activeStartTime;
-
         @ApiModelProperty(value = "投放时间-止")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime activeEndStartTime;
-
-
         @ApiModelProperty(value = "商户id")
         private Long curMercId;
-
         @ApiModelProperty(value = "指定商户id")
         private Long chooseMercId;
-
         @ApiModelProperty(value = "商户ID")
         private List<Long> mercIds;
 
+        // size -1 不分页
+        public PageBean getPage() {
+            if (!this.exportPage) {
+                this.page.setSize(-1L);
+            }
+            return page;
+        }
+
 
     }
 
@@ -529,42 +518,28 @@ public class DeviceDataDto {
     @Data
     @Accessors(chain = true)
     public static class DeviceFlowCountExcelVo {
+        @ApiModelProperty(value = "月度流水列表")
+        List<DeviceFlowMonthVO> monthflowList;
         @ExcelProperty("设备ID")
         @ApiModelProperty(value = "设备ID")
         private Long deviceId;
-
-
         @ExcelProperty("设备")
         @ApiModelProperty(value = "设备")
         private String deviceName;
-
         @ExcelProperty("商户名称")
         @ApiModelProperty(value = "商户名称")
         private String mercName;
-
-
         @ApiModelProperty(value = "区域")
         private String districtName;
-
         @ApiModelProperty(value = "点位")
         private String placeName;
-
-
-         @ApiModelProperty(value = "投放时间")
+        @ApiModelProperty(value = "投放时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime activeTime;
-
-
-         @ApiModelProperty(value = "月平均流水")
+        @ApiModelProperty(value = "月平均流水")
         private BigDecimal monthAvgMoney;
-
         @ApiModelProperty(value = "总计流水")
-         private Integer totalMoney;
-
-
-        @ApiModelProperty(value = "月度流水列表")
-        List<DeviceFlowMonthVO> monthflowList;
-
+        private Integer totalMoney;
 
 
     }
@@ -572,45 +547,33 @@ public class DeviceDataDto {
     @Data
     @Accessors(chain = true)
     public static class DeviceFlowCountVO {
+        @ApiModelProperty(value = "月度流水列表")
+        List<DeviceFlowMonthVO> monthflowList;
         @ApiModelProperty(value = "商户ID")
         private Long mercId;
-
         @ApiModelProperty(value = "商户名称")
         private String mercName;
-
         @ApiModelProperty(value = "设备ID")
         private Long deviceId;
-
         @ApiModelProperty(value = "设备名称")
         private String deviceName;
-
         @ApiModelProperty(value = "区域")
         private String districtName;
-
         @ApiModelProperty(value = "点位")
         private String placeName;
-
-
         /**
          * 点位id
          */
         private Long placeId;
-
         @ApiModelProperty(value = "投放时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime activeTime;
-
         @ApiModelProperty(value = "月平均流水")
         private BigDecimal monthAvgMoney;
-
         @ApiModelProperty(value = "总计流水")
         private Integer totalMoney;
 
 
-        @ApiModelProperty(value = "月度流水列表")
-        List<DeviceFlowMonthVO> monthflowList;
-
-
     }
 
     /**
@@ -645,17 +608,16 @@ public class DeviceDataDto {
         private Integer monthMoney;
 
         @ApiModelProperty(value = "收入")
-         @ExcelProperty(value = "收入", converter = CustomFenToYuanConverter.class)
+        @ExcelProperty(value = "收入", converter = CustomFenToYuanConverter.class)
         @NumberFormat("#0.00")
         private Integer incomeMoney;
 
         @ApiModelProperty(value = "支出")
-         @ExcelProperty(value = "支出", converter = CustomFenToYuanConverter.class)
+        @ExcelProperty(value = "支出", converter = CustomFenToYuanConverter.class)
         @NumberFormat("#0.00")
         private Integer expenditureMoney;
 
 
-
     }
 
     /**

device-api/src/main/java/com/xy/dto/DeviceSimChargeDto.java

@@ -310,7 +310,7 @@ public class DeviceSimChargeDto {
         @ApiModelProperty(value = "附件")
         private String files;
 
-        //size -1 不分页
+        // size -1 不分页
         public PageBean getPage() {
             if (!this.exportPage) {
                 this.page.setSize(-1L);