更改包名

user_center/src/main/java/com/zcxk/service/UserService.java

@@ -4,7 +4,7 @@ package com.zcxk.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zcxk.common.ToolUtil;
-import com.zcxk.core.utils.util.RedisUtils;
+import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.zcxk.dao.OrgMapper;
 import com.zcxk.dao.UserMapper;
 import com.zcxk.dto.MaintainerCountDto;

user_center/src/main/java/com/zcxk/service/impl/OrgServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zcxk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zcxk.core.utils.util.RedisUtils;
+import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.zcxk.dao.OrgMapper;
 import com.zcxk.dto.OrgBaseTreeInfoDto;
 import com.zcxk.dto.OrgTree;

user_center/src/main/java/com/zcxk/service/impl/RoleServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zcxk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zcxk.core.utils.util.RedisUtils;
+import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.zcxk.dao.MenuMapper;
 import com.zcxk.dao.RoleMapper;
 import com.zcxk.dao.RoleMenuMapper;

user_center/src/main/java/com/zcxk/service/impl/TenantServiceImpl.java

@@ -2,12 +2,12 @@ package com.zcxk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zcxk.common.ToolUtil;
-import com.zcxk.core.common.exception.BusinessException;
+import com.bz.zoneiot.core.common.exception.BusinessException;
 import com.zcxk.dao.*;
 import com.zcxk.dto.TenantDto;
 import com.zcxk.entity.*;
-import com.zcxk.iot.sync.dto.CustomerDTO;
-import com.zcxk.iot.sync.service.SyncCustomerService;
+import com.bz.zoneiot.iot.sync.dto.CustomerDTO;
+import com.bz.zoneiot.iot.sync.service.SyncCustomerService;
 import com.zcxk.model.LoginUser;
 import com.zcxk.service.TenantService;
 import com.zcxk.util.Snowflake;

user_center/src/main/java/com/zcxk/service/impl/UserGroupServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zcxk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zcxk.core.utils.util.RedisUtils;
+import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.zcxk.dao.GroupUserMapper;
 import com.zcxk.dao.UserGroupMapper;
 import com.zcxk.dao.UserMapper;

zoniot-pay/zoniot-pay-app/src/main/java/com/zcxk/water/service/impl/WaterQueryApiImpl.java

@@ -1,7 +1,6 @@
 package com.zcxk.water.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zcxk.core.oauth2.util.UserUtil;
 import com.zcxk.water.common.utils.ClientUserUtil;
 import com.zcxk.water.dao.ClientUserDeviceMapper;
 import com.zcxk.water.dto.*;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/BaseWaterPropertyMapper.java

@@ -1,6 +1,5 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.BaseWaterPropertyDataDto;
 import com.zcxk.rmcp.pay.dto.pay.BaseWaterPropertyDto;
 import com.zcxk.rmcp.pay.entity.pay.PayBaseWaterprice;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/MeasurementInstanceMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 
 import com.zcxk.rmcp.pay.dto.measurementsettlement.MeasurementSettlementDto;
 import com.zcxk.rmcp.pay.dto.pay.EstimatedDayDto;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/MeasurementSettlementMapper.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 
 import com.zcxk.rmcp.pay.dto.measurementsettlement.MeasurementSettlementDto;
 import com.zcxk.rmcp.pay.entity.pay.MeasurementSettlement;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseAccountMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.*;
 import com.zcxk.rmcp.pay.entity.pay.MeasurementInstance;
 import com.zcxk.rmcp.pay.entity.pay.PayBaseAccount;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseWaterpriceMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.PayBaseWaterpriceSelectDto;
 import com.zcxk.rmcp.pay.entity.pay.PayBaseWaterprice;
 import org.apache.ibatis.annotations.Mapper;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayControlRuleMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.entity.Device;
 import com.zcxk.rmcp.pay.entity.pay.PayControlRule;
 import org.apache.ibatis.annotations.Mapper;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayFeeMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.*;
 import com.zcxk.rmcp.pay.dto.pay.payfee.*;
 import com.zcxk.rmcp.pay.entity.pay.BaseClosingAccountInfo;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayInvoicePrintMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.payfee.PayInvoiceSearchDto;
 import com.zcxk.rmcp.pay.dto.pay.payfee.PayfeeInvoicePrintDto;
 import com.zcxk.rmcp.pay.entity.pay.PayInvoiceprinted;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayAgentbranchMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.PayPayAgentbranchSelectDto;
 import com.zcxk.rmcp.pay.entity.pay.PayPayAgentbranch;
 import org.apache.ibatis.annotations.Mapper;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayReceivableMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.PayPayReceivableDto;
 import com.zcxk.rmcp.pay.entity.pay.PayPayReceived;
 import com.zcxk.rmcp.pay.entity.pay.PayPayRechargeaccount;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayReceivedMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.PayPayReceivedDto;
 import com.zcxk.rmcp.pay.dto.pay.PayPayReceivedListDto;
 import com.zcxk.rmcp.pay.dto.pay.PayReceivedInvoiceDto;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPenaltyrecordMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.PayPenaltyrecordDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayRechargeaccountMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.PayRechargeaccountDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/archives/PayBaseCustomerandmeterrelaMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dao.pay.archives;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.dto.pay.PayBaseCustomerandmeterrelaDto;
 import com.zcxk.rmcp.pay.dto.pay.PayCustomerDto;
 import com.zcxk.rmcp.pay.entity.Organization;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/LoginUser.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.pay.dto;
 
