Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-api/zd-api-system/src/main/java/com/zd/system/api/domain/InventoryTag.java

@@ -1,5 +1,6 @@
 package com.zd.system.api.domain;
 
+import com.zd.model.entity.RemoteLabHardware;
 import lombok.Data;
 import lombok.ToString;
 

zd-api/zd-api-system/src/main/java/com/zd/system/api/factory/RemoteLaboratoryFallbackFactory.java

@@ -5,9 +5,13 @@ import com.zd.common.core.enums.HardwareOperate;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.entity.RemoteLabHardware;
 import com.zd.system.api.domain.Algorithm;
 import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.*;
+import com.zd.system.api.laboratory.domain.LabGradeManageRecord;
+import com.zd.system.api.laboratory.domain.LabMessageContent;
+import com.zd.system.api.laboratory.domain.LabSubjectVO;
+import com.zd.system.api.laboratory.domain.TotalByID;
 import com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,7 +24,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 @Component
 public class RemoteLaboratoryFallbackFactory implements FallbackFactory<RemoteLaboratoryService> {

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/RemoteLaboratoryService.java

@@ -5,9 +5,13 @@ import com.zd.common.core.domain.R;
 import com.zd.common.core.enums.HardwareOperate;
 import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.entity.RemoteLabHardware;
 import com.zd.system.api.domain.Algorithm;
 import com.zd.system.api.factory.RemoteLaboratoryFallbackFactory;
-import com.zd.system.api.laboratory.domain.*;
+import com.zd.system.api.laboratory.domain.LabGradeManageRecord;
+import com.zd.system.api.laboratory.domain.LabMessageContent;
+import com.zd.system.api.laboratory.domain.LabSubjectVO;
+import com.zd.system.api.laboratory.domain.TotalByID;
 import com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -19,7 +23,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * 实验室feign调用服务

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -17,12 +17,13 @@ import com.zd.algorithm.api.netty.feign.RemoteNettyService;
 import com.zd.base.api.feign.RemoteMessageService;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.laboratory.api.entity.LabSubject;
+import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.laboratory.api.feign.RemoteSubQueryService;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.R;
+import com.zd.model.entity.InventoryTag;
 import com.zd.model.entity.RemoteLabHardware;
 import com.zd.model.entity.TemplateResult;
 import com.zd.system.api.feign.RemoteUserService;
@@ -129,11 +130,11 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
 
     private void sendAlarm(QpBottleStorageRVo storageRVo) {
         Long subjectId = storageRVo.getSubjectId();
-        R<List<LabSubject>> resultList = remoteSubQueryService.listByIds(Collections.singletonList(subjectId));
+        R<List<LabSubjectEntity>> resultList = remoteSubQueryService.listByIds(Collections.singletonList(subjectId));
         if (resultList.getCode() == HttpStatus.SUCCESS) {
-            List<LabSubject> data = resultList.getData();
+            List<LabSubjectEntity> data = resultList.getData();
             if (data != null && !data.isEmpty()) {
-                LabSubject labSubject = data.get(0);
+                LabSubjectEntity labSubject = data.get(0);
                 String subjectName = labSubject.getName();
                 //实验室负责人账号ID
                 Long adminId = labSubject.getAdminId();
@@ -149,7 +150,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         }
     }
 
-    private void sendHardware(LabSubject labSubject, String subjectName) {
+    private void sendHardware(LabSubjectEntity labSubject, String subjectName) {
         RemoteLabHardware remoteLabHardware = new RemoteLabHardware();
         remoteLabHardware.setType(8);
         Long id = labSubject.getId();
@@ -194,7 +195,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         }
     }
 
-    private void sendWxMessage(QpBottleStorageRVo storageRVo, LabSubject labSubject) {
+    private void sendWxMessage(QpBottleStorageRVo storageRVo, LabSubjectEntity labSubject) {
         //实验室负责人账号ID
         Long adminId = labSubject.getAdminId();
         //安全责任人ID

zd-modules/zd-algorithm/pom.xml

@@ -113,11 +113,11 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/libs/reader.jar</systemPath>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-bottle-api</artifactId>
             <version>${project.version}</version>
-        </dependency>-->
+        </dependency>
 
         <!--反向代理-->
         <dependency>
@@ -145,6 +145,32 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/libs/onvif-java-1.0.2.jar</systemPath>
         </dependency>
+
+        <dependency>
+            <groupId>com.zd.swagger</groupId>
+            <artifactId>common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.base</groupId>
+            <artifactId>zd-base-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.chemical</groupId>
+            <artifactId>zd-chemical-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.airbottle</groupId>
+            <artifactId>zd-airbottle-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.laboratory</groupId>
+            <artifactId>zd-laboratory-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.zd.algorithm</groupId>
             <artifactId>zd-algorithm-api</artifactId>

zd-modules/zd-algorithm/src/main/java/com/zd/alg/face/controller/FaceApi.java

@@ -3,11 +3,15 @@ package com.zd.alg.face.controller;
 import com.arcsoft.face.FaceFeature;
 import com.arcsoft.face.FaceInfo;
 import com.arcsoft.face.toolkit.ImageInfo;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.alg.face.service.FaceService;
 import com.zd.alg.face.utils.FileUtil;
 import com.zd.algorithm.api.face.feign.FaceCompare;
+import com.zd.common.swagger.config.Knife4jConfiguration;
+import com.zd.laboratory.api.entity.LabStudentsInfo;
+import com.zd.laboratory.api.feign.RemoteStudentsService;
+import com.zd.model.domain.R;
 import com.zd.model.domain.ResultData;
-import com.zd.system.api.entity.LabStudentsInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/face/controller/FaceManagerApi.java

@@ -2,10 +2,12 @@ package com.zd.alg.face.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.alg.face.config.FaceProperties;
 import com.zd.alg.face.handle.FaceEngineFactory;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.IdUtils;
+import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.model.domain.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/controller/AlarmPhotoController.java

@@ -1,8 +1,10 @@
 package com.zd.alg.forward.controller;
 
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.alg.forward.serivce.ImageService;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.model.domain.R;
 import com.zd.model.entity.SysFile;
 import io.swagger.annotations.Api;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/controller/SignInCheckController.java

@@ -1,6 +1,7 @@
 package com.zd.alg.forward.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.domain.VideoRequestData;
 import com.zd.alg.forward.serivce.CheckService;
@@ -10,7 +11,9 @@ import com.zd.alg.forward.serivce.VideoCheckResultValidImpl;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.Assert;
+import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.model.domain.R;
+import com.zd.model.entity.Algorithm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -122,7 +125,7 @@ public class SignInCheckController {
 
     @ApiOperation(value = "警报回调")
     @PostMapping("/alarmCallBack")
-    public Result fireCallBack(@RequestBody VideoRequestData videoRequestData) {
+    public R fireCallBack(@RequestBody VideoRequestData videoRequestData) {
         Integer aid = videoRequestData.getAid();
         if (aid!=null){
             if (aid.equals(9610)){
@@ -132,14 +135,14 @@ public class SignInCheckController {
                 checkService.playMp3();
             }
         }
-        return Result.ok();
+        return R.ok();
     }
 
     @ApiOperation(value = "语音播报")
     @PostMapping("/playMp3")
-    public Result playMp3() {
+    public R playMp3() {
         checkService.playMp3();
-        return Result.ok();
+        return R.ok();
     }
 
     @ApiOperation(value = "测试算法保存")

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/CheckService.java

@@ -13,20 +13,29 @@ import com.zd.alg.forward.serivce.mqtt.CommonSend;
 import com.zd.alg.forward.utils.Base64DecodedMultipartFile;
 import com.zd.alg.forward.utils.FileUploadUtils;
 import com.zd.alg.forward.utils.HttpUtils;
+import com.zd.algorithm.api.alarm.entity.AlarmEntrty;
+import com.zd.algorithm.api.alarm.entity.Routes;
+import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
+import com.zd.base.api.feign.RemoteFileService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.ServletUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.mqtt.model.MessageBody;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.constant.Constants;
+import com.zd.model.constant.SecurityConstants;
 import com.zd.model.domain.R;
+import com.zd.model.entity.Algorithm;
+import com.zd.model.entity.SysFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.core.io.FileSystemResource;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -64,6 +73,9 @@ public class CheckService {
     private RedisService redisService;
 
     @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
     private RemoteAlarmService remoteAlarmService;
 
     @Autowired
@@ -130,7 +142,9 @@ public class CheckService {
                 }
                 logger.info("===============5=================");
                 R algorithm = saveAlgorithm(send, checkValid);
-                if (algorithm.getCode() != 200) return algorithm;
+                if (algorithm.getCode() != 200) {
+                    return algorithm;
+                }
                 DataPostAnalysisRespDto data = send.getData();
 
                 Map<String, Object> result = (Map<String, Object>) data.getAnalysisDatas().get(0).getResult();
@@ -147,7 +161,7 @@ public class CheckService {
                         //如果没有通过则次数加一
                         //键为前缀+签到id +下划线+验证类型
                         String key = Constants.SINGIN_CHECK_JUMP_KEY + id + "_" + code;
-                        Long increment = redisService.redisTemplate.opsForValue().increment(key);
+                        Long increment = redisTemplate.opsForValue().increment(key);
                         redisService.expire(key, Constants.SINGIN_OUT_TIME);
                         if (increment != null && increment >= Integer.parseInt(labCheckCount)) {
                             //黎晨这里让把跳过时状态码改为700，所以700的含义为检查失败并且跳过
@@ -215,7 +229,7 @@ public class CheckService {
                 //如果没有通过则次数加一
                 //键为前缀+签到id +下划线+验证类型
                 String key = Constants.SINGIN_CHECK_JUMP_KEY + id + "_" + code;
-                Long increment = redisService.redisTemplate.opsForValue().increment(key);
+                Long increment = redisTemplate.opsForValue().increment(key);
                 redisService.expire(key, Constants.SINGIN_OUT_TIME);
                 if (increment >= algorithmYml.getJumpThreshold()) {
                     //黎晨这里让把跳过时状态码改为700，所以700的含义为检查失败并且跳过
@@ -389,7 +403,7 @@ public class CheckService {
         Map<String, Boolean> map = new HashMap(1);
         //键为前缀+签到id +下划线+验证类型
         String key = Constants.SINGIN_CHECK_JUMP_KEY + id + "_" + code;
-        Long increment = redisService.redisTemplate.opsForValue().increment(key);
+        Long increment = redisTemplate.opsForValue().increment(key);
         redisService.expire(key, Constants.SINGIN_OUT_TIME);
         Boolean isJump = increment >= algorithmYml.getJumpThreshold();
         map.put("jump", isJump);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/ImageCheckResultValidImpl.java

@@ -1,6 +1,7 @@
 package com.zd.alg.forward.serivce;
 
-import com.zd.common.core.domain.R;
+
+import com.zd.model.domain.R;
 
 import java.util.Map;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/ImageService.java

@@ -2,8 +2,10 @@ package com.zd.alg.forward.serivce;
 
 
 import com.zd.alg.forward.utils.VideoUtils;
+import com.zd.base.api.feign.RemoteFileService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.model.constant.HttpStatus;
+import com.zd.model.domain.R;
 import com.zd.model.entity.SysFile;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/LoginService.java

@@ -1,10 +1,10 @@
 package com.zd.alg.forward.serivce;
 
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.security.service.TokenService;
 import com.zd.alg.forward.config.AlgorithmYml;
+import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/PeopleCheckResultValidImpl.java

@@ -1,7 +1,7 @@
 package com.zd.alg.forward.serivce;
 
-import com.zd.common.core.domain.R;
 import com.zd.alg.forward.config.AlgorithmYml;
+import com.zd.model.domain.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/SendSginAccessLogService.java

@@ -1,11 +1,17 @@
 package com.zd.alg.forward.serivce;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zd.alg.forward.properties.FireProperties;
-import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.domain.VideoRequestData;
+import com.zd.alg.forward.properties.FireProperties;
+import com.zd.algorithm.api.speaker.entity.PlayVo;
+import com.zd.algorithm.api.speaker.feign.RemoteSpeakService;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
+import com.zd.model.entity.Algorithm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +30,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import static com.zd.common.core.constant.Constants.MAP_INIT_SIZE;
+import static com.zd.model.constant.BaseConstants.MAP_INIT_SIZE;
+
 
 @Service
 public class SendSginAccessLogService {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/ShiYanFuCheckResultValidImpl.java

@@ -1,6 +1,7 @@
 package com.zd.alg.forward.serivce;
 
-import com.zd.common.core.domain.R;
+
+import com.zd.model.domain.R;
 
 import java.util.Map;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/event/offline/OfflineEventListener.java

@@ -1,18 +1,17 @@
 package com.zd.alg.iot.vmp.gb28181.event.offline;
 
+import com.zd.alg.iot.vmp.common.VideoManagerConstants;
 import com.zd.alg.iot.vmp.gb28181.transmit.request.impl.RegisterRequestProcessor;
 import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.alg.iot.vmp.common.VideoManagerConstants;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.alg.iot.vmp.utils.redis.RedisUtil;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.enums.HardwareOperate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
-import com.zd.alg.iot.vmp.utils.redis.RedisUtil;
-
 /**
  * @Description: 离线事件监听器，监听到离线后，修改设备离在线状态。 设备离线有两个来源：
  *               1、设备主动注销，发送注销指令，{@link RegisterRequestProcessor}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/event/online/OnlineEventListener.java

@@ -1,14 +1,14 @@
 package com.zd.alg.iot.vmp.gb28181.event.online;
 
+import com.zd.alg.iot.vmp.common.VideoManagerConstants;
 import com.zd.alg.iot.vmp.conf.SipConfig;
+import com.zd.alg.iot.vmp.gb28181.bean.Device;
 import com.zd.alg.iot.vmp.gb28181.transmit.request.impl.MessageRequestProcessor;
 import com.zd.alg.iot.vmp.gb28181.transmit.request.impl.RegisterRequestProcessor;
 import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.alg.iot.vmp.gb28181.bean.Device;
-import com.zd.alg.iot.vmp.common.VideoManagerConstants;
 import com.zd.alg.iot.vmp.utils.redis.RedisUtil;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.enums.HardwareOperate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/onvif/ONVIFController.java

@@ -2,18 +2,18 @@ package com.zd.alg.iot.vmp.vmanager.onvif;
 
 import be.teletask.onvif.models.OnvifDevice;
 import com.alibaba.fastjson.JSONObject;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
-import com.zd.model.constant.HttpStatus;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.RequestMessage;
 import com.zd.alg.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.zd.alg.iot.vmp.onvif.IONVIFServer;
 import com.zd.alg.iot.vmp.service.IMediaServerService;
+import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.constant.HttpStatus;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/base/FridConsumer.java

@@ -23,7 +23,7 @@ public class FridConsumer implements Consumer<InventoryTag> {
     public void accept(InventoryTag tag) {
         try {
             tag.setEpc(tag.getEpc().replace(" ", ""));
-            com.zd.system.api.domain.InventoryTag  inventoryTag = new com.zd.system.api.domain.InventoryTag ();
+            com.zd.model.entity.InventoryTag  inventoryTag = new com.zd.model.entity.InventoryTag ();
             BeanUtils.copyProperties(tag,inventoryTag);
             sendService.send(inventoryTag);
         } catch (BeansException e) {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/controller/FridDeviceController.java

@@ -2,8 +2,8 @@ package com.zd.alg.netty.controller;
 
 import com.zd.alg.netty.constant.RfidConstants;
 import com.zd.alg.netty.service.IFridService;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.model.domain.R;
+import com.zd.model.entity.RemoteLabHardware;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/handler/SocketHandler.java

@@ -1,14 +1,14 @@
 package com.zd.alg.netty.handler;
 
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.Channel;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.ChannelHandlerContext;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.ChannelInboundHandlerAdapter;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.group.ChannelGroup;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.group.DefaultChannelGroup;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor;
+import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.redis.service.RedisService;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.group.ChannelGroup;
-import io.netty.channel.group.DefaultChannelGroup;
-import io.netty.util.concurrent.GlobalEventExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/init/NettyStartListener.java

@@ -1,10 +1,10 @@
 package com.zd.alg.netty.init;
 
-import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.domain.R;
 import com.zd.alg.netty.service.IFridService;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.domain.R;
+import com.zd.model.entity.RemoteLabHardware;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/init/SocketInitializer.java

@@ -1,12 +1,12 @@
 package com.zd.alg.netty.init;
 
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.ChannelInitializer;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.ChannelPipeline;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.socket.SocketChannel;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.handler.codec.FixedLengthFrameDecoder;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.handler.codec.bytes.ByteArrayDecoder;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.handler.codec.bytes.ByteArrayEncoder;
 import com.zd.alg.netty.handler.SocketHandler;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.FixedLengthFrameDecoder;
-import io.netty.handler.codec.bytes.ByteArrayDecoder;
-import io.netty.handler.codec.bytes.ByteArrayEncoder;
 import org.springframework.stereotype.Component;
 
 /**

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/init/SocketServer.java

@@ -1,8 +1,8 @@
 package com.zd.alg.netty.init;
 
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.bootstrap.ServerBootstrap;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.nio.NioEventLoopGroup;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.socket.nio.NioServerSocketChannel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/sdk/DeJuRFIDClientImpl.java

@@ -5,12 +5,12 @@ import com.gg.reader.api.dal.GServer;
 import com.gg.reader.api.protocol.gx.MsgBaseInventoryEpc;
 import com.gg.reader.api.protocol.gx.MsgBaseSetBaseband;
 import com.gg.reader.api.protocol.gx.MsgBaseSetPower;
-import com.zd.common.core.enums.HardwareOperate;
+import com.zd.alg.netty.service.IService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SpringUtils;
-import com.zd.alg.netty.service.IService;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.entity.RemoteLabHardware;
+import com.zd.model.enums.HardwareOperate;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -36,7 +36,7 @@ public class DeJuRFIDClientImpl implements IService {
     private DeJuRFIDServerImpl service;
 
     @Resource
-    private RedisTemplate<String,RemoteLabHardware> redisTemplate;
+    private RedisTemplate<String, RemoteLabHardware> redisTemplate;
 
     private static final ScheduledExecutorService scheduledExecutorService = SpringUtils.getBean("scheduledExecutorService");
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/sdk/DeJuRFIDServerImpl.java

@@ -2,14 +2,14 @@ package com.zd.alg.netty.sdk;
 
 import com.gg.reader.api.dal.GClient;
 import com.gg.reader.api.protocol.gx.*;
+import com.zd.alg.netty.service.ISendService;
 import com.zd.alg.netty.service.IService;
-import com.zd.common.core.enums.HardwareOperate;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SpringUtils;
-import com.zd.alg.netty.service.ISendService;
-import com.zd.system.api.domain.InventoryTag;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.entity.InventoryTag;
+import com.zd.model.entity.RemoteLabHardware;
+import com.zd.model.enums.HardwareOperate;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.RedisTemplate;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/sdk/WuYuanRFIDServiceImpl.java

@@ -11,12 +11,12 @@ import com.payne.reader.bean.receive.Success;
 import com.payne.reader.bean.send.*;
 import com.payne.reader.process.ReaderImpl;
 import com.zd.alg.netty.base.FridConsumer;
+import com.zd.alg.netty.service.ISendService;
 import com.zd.alg.netty.service.IService;
-import com.zd.common.core.enums.HardwareOperate;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.alg.netty.service.ISendService;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.entity.RemoteLabHardware;
+import com.zd.model.enums.HardwareOperate;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/IFridService.java

@@ -1,6 +1,7 @@
 package com.zd.alg.netty.service;
 
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+
+import com.zd.model.entity.RemoteLabHardware;
 
 /**
  * @author Administrator

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/ISendService.java

@@ -1,6 +1,7 @@
 package com.zd.alg.netty.service;
 
-import com.zd.system.api.domain.InventoryTag;
+
+import com.zd.model.entity.InventoryTag;
 
 /**
  * @author Administrator

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/IService.java

@@ -1,6 +1,7 @@
 package com.zd.alg.netty.service;
 
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+
+import com.zd.model.entity.RemoteLabHardware;
 
 /**
  * RFID接口类

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/impl/FridServiceImpl.java

@@ -1,10 +1,10 @@
 package com.zd.alg.netty.service.impl;
 
-import com.zd.common.core.utils.SpringUtils;
 import com.zd.alg.netty.enums.ManufacturerTypeEnum;
 import com.zd.alg.netty.service.IFridService;
 import com.zd.alg.netty.service.IService;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.common.core.utils.SpringUtils;
+import com.zd.model.entity.RemoteLabHardware;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
@@ -12,7 +12,8 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.zd.common.core.constant.Constants.MAP_INIT_SIZE;
+import static com.zd.model.constant.BaseConstants.MAP_INIT_SIZE;
+
 
 /**
  * @author Administrator

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/impl/SendServiceImpl.java

@@ -1,13 +1,13 @@
 package com.zd.alg.netty.service.impl;
 
+import com.zd.airbottle.api.feign.RemoteAirBottleService;
+import com.zd.alg.netty.service.ISendService;
 import com.zd.bottle.feign.service.RemoteBottleService;
+import com.zd.chemical.api.fegin.RemoteStockService;
 import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.domain.R;
-import com.zd.alg.netty.service.ISendService;
-import com.zd.system.api.airbottle.RemoteAirBottleService;
-import com.zd.system.api.chemical.RemoteStockService;
-import com.zd.system.api.domain.InventoryTag;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.model.domain.R;
+import com.zd.model.entity.InventoryTag;
+import com.zd.model.entity.RemoteLabHardware;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -33,7 +33,7 @@ public class SendServiceImpl implements ISendService {
     private RemoteBottleService remoteBottleService;
 
     @Resource
-    private RedisTemplate<String,RemoteLabHardware> redisTemplate;
+    private RedisTemplate<String, RemoteLabHardware> redisTemplate;
 
     @Override
     public boolean send(InventoryTag tag) {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlApplyApprovalController.java

@@ -2,13 +2,13 @@ package com.zd.alg.smartlock.controller;
 
 import com.zd.alg.smartlock.service.ISlApplyApprovalService;
 import com.zd.algorithm.api.smartlock.entity.SlApplyApproval;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.ResultData;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlOpendoorApplyController.java

@@ -5,18 +5,18 @@ import com.zd.alg.smartlock.service.ISlOpendoorApplyService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
 import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
 import com.zd.algorithm.api.smartlock.entity.vo.SlOpendoorApplyVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlSubjectRelationController.java

@@ -7,17 +7,18 @@ import com.zd.algorithm.api.smartlock.entity.SlSubjectRelation;
 import com.zd.algorithm.api.smartlock.entity.api.SlLockOnline;
 import com.zd.algorithm.api.smartlock.entity.api.SlRoom;
 import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.ResultData;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlUserRelationController.java

@@ -2,28 +2,23 @@ package com.zd.alg.smartlock.controller;
 
 
 import com.zd.alg.smartlock.service.ISlSubjectRelationService;
-import com.zd.alg.smartlock.service.ISlUserRelationService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
 import com.zd.algorithm.api.smartlock.entity.api.SlLockOnline;
 import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.feign.RemoteUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SmartlockController.java

@@ -5,13 +5,13 @@ import com.zd.alg.smartlock.service.ISlSubjectRelationService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
 import com.zd.algorithm.api.smartlock.entity.api.SlLockOnline;
 import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.R;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.feign.RemoteUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlApplyApprovalServiceImpl.java

@@ -9,16 +9,17 @@ import com.zd.algorithm.api.smartlock.entity.SlApplyApproval;
 import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
 import com.zd.algorithm.api.smartlock.entity.api.SlUser;
 import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
-import com.zd.common.core.domain.R;
+import com.zd.chemical.api.fegin.RemoteStockService;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.chemical.RemoteStockService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.common.core.security.TokenService;
+import com.zd.model.domain.R;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.feign.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.*;
 
 /**

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlOpendoorApplyServiceImpl.java

@@ -9,15 +9,15 @@ import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
 import com.zd.algorithm.api.smartlock.entity.api.SlUser;
 import com.zd.algorithm.api.smartlock.entity.vo.SlOpendoorApplyVo;
 import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.chemical.api.fegin.RemoteStockService;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.SysUser;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.chemical.RemoteStockService;
+import com.zd.system.api.feign.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlSubjectRelationServiceImpl.java

@@ -6,13 +6,14 @@ import com.zd.alg.smartlock.service.ISlSubjectRelationService;
 import com.zd.algorithm.api.smartlock.entity.SlSubjectRelation;
 import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/controller/SpeakerController.java

@@ -2,19 +2,20 @@ package com.zd.alg.speaker.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.zd.algorithm.api.speaker.entity.vo.PlayVo;
-import com.zd.common.core.domain.R;
+import com.zd.alg.speaker.service.ISpeakerService;
+import com.zd.algorithm.api.speaker.entity.PlayVo;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.alg.speaker.service.ISpeakerService;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.*;
 
 /**

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/service/ISpeakerService.java

@@ -1,6 +1,7 @@
 package com.zd.alg.speaker.service;
 
-import com.zd.algorithm.api.speaker.entity.vo.PlayVo;
+
+import com.zd.algorithm.api.speaker.entity.PlayVo;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/service/impl/SpeakerServiceImpl.java

@@ -1,14 +1,14 @@
 package com.zd.alg.speaker.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zd.algorithm.api.speaker.entity.RemoteAddress;
-import com.zd.algorithm.api.speaker.entity.vo.PlayBatchVo;
-import com.zd.algorithm.api.speaker.entity.vo.PlayVo;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.redis.service.RedisService;
-import com.zd.model.entity.UrlVo;
+import com.zd.alg.speaker.domain.RemoteAddress;
 import com.zd.alg.speaker.service.ISpeakerService;
 import com.zd.alg.speaker.utils.OkHttpRequest;
+import com.zd.algorithm.api.speaker.entity.PlayBatchVo;
+import com.zd.algorithm.api.speaker.entity.PlayVo;
+import com.zd.common.core.redis.RedisService;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.model.entity.UrlVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/utils/OkHttpRequest.java

@@ -1,11 +1,12 @@
 package com.zd.alg.speaker.utils;
 
 import okhttp3.*;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.util.Map;
 
 @Component

zd-modules/zd-base/src/main/java/com/zd/base/message/base/FridConsumer.java

@@ -1,9 +1,9 @@
 package com.zd.base.message.base;
 
 import com.payne.reader.base.Consumer;
-import com.payne.reader.bean.receive.InventoryTag;
 import com.zd.base.message.service.ISendService;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.model.entity.InventoryTag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/feign/RemoteBottleFallbackFactory.java

@@ -1,8 +1,7 @@
 package com.zd.bottle.feign;
 
 import com.zd.bottle.feign.service.RemoteBottleService;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.airbottle.RemoteAirBottleService;
+import com.zd.model.domain.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/feign/service/RemoteBottleService.java

@@ -1,9 +1,9 @@
 package com.zd.bottle.feign.service;
 
 import com.zd.bottle.feign.RemoteBottleFallbackFactory;
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.InventoryTag;
+import com.zd.model.constant.ApplicationConstants;
+import com.zd.model.domain.R;
+import com.zd.model.entity.InventoryTag;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 /**
  * @author Administrator
  */
-@FeignClient(contextId = "remoteBottleService", value = ServiceNameConstants.BOTTLE_SERVICE, fallbackFactory = RemoteBottleFallbackFactory.class)
+@FeignClient(contextId = "remoteBottleService", value = ApplicationConstants.BOTTLE_SERVICE, fallbackFactory = RemoteBottleFallbackFactory.class)
 public interface RemoteBottleService {
 
     /**

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/AlarmRecordVo.java

@@ -1,7 +1,7 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageErrorVo.java

@@ -1,7 +1,7 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageOutVo.java

@@ -1,14 +1,12 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zd.bottle.domain.BottleStorageOut;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Author: liujh

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageVo.java

@@ -2,14 +2,10 @@ package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.bottle.domain.BottleStorage;
-import com.zd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author Administrator

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UseRecordVo.java

@@ -1,7 +1,7 @@
 package com.zd.bottle.vo;
 
 import com.zd.bottle.domain.BottleStorage;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UsegasApplyVo.java

@@ -2,7 +2,6 @@ package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.bottle.domain.UsegasApply;
-import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/ZdBottleApplication.java

@@ -1,9 +1,8 @@
 package com.zd.bottle;
 
-import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
-import com.zd.common.core.constant.Constants;
-import com.zd.common.security.annotation.EnableCustomConfig;
-import com.zd.common.security.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableCustomConfig;
+import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.model.constant.Constants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -19,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableRyFeignClients
 @SpringBootApplication(scanBasePackages = Constants.BASE_PACKAGE)
 @EnableScheduling
-@NacosPropertySource(dataId = "zd-bottle", autoRefreshed = true)
+//@NacosPropertySource(dataId = "zd-bottle", autoRefreshed = true)
 @Slf4j
 public class ZdBottleApplication {
     public static void main(String[] args) {

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/RfidTagController.java

@@ -3,21 +3,21 @@ package com.zd.bottle.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zd.bottle.domain.RfidTag;
-import com.zd.bottle.domain.UseRecord;
 import com.zd.bottle.service.RfidTagService;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.core.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageOutServiceImpl.java

@@ -12,6 +12,7 @@ import com.zd.bottle.service.RfidTagService;
 import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.BottleStorageOutVo;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -18,6 +18,7 @@ import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UseRecordVo;
 import com.zd.bottle.vo.WebUseRecordVo;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.TransferUtils;
 import com.zd.model.constant.HttpStatus;