-import com.zcxk.core.common.pojo.ProgramItem;
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.ProgramItem;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.entity.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/measurementsettlement/MeasurementSettlementDto.java

@@ -2,7 +2,7 @@ package com.zcxk.rmcp.pay.dto.measurementsettlement;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/PayArrearagedetailsReportDto.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dto.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.entity.ProgramItem;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/PayInvoiceDto.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dto.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.entity.ProgramItem;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/PayOperatordetailsReportDto.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dto.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.entity.ProgramItem;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/PayTransactiondetailsReportDto.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.dto.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.pay.entity.ProgramItem;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/entity/pay/PayWaterPropertyReport.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.entity.pay;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/commom/BaseSync.java

@@ -3,7 +3,7 @@ package com.zcxk.rmcp.pay.commom;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.zcxk.core.common.exception.BusinessException;
+import com.bz.zoneiot.core.common.exception.BusinessException;
 import com.zcxk.rmcp.pay.enums.SqlType;
 import lombok.extern.slf4j.Slf4j;
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/commom/util/UserUtil.java

@@ -34,7 +34,7 @@ public class UserUtil {
 
             if(authentication instanceof OAuth2Authentication){
                 OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) authentication;
-                if(oAuth2Authentication.getPrincipal() instanceof com.zcxk.core.oauth2.pojo.LoginUser){
+                if(oAuth2Authentication.getPrincipal() instanceof com.bz.zoneiot.core.oauth2.pojo.LoginUser){
                     return (LoginUser) oAuth2Authentication.getPrincipal();
                 }else {
                     LinkedHashMap<String,Object> details = (LinkedHashMap<String,Object>) oAuth2Authentication.getUserAuthentication().getDetails();
@@ -54,8 +54,8 @@ public class UserUtil {
                     loginUser.setPermissonType(userJson.getInteger("permissonType"));
                     JSONArray appIds = userJson.getJSONArray("appIds");
                     if (programItemListArray != null) {
-                        List<com.zcxk.core.common.pojo.ProgramItem> collection =
-                                JSONObject.parseArray(programItemListArray.toJSONString(), com.zcxk.core.common.pojo.ProgramItem.class);
+                        List<com.bz.zoneiot.core.common.pojo.ProgramItem> collection =
+                                JSONObject.parseArray(programItemListArray.toJSONString(), com.bz.zoneiot.core.common.pojo.ProgramItem.class);
                         loginUser.setProgramItemList(collection);
                     }
                     if(appIds!=null){

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/config/AccessTokenService.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.pay.config;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zcxk.core.utils.util.RedisUtils;
+import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.zcxk.rmcp.pay.commom.util.HttpRequest;
 
 import lombok.extern.slf4j.Slf4j;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/common/ValidateCodeController.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.controller.common;
 
-import com.zcxk.core.utils.util.RedisUtils;
+import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.zcxk.rmcp.pay.commom.model.AjaxMessage;
 import com.zcxk.rmcp.pay.commom.model.ResultStatus;
 import com.zcxk.rmcp.pay.commom.util.ByteArrayUtils;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/pay/MeasurementSettlementController.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.pay.controller.pay;
 
-import com.zcxk.core.common.pojo.AjaxMessage;
-import com.zcxk.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.pay.dto.measurementsettlement.*;
 
 import com.zcxk.rmcp.pay.service.pay.MeasurementSettlementService;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/controller/pay/archives/PayBaseCustomerandmeterrelaController.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.pay.controller.pay.archives;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zcxk.core.utils.util.RedisUtils;
+import com.bz.zoneiot.core.utils.util.RedisUtils;
 import com.zcxk.rmcp.pay.commom.model.AjaxMessage;
 import com.zcxk.rmcp.pay.commom.model.Pagination;
 import com.zcxk.rmcp.pay.commom.model.ResultStatus;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/mq/SyncCommunityConsumer.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.mq;
 
-import com.zcxk.core.common.exception.BusinessException;
+import com.bz.zoneiot.core.common.exception.BusinessException;
 import com.zcxk.rmcp.pay.commom.BaseSync;
 import com.zcxk.rmcp.pay.commom.constant.MqConstant;
 import com.zcxk.rmcp.pay.dao.CommunityMapper;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/MeasurementSettlementServiceImpl.java

@@ -3,14 +3,13 @@ package com.zcxk.rmcp.pay.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
-import com.zcxk.core.common.util.BeanCopyUtils;
-import com.zcxk.core.mysql.pageing.Pagination;
-import com.zcxk.core.oauth2.pojo.LoginUser;
-import com.zcxk.core.oauth2.util.UserUtil;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.common.util.BeanCopyUtils;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.oauth2.pojo.LoginUser;
+import com.bz.zoneiot.core.oauth2.util.UserUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 
 import com.zcxk.rmcp.pay.commom.exception.ServiceException;
-import com.zcxk.rmcp.pay.commom.model.AjaxMessage;
 import com.zcxk.rmcp.pay.commom.model.ResultStatus;
 import com.zcxk.rmcp.pay.commom.util.DateTimeUtil;
 import com.zcxk.rmcp.pay.commom.util.ReflectionsUtil;
@@ -25,7 +24,6 @@ import com.zcxk.rmcp.pay.dto.pay.*;
 import com.zcxk.rmcp.pay.entity.Device;
 import com.zcxk.rmcp.pay.entity.pay.*;
 import com.zcxk.rmcp.pay.entity.pay.archives.PayBaseCustomerandmeterrela;
-import com.zcxk.rmcp.pay.service.impl.pay.AmountWaterUsedAmountServiceImpl;
 import com.zcxk.rmcp.pay.service.pay.MeasurementSettlementService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/UserServiceImpl.java

@@ -1,6 +1,5 @@
 package com.zcxk.rmcp.pay.service.impl;
 
-import com.zcxk.core.utils.util.RedisUtils;
 import com.zcxk.rmcp.pay.commom.model.Pagination;
 import com.zcxk.rmcp.pay.commom.util.UserUtil;
 import com.zcxk.rmcp.pay.dao.*;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayBaseAccountServiceImpl.java

@@ -1,10 +1,10 @@
 package com.zcxk.rmcp.pay.service.impl.pay;
 
-import com.zcxk.core.oauth2.util.UserUtil;
+import com.bz.zoneiot.core.oauth2.util.UserUtil;
 import com.zcxk.rmcp.pay.commom.exception.ServiceException;
 import com.zcxk.rmcp.pay.commom.model.Pagination;
 import com.zcxk.rmcp.pay.commom.util.SnowflakeIdWorker;
-import com.zcxk.core.oauth2.pojo.LoginUser;
+import com.bz.zoneiot.core.oauth2.pojo.LoginUser;
 import com.zcxk.rmcp.pay.dao.pay.*;
 
 import com.zcxk.rmcp.pay.dto.pay.*;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayChargeSurveyServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.service.impl.pay;
 
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.pay.commom.util.UserUtil;
 import com.zcxk.rmcp.pay.dao.pay.BaseClosingAccountInfoMapper;
 import com.zcxk.rmcp.pay.dao.pay.MeasurementInstanceMapper;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayFeeServiceImp.java

@@ -3,7 +3,7 @@ package com.zcxk.rmcp.pay.service.impl.pay;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.pay.commom.exception.ServiceException;
 import com.zcxk.rmcp.pay.commom.model.ResultStatus;
 import com.zcxk.rmcp.pay.commom.util.HttpRequest;

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PaySyncDataServiceImpl.java

@@ -1,10 +1,7 @@
 package com.zcxk.rmcp.pay.service.impl.pay;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.google.common.collect.Lists;
-import com.zcxk.rmcp.api.dto.install.InstallPlanDataDto;
 import com.zcxk.rmcp.api.dto.install.InstallPlanInputDto;
 import com.zcxk.rmcp.api.feign.SyncDataClient;
 import com.zcxk.rmcp.pay.commom.model.AjaxMessage;
@@ -12,7 +9,6 @@ import com.zcxk.rmcp.pay.commom.model.ResultStatus;
 import com.zcxk.rmcp.pay.commom.util.HttpRequest;
 import com.zcxk.rmcp.pay.commom.util.JacksonUtil;
 import com.zcxk.rmcp.pay.commom.util.SnowflakeIdWorker;
-import com.zcxk.rmcp.pay.commom.util.UserUtil;
 import com.zcxk.rmcp.pay.dao.CustomerMapper;
 import com.zcxk.rmcp.pay.dao.DeviceMapper;
 import com.zcxk.rmcp.pay.dao.WaterMeterReplaceLogMapper;
@@ -263,7 +259,7 @@ public class PaySyncDataServiceImpl implements PaySyncDataService {
 
                 //syncDataClient.syncPlan(installStr);
                 syncDataClient.syncPlan(installPlanInputDto);
-                com.zcxk.core.oauth2.pojo.LoginUser user = new com.zcxk.core.oauth2.pojo.LoginUser(new HashSet<>());
+                com.bz.zoneiot.core.oauth2.pojo.LoginUser user = new com.bz.zoneiot.core.oauth2.pojo.LoginUser(new HashSet<>());
                 if(excelLoginUser!=null){
                     user.setId(excelLoginUser.getId());
                     user.setTenantId(excelLoginUser.getTenantId());

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/MeasurementSettlementService.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.pay.service.pay;
 
-import com.zcxk.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.pay.dto.measurementsettlement.*;
 
 import java.util.List;
@@ -16,7 +16,7 @@ public interface MeasurementSettlementService {
      * @description
      * @author hym
      * @updateTime 2021/8/3 9:39
-     * @return com.zcxk.core.mysql.pageing.Pagination<com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementSettlementDto>
+     * @return Pagination<com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementSettlementDto>
      * @throws
      */
     Pagination<MeasurementSettlementDto> pageMeasurementSettlement(MeasurementSettlementPageDto pageDto);
@@ -25,7 +25,7 @@ public interface MeasurementSettlementService {
      * @description
      * @author hym
      * @updateTime 2021/8/3 9:40
-     * @return com.zcxk.core.mysql.pageing.Pagination<com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementSettlementDto>
+     * @return Pagination<com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementSettlementDto>
      * @throws
      */
     Pagination<MeasurementSettlementDto> pageMeasurementSettlementRecord(MeasurementSettlementPageDto pageDto);
@@ -70,7 +70,7 @@ public interface MeasurementSettlementService {
    * @description
    * @author hym
    * @updateTime 2021/8/3 9:41
-   * @return com.zcxk.core.mysql.pageing.Pagination<com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementRecordDto>
+   * @return Pagination<com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementRecordDto>
    * @throws
    */
     Pagination<MeasurementRecordDto> pageMeasurementRecord(MeasurementRecordPageDto pageDto);

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/pay/PayBaseAccountService.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.pay.service.pay;
 
 
-import com.zcxk.core.oauth2.pojo.LoginUser;
+import com.bz.zoneiot.core.oauth2.pojo.LoginUser;
 import com.zcxk.rmcp.pay.commom.model.Pagination;
 
 import com.zcxk.rmcp.pay.dto.pay.*;

zoniot-pay/zoniot-pay-xxljob-client/src/main/java/com/zcxk/rmcp/pay/job/DeviceSyncServiceHander.java

@@ -7,9 +7,8 @@ import com.google.common.collect.Lists;
 
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import com.zcxk.core.common.pojo.AjaxMessage;
-import com.zcxk.core.common.util.BeanCopyUtils;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.common.util.BeanCopyUtils;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.api.dto.install.MeterSyncDto;
 import com.zcxk.rmcp.api.dto.install.MeterSyncInputDto;
 import com.zcxk.rmcp.api.feign.SyncDataClient;

zoniot-pay/zoniot-pay-xxljob-client/src/main/java/com/zcxk/rmcp/pay/job/EstimatedDayHander.java

@@ -2,11 +2,9 @@ package com.zcxk.rmcp.pay.job;
 
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import com.zcxk.core.utils.BaseRedisCacheImpl;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.pay.dao.pay.*;
 import com.zcxk.rmcp.pay.dao.pay.archives.PayBaseCustomerandmeterrelaMapper;
-import com.zcxk.rmcp.pay.dto.LoginUser;
 import com.zcxk.rmcp.pay.dto.pay.*;
 import com.zcxk.rmcp.pay.entity.pay.BaseWaterProperty;
 import com.zcxk.rmcp.pay.entity.pay.PayBaseAccount;
@@ -18,7 +16,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.math.BigInteger;

zoniot-pay/zoniot-pay-xxljob-client/src/main/java/com/zcxk/rmcp/pay/job/MeasurementSettlementRecordHander.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON;
 
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 
 import com.zcxk.rmcp.pay.dto.MeterReadRecordDTO;
 import com.zcxk.rmcp.api.feign.MeterReadDataFeign;

zoniot-rmcp/zoniot-rmcp-alarm/src/main/java/com/bz/rmcp/alarm/config/SnowflakeIdWorkerConfig.java

@@ -1,8 +1,8 @@
 package com.bz.rmcp.alarm.config;
 
 import com.bz.rmcp.alarm.util.Utils;
-import com.zcxk.core.common.pojo.SnowIdDto;
-import com.zcxk.core.common.util.SnowflakeIdWorker;
+import com.bz.zoneiot.core.common.pojo.SnowIdDto;
+import com.bz.zoneiot.core.common.util.SnowflakeIdWorker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

zoniot-rmcp/zoniot-rmcp-alarm/src/main/java/com/bz/rmcp/alarm/service/impl/DeviceAlarmServiceImpl.java

@@ -13,9 +13,9 @@ import com.alibaba.fastjson.JSON;
 import com.bz.rmcp.alarm.common.Constants;
 import com.bz.rmcp.alarm.service.DeviceAlarmService;
 import com.bz.rmcp.alarm.service.DeviceMeasuringPointService;
-import com.zcxk.core.common.enums.StatusEnum;
-import com.zcxk.core.common.util.SnowflakeIdWorker;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.common.enums.StatusEnum;
+import com.bz.zoneiot.core.common.util.SnowflakeIdWorker;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.api.dto.alarm.*;
 import com.zcxk.rmcp.api.dto.product.MeasureDataDto;
 import com.zcxk.rmcp.api.enums.DeviceStatusEnum;

zoniot-rmcp/zoniot-rmcp-alarm/src/main/java/com/bz/rmcp/alarm/util/Utils.java

@@ -1,6 +1,6 @@
 package com.bz.rmcp.alarm.util;
 
-import com.zcxk.core.common.pojo.SnowIdDto;
+import com.bz.zoneiot.core.common.pojo.SnowIdDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.support.atomic.RedisAtomicLong;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/measurementsettlement/MeasurementSettlementDto.java

@@ -2,7 +2,7 @@ package com.zcxk.rmcp.api.dto.measurementsettlement;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/meterreadrecord/MeterReadRecordDto.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.api.dto.meterreadrecord;
 
-import com.zcxk.core.utils.ZoniotStringUtils;
+import com.bz.zoneiot.core.utils.ZoniotStringUtils;
 import com.zcxk.rmcp.api.dto.BasePageDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/readmeter/WaterMeterDto.java

@@ -1,12 +1,10 @@
 package com.zcxk.rmcp.api.dto.readmeter;
 
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zcxk.core.utils.NumberDistri;
+import com.bz.zoneiot.core.utils.NumberDistri;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/enums/ReadRateEnum.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.api.enums;
 
-import com.zcxk.core.common.exception.BusinessException;
+import com.bz.zoneiot.core.common.exception.BusinessException;
 import lombok.Getter;
 
 /**

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/enums/ReadStatusEnum.java

@@ -1,7 +1,6 @@
 package com.zcxk.rmcp.api.enums;
 
-import com.zcxk.core.utils.ZoniotStringUtils;
-import io.swagger.models.auth.In;
+import com.bz.zoneiot.core.utils.ZoniotStringUtils;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/enums/RmcpErrorEnum.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.api.enums;
 
-import com.zcxk.core.common.support.RespCode;
+import com.bz.zoneiot.core.common.support.RespCode;
 import lombok.Getter;
 
 /**

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/feign/SyncDataClient.java

@@ -1,6 +1,5 @@
 package com.zcxk.rmcp.api.feign;
 
-import com.zcxk.core.common.pojo.AjaxMessage;
 import com.zcxk.rmcp.api.dto.OrgDto;
 import com.zcxk.rmcp.api.dto.install.InstallPlanInputDto;
 import com.zcxk.rmcp.api.dto.install.MeterSyncDto;
@@ -8,14 +7,10 @@ import com.zcxk.rmcp.api.dto.install.MeterSyncInputDto;
 import com.zcxk.rmcp.api.dto.meterreadrecord.MeterReadRecordSyncDto;
 import com.zcxk.rmcp.api.vo.MeterReadRecordVo;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/DeviceNoCellVo.java

@@ -1,9 +1,8 @@
 package com.zcxk.rmcp.api.vo;
 
-import com.zcxk.core.utils.ZoniotStringUtils;
+import com.bz.zoneiot.core.utils.ZoniotStringUtils;
 import com.zcxk.rmcp.api.enums.DeviceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.math.BigDecimal;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/MeterReadRecordVo.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.api.vo;
 
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.api.enums.ReadStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/StatisticsReadRateVo.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.api.vo;
 
-import com.zcxk.core.utils.BigDecimalUtils;
+import com.bz.zoneiot.core.utils.BigDecimalUtils;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/StatusStatisticsVo.java

@@ -1,6 +1,5 @@
 package com.zcxk.rmcp.api.vo;
 
-import com.zcxk.core.utils.ZoniotStringUtils;
 import com.zcxk.rmcp.api.enums.DeviceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/CommunityMapper.java

@@ -1,8 +1,7 @@
 package com.zcxk.rmcp.core.dao;
 
 
-import com.zcxk.core.common.pojo.UserCondition;
-import com.zcxk.rmcp.api.dto.community.CommunityDto;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.vo.CommunityVo;
 import com.zcxk.rmcp.core.entity.Community;
 import org.apache.ibatis.annotations.Param;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceAlarmMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.alarm.DeviceAlarmQueryDto;
 import com.zcxk.rmcp.api.vo.DeviceAlarmVo;
 import com.zcxk.rmcp.core.entity.DeviceAlarm;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceCommandMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.devicecommand.DeviceCommandPageDto;
 import com.zcxk.rmcp.api.vo.DeviceCommandVo;
 import com.zcxk.rmcp.core.entity.DeviceCommand;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceMapper.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.core.dao;
 
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.device.DeviceQueryDto;
 import com.zcxk.rmcp.api.dto.install.MeterSyncDto;
 import com.zcxk.rmcp.api.dto.install.MeterSyncInputDto;
@@ -10,7 +10,6 @@ import com.zcxk.rmcp.api.dto.install.InstallDeviceDto;
 import com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementSettlementDto;
 import com.zcxk.rmcp.api.vo.*;
 import com.zcxk.rmcp.core.entity.Device;
-import com.zcxk.rmcp.core.entity.InstallList;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/InstallListMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.install.InstallDeviceDto;
 import com.zcxk.rmcp.api.dto.install.InstallListDto;
 import com.zcxk.rmcp.api.dto.install.InstallQueryDto;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/InstallPlanMapper.java

@@ -1,11 +1,10 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.install.InstallDetailDto;
 import com.zcxk.rmcp.api.query.InstallPlanQueryCondition;
 import com.zcxk.rmcp.api.vo.InstallPlanVo;
 import com.zcxk.rmcp.api.vo.StatisticsDeviceStatusVo;
-import com.zcxk.rmcp.api.vo.StatusStatisticsVo;
 import com.zcxk.rmcp.core.entity.InstallPlan;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/MeasurementInstanceMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementSettlementDto;
 import com.zcxk.rmcp.core.entity.MeasurementInstance;
 import org.apache.ibatis.annotations.Param;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/MeasurementSettlementMapper.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.core.dao;
 
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.measurementsettlement.MeasurementSettlementDto;
 import com.zcxk.rmcp.core.entity.MeasurementSettlement;
 import org.apache.ibatis.annotations.Mapper;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/MeterReadWaterRecordMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.vo.MeterReadWaterRecordVo;
 import com.zcxk.rmcp.api.vo.StatisticsReadRateVo;
 import com.zcxk.rmcp.core.entity.MeterReadWaterRecord;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/MeterReplaceLogMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.meterreplace.MeterReplacePageDto;
 import com.zcxk.rmcp.api.vo.MeterReplaceVo;
 import com.zcxk.rmcp.core.entity.MeterReplaceLog;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/OrgMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.vo.OrgTreeVo;
 import com.zcxk.rmcp.core.entity.Org;
 import org.apache.ibatis.annotations.Mapper;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ProductCategoryMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 
 import com.zcxk.rmcp.api.vo.ProductCategoryVo;
 import com.zcxk.rmcp.core.entity.ProductCategory;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRate7DayMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.readrate.ReadRateDto;
 import com.zcxk.rmcp.api.vo.ReadRateVo;
 import com.zcxk.rmcp.api.vo.StatisticsReadRateVo;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateMonthMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.readrate.ReadRateDto;
 import com.zcxk.rmcp.api.vo.ReadRateVo;
 import com.zcxk.rmcp.api.vo.StatisticsReadRateVo;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateTodayMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.readrate.ReadRateDto;
 import com.zcxk.rmcp.api.vo.ReadRateVo;
 import com.zcxk.rmcp.api.vo.StatisticsReadRateVo;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateYesterdayMapper.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import com.zcxk.rmcp.api.dto.readrate.ReadRateDto;
 import com.zcxk.rmcp.api.vo.ReadRateVo;
 import com.zcxk.rmcp.api.vo.StatisticsReadRateVo;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/BaseMongoDao.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.dao.mongo;
 
-import com.zcxk.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
 import org.springframework.data.mongodb.core.query.Criteria;
 
 import java.util.List;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/DeviceDataDao.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.core.dao.mongo;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zcxk.core.mongo.base.BaseDao;
+import com.bz.zoneiot.core.mongo.base.BaseDao;
 import com.zcxk.rmcp.core.mongo.DeviceData;
 import com.zcxk.rmcp.core.mongo.DeviceDataItem;
 import org.springframework.data.domain.Sort;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/MeterReadRecordDao.java

@@ -1,28 +1,20 @@
 package com.zcxk.rmcp.core.dao.mongo;
 
-import com.zcxk.core.common.exception.BusinessException;
-import com.zcxk.core.common.pojo.PageResult;
-import com.zcxk.core.common.pojo.UserCondition;
-import com.zcxk.core.mongo.base.BaseDao;
-import com.zcxk.core.mongo.utils.StringUtil;
-import com.zcxk.core.oauth2.util.UserUtil;
-import com.zcxk.core.utils.BigDecimalUtils;
-import com.zcxk.core.utils.DateUtil;
-import com.zcxk.core.utils.ZoniotIntegerUtils;
-import com.zcxk.core.utils.ZoniotStringUtils;
+import com.bz.zoneiot.core.common.pojo.PageResult;
+import com.bz.zoneiot.core.common.pojo.UserCondition;
+import com.bz.zoneiot.core.mongo.base.BaseDao;
+import com.bz.zoneiot.core.mongo.utils.StringUtil;
+import com.bz.zoneiot.core.oauth2.util.UserUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.ZoniotIntegerUtils;
+import com.bz.zoneiot.core.utils.ZoniotStringUtils;
 import com.zcxk.rmcp.api.dto.meterreadrecord.MeterReadRecordDto;
-import com.zcxk.rmcp.api.dto.meterreadrecord.MeterReadRecordUpdateDto;
-import com.zcxk.rmcp.api.dto.readmeter.MeterData;
 import com.zcxk.rmcp.api.enums.ReadStatusEnum;
-import com.zcxk.rmcp.api.enums.RmcpErrorEnum;
 import com.zcxk.rmcp.api.vo.MeterReadRecordAggregationVo;
 import com.zcxk.rmcp.api.vo.MeterReadRecordVo;
 import com.zcxk.rmcp.core.dao.DeviceMapper;
 import com.zcxk.rmcp.core.entity.Device;
 import com.zcxk.rmcp.core.mongo.MeterReadRecord;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.aggregation.*;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/Community.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.entity;
 
-import com.zcxk.core.mysql.base.BaseDO;
+import com.bz.zoneiot.core.mysql.base.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/DeviceCommand.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.entity;
 
-import com.zcxk.core.mysql.base.BaseDO;
+import com.bz.zoneiot.core.mysql.base.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDateTime;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/InstallPlan.java

@@ -1,9 +1,8 @@
 package com.zcxk.rmcp.core.entity;
 
-import com.zcxk.core.mysql.base.BaseDO;
+import com.bz.zoneiot.core.mysql.base.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.time.LocalDateTime;
 import lombok.Data;
 
 /**

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/MeterReplaceLog.java

@@ -1,9 +1,8 @@
 package com.zcxk.rmcp.core.entity;
 
-import com.zcxk.core.mysql.base.BaseDO;
+import com.bz.zoneiot.core.mysql.base.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.time.LocalDateTime;
 import lombok.Data;
 
 /**

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/ProductMeasuringDict.java

@@ -1,13 +1,11 @@
 package com.zcxk.rmcp.core.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zcxk.core.mysql.base.BaseDO;
+import com.bz.zoneiot.core.mysql.base.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 /**
  * @author Andy
  * @version V1.0

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/ProductMeasuringPoint.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.entity;
 
-import com.zcxk.core.mysql.base.BaseDO;
+import com.bz.zoneiot.core.mysql.base.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mongo/DeviceData.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.core.mongo;
 
-import com.zcxk.core.mongo.annotation.QueryField;
+import com.bz.zoneiot.core.mongo.annotation.QueryField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mongo/MeterReadRecord.java

@@ -1,13 +1,11 @@
 package com.zcxk.rmcp.core.mongo;
 
-import com.zcxk.core.mongo.base.BaseDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 

zoniot-rmcp/zoniot-rmcp-dap/src/main/java/com/bz/rmcp/dap/config/SnowflakeIdWorkerConfig.java

@@ -1,8 +1,8 @@
 package com.bz.rmcp.dap.config;
 
-import com.zcxk.core.common.pojo.SnowIdDto;
+import com.bz.zoneiot.core.common.pojo.SnowIdDto;
 import com.bz.rmcp.dap.util.Utils;
-import com.zcxk.core.common.util.SnowflakeIdWorker;
+import com.bz.zoneiot.core.common.util.SnowflakeIdWorker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

zoniot-rmcp/zoniot-rmcp-dap/src/main/java/com/bz/rmcp/dap/service/impl/DeviceDataServiceImpl.java

@@ -17,8 +17,8 @@ import java.util.*;
 import com.alibaba.fastjson.JSON;
 import com.bz.rmcp.dap.model.DeviceOrigDataDTO;
 import com.bz.rmcp.dap.service.DeviceDataService;
-import com.zcxk.core.common.util.SnowflakeIdWorker;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.common.util.SnowflakeIdWorker;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.api.enums.DeviceStatusEnum;
 import com.zcxk.rmcp.api.enums.ReadStatusEnum;
 import com.zcxk.rmcp.api.enums.ValveStatusEnum;

zoniot-rmcp/zoniot-rmcp-dap/src/main/java/com/bz/rmcp/dap/service/impl/DeviceServiceImpl.java

@@ -4,7 +4,7 @@ import com.bz.rmcp.dap.common.Constants;
 import com.zcxk.rmcp.api.dto.readmeter.MeterData;
 import com.bz.rmcp.dap.model.OfflineData;
 import com.bz.rmcp.dap.service.DeviceService;
-import com.zcxk.core.utils.DateUtil;
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.zcxk.rmcp.api.enums.DeviceStatusEnum;
 import com.zcxk.rmcp.core.dao.DeviceMapper;
 import com.zcxk.rmcp.core.entity.Device;

zoniot-rmcp/zoniot-rmcp-dap/src/main/java/com/bz/rmcp/dap/util/Utils.java

@@ -1,6 +1,6 @@
 package com.bz.rmcp.dap.util;
 
-import com.zcxk.core.common.pojo.SnowIdDto;
+import com.bz.zoneiot.core.common.pojo.SnowIdDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.support.atomic.RedisAtomicLong;

zoniot-rmcp/zoniot-rmcp-sync/src/main/java/com/zcxk/sync/base/BaseSync.java

@@ -3,7 +3,7 @@ package com.zcxk.sync.base;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.zcxk.core.common.exception.BusinessException;
+import com.bz.zoneiot.core.common.exception.BusinessException;
 import com.zcxk.sync.enums.SqlType;
 import lombok.extern.slf4j.Slf4j;
 

zoniot-rmcp/zoniot-rmcp-sync/src/main/java/com/zcxk/sync/mq/SyncDeviceProducer.java

@@ -1,15 +1,13 @@
 package com.zcxk.sync.mq;
 
 import com.alibaba.fastjson.JSON;
-import com.zcxk.core.utils.DateUtil;
-import com.zcxk.core.utils.MqService;
+import com.bz.zoneiot.core.utils.MqService;
 import com.zcxk.rmcp.api.dto.DeviceAreaDto;
 import com.zcxk.rmcp.api.dto.device.DeviceSyncDto;
 import com.zcxk.rmcp.api.dto.product.ProductVo;
 import com.zcxk.rmcp.core.dao.AreaMapper;
 import com.zcxk.rmcp.core.dao.ProductMapper;
 import com.zcxk.rmcp.core.entity.Device;
-import com.zcxk.sync.constant.MqConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

zoniot-rmcp/zoniot-rmcp-sync/src/main/java/com/zcxk/sync/mq/SyncOrgConsumer.java

@@ -1,6 +1,6 @@
 package com.zcxk.sync.mq;
 
-import com.zcxk.core.common.exception.BusinessException;
+import com.bz.zoneiot.core.common.exception.BusinessException;
 import com.zcxk.rmcp.core.dao.OrgMapper;
 import com.zcxk.rmcp.core.entity.Org;
 import com.zcxk.sync.base.BaseSync;

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/config/SnowflakeIdWorkerConfig.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.web.config;
 
-import com.zcxk.core.common.util.SnowflakeIdWorker;
+import com.bz.zoneiot.core.common.util.SnowflakeIdWorker;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/AlarmController.java

@@ -1,10 +1,9 @@
 package com.zcxk.rmcp.web.controller;
 
-import com.zcxk.core.common.pojo.AjaxMessage;
-import com.zcxk.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.api.dto.BasePageDto;
 import com.zcxk.rmcp.api.dto.alarm.DeviceAlarmQueryDto;
-import com.zcxk.rmcp.api.dto.device.DeviceQueryDto;
 import com.zcxk.rmcp.api.vo.DeviceAlarmVo;
 import com.zcxk.rmcp.web.service.DeviceAlarmService;
 import io.swagger.annotations.Api;

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/AlarmRuleController.java

@@ -1,8 +1,8 @@
 package com.zcxk.rmcp.web.controller;
 
 
-import com.zcxk.core.common.pojo.AjaxMessage;
-import com.zcxk.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.api.dto.alarm.AlarmRuleDto;
 import com.zcxk.rmcp.api.dto.alarm.AlarmRulePageDto;
 import com.zcxk.rmcp.api.dto.alarm.ConfigDataDto;

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/AlarmTypeController.java

@@ -1,16 +1,15 @@
 package com.zcxk.rmcp.web.controller;
 
 
-import com.zcxk.core.common.enums.RespCodeEnum;
-import com.zcxk.core.common.pojo.AjaxMessage;
-import com.zcxk.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.common.enums.RespCodeEnum;
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.api.dto.alarm.AlarmTypeDto;
 import com.zcxk.rmcp.api.dto.alarm.AlarmTypePageDto;
 import com.zcxk.rmcp.web.service.AlarmTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/CommonController.java

@@ -1,6 +1,6 @@
 package com.zcxk.rmcp.web.controller;
 
-import com.zcxk.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
 import com.zcxk.rmcp.api.dto.product.ProductVo;
 import com.zcxk.rmcp.api.vo.AreaVo;
 import com.zcxk.rmcp.api.vo.OrgTreeVo;

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/CommunityController.java

@@ -1,7 +1,7 @@
 package com.zcxk.rmcp.web.controller;
 
-import com.zcxk.core.common.pojo.AjaxMessage;
-import com.zcxk.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.api.dto.community.CommunityAddDto;
 import com.zcxk.rmcp.api.dto.community.CommunityDto;
 import com.zcxk.rmcp.api.dto.community.CommunityPageDto;

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceCommandController.java

@@ -1,22 +1,18 @@
 package com.zcxk.rmcp.web.controller;
 
-import com.zcxk.core.common.exception.BusinessException;
-import com.zcxk.core.common.pojo.AjaxMessage;
-import com.zcxk.core.mysql.pageing.Pagination;
-import com.zcxk.core.utils.export.EasyExcelUtil;
+import com.bz.zoneiot.core.common.exception.BusinessException;
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.core.mysql.pageing.Pagination;
+import com.bz.zoneiot.core.utils.export.EasyExcelUtil;
 import com.zcxk.rmcp.api.dto.devicecommand.DeviceCommandPageDto;
-import com.zcxk.rmcp.api.dto.readrate.ReadRateDto;
-import com.zcxk.rmcp.api.enums.ReadRateEnum;
 import com.zcxk.rmcp.api.enums.RmcpErrorEnum;
 import com.zcxk.rmcp.api.vo.DeviceCommandVo;
-import com.zcxk.rmcp.api.vo.ReadRateVo;
 import com.zcxk.rmcp.web.service.DeviceCommandService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;