新气瓶项目 依赖管理

zd-api/zd-airbottle-api/src/main/java/com/zd/airbottle/api/feign/RemoteAirBottleService.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.api.feign;
 
-import com.zd.airbottle.api.feign.entity.InventoryTag;
+import com.zd.model.entity.InventoryTag;
 import com.zd.airbottle.api.feign.fallback.RemoteAirBottleFallbackFactory;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.R;

zd-api/zd-airbottle-api/src/main/java/com/zd/airbottle/api/feign/entity/InventoryTag.java

@@ -1,40 +0,0 @@
-package com.zd.airbottle.api.feign.entity;
-
-import com.zd.model.entity.RemoteLabHardware;
-import lombok.Data;
-import lombok.ToString;
-
-/**
- *
- * @author Administrator
- */
-@Data
-@ToString
-public class InventoryTag {
-
-    private String pc;
-    /**
-     * 标签码
-     */
-    private String epc;
-    /**
-     * 设备索引，从0开始
-     */
-    private int antId;
-    private int rssi;
-    /**
-     * 相位值
-     */
-    private int phase;
-    /**
-     * 频点
-     */
-    private String freq;
-
-    /**
-     * 设备码
-     */
-    private String serialNumber;
-
-    private RemoteLabHardware remoteLabHardware;
-}

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/entity/RemoteAddress.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 @Component
 @RefreshScope
 public class RemoteAddress {
-    @Value("${remote.ip_addr}")
+    @Value("${remote.import com.zd.common.core.annotation.Log;}")
     private String remoteIp;
     @Value("${remote.port}")
     private String remotePort;

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/vo/InventoryTag.java

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

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/AlarmRecordController.java

@@ -12,7 +12,6 @@ import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.TransferUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.laboratory.api.vo.InventoryTag;
 import com.zd.model.domain.R;
 import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IAlarmRecordService.java

@@ -3,7 +3,6 @@ package com.zd.airbottle.service;
 import com.zd.airbottle.domain.AlarmRecord;
 import com.zd.airbottle.domain.vo.AlarmRecordVo;
 import com.zd.airbottle.domain.vo.BottleStorageInfoVo;
-import com.zd.laboratory.api.vo.InventoryTag;
 import com.zd.model.entity.RemoteLabHardware;
 
 import java.util.List;

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

@@ -20,7 +20,6 @@ import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.api.entity.LabSubject;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.laboratory.api.feign.RemoteSubQueryService;
-import com.zd.laboratory.api.vo.InventoryTag;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.R;

zd-modules/zd-base/src/main/java/com/zd/base/message/service/ISendService.java

@@ -1,8 +1,6 @@
 package com.zd.base.message.service;
 
 
-import com.zd.laboratory.api.vo.InventoryTag;
-
 public interface ISendService {
 
     /**

zd-modules/zd-base/src/main/java/com/zd/base/message/service/impl/SendServiceImpl.java

@@ -2,7 +2,6 @@ package com.zd.base.message.service.impl;
 
 
 import com.zd.base.message.service.ISendService;
-import com.zd.laboratory.api.vo.InventoryTag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

zd-modules/zd-bottle-parent/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>zd-modules</artifactId>
         <groupId>com.zd</groupId>
+        <artifactId>zd-modules</artifactId>
         <version>3.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -16,4 +16,16 @@
         <module>zd-bottle</module>
         <module>zd-bottle-api</module>
     </modules>
-</project>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.swagger</groupId>
+            <artifactId>common-swagger</artifactId>
+        </dependency>
+    </dependencies>
+</project>

zd-modules/zd-bottle-parent/zd-bottle-api/pom.xml

@@ -11,29 +11,4 @@
     <artifactId>zd-bottle-api</artifactId>
     <packaging>jar</packaging>
 
-    <dependencies>
-        <!-- zd Common DataSource -->
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-datasource</artifactId>
-        </dependency>
-
-        <!-- zd Common DataScope -->
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-datascope</artifactId>
-        </dependency>
-
-        <!-- zd Common Log -->
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-log</artifactId>
-        </dependency>
-
-        <!-- zd Common Swagger -->
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-swagger</artifactId>
-        </dependency>
-    </dependencies>
-</project>
+</project>

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/AlarmRecord.java

@@ -1,7 +1,7 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
@@ -26,7 +26,7 @@ import java.util.Date;
 @ApiModel(value = "AlarmRecord对象", description = "报警记录表")
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class AlarmRecord extends BaseBean{
+public class AlarmRecord extends BaseBean {
 
     @ApiModelProperty("数据主键，关联其他业务表中的数据id")
     private Long masterId;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorage.java

@@ -2,8 +2,8 @@ package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.annotation.Excel;
+import com.zd.model.domain.BaseBean;
 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/domain/BottleStorageError.java

@@ -1,7 +1,7 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorageOut.java

@@ -1,8 +1,8 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.annotation.Excel;
+import com.zd.model.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
@@ -27,7 +27,7 @@ import java.math.BigDecimal;
 @ApiModel(value = "BottleStorageOut对象", description = "气瓶出库表")
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class BottleStorageOut extends BaseBean{
+public class BottleStorageOut extends BaseBean {
 
     @Excel(name = "操作人")
     @ApiModelProperty("操作人")

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/RfidTag.java

@@ -1,8 +1,8 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.annotation.Excel;
+import com.zd.model.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UseRecord.java

@@ -1,7 +1,7 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.domain.BaseBean;
 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/domain/UsegasApply.java

@@ -2,7 +2,7 @@ package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
@@ -10,7 +10,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UsegasAuditRecord.java

@@ -1,7 +1,7 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.zd.common.core.web.domain.BaseBean;
+import com.zd.model.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

zd-modules/zd-bottle-parent/zd-bottle/pom.xml

@@ -27,11 +27,11 @@
 
         <!-- SpringCloud Alibaba Nacos Config -->
 
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-spring-context</artifactId>
             <version>0.2.3-RC1</version>
-        </dependency>
+        </dependency>-->
 
         <!-- SpringCloud Alibaba Sentinel -->
         <dependency>
@@ -46,11 +46,11 @@
         </dependency>
 
         <!-- Swagger UI -->
-        <dependency>
+        <!--<dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${swagger.fox.version}</version>
-        </dependency>
+        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>
@@ -78,6 +78,22 @@
             <artifactId>zd-bottle-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.zd.algorithm</groupId>
+            <artifactId>zd-algorithm-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.laboratory</groupId>
+            <artifactId>zd-laboratory-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zd.chemical</groupId>
+            <artifactId>zd-chemical-api</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -94,61 +110,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 打包时跳过test插件，不运行test测试用例 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-
-            <!-- docker的maven插件 -->
-            <!--            <plugin>-->
-            <!--                <groupId>io.fabric8</groupId>-->
-            <!--                <artifactId>docker-maven-plugin</artifactId>-->
-            <!--                <version>${docker.maven.verion}</version>-->
-            <!--                <executions>-->
-            <!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
-            <!--                    <execution>-->
-            <!--                        <id>default</id>-->
-            <!--                        <phase>package</phase>-->
-            <!--                        <goals>-->
-            <!--                            <goal>remove</goal>-->
-            <!--                            <goal>build</goal>-->
-            <!--                            <goal>push</goal>-->
-            <!--                        </goals>-->
-            <!--                    </execution>-->
-            <!--                </executions>-->
-            <!--                <configuration>-->
-            <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
-            <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-            <!--                    <authConfig>-->
-            <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
-            <!--                        <username>${docker.registry.username}</username>-->
-            <!--                        <password>${docker.registry.password}</password>-->
-            <!--                    </authConfig>-->
-            <!--                    <images>-->
-            <!--                        <image>-->
-            <!--                            &lt;!&ndash; [命名空间] / [镜像名称：版本号] &ndash;&gt;-->
-            <!--                            <name>${docker.registry}/${docker.namespace}/${project.artifactId}</name>-->
-            <!--                            &lt;!&ndash; 仓库地址 &ndash;&gt;-->
-            <!--                            <registry>${docker.registry}</registry>-->
-            <!--                            <build>-->
-            <!--                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>-->
-            <!--                                <tags>-->
-            <!--                                    <tag>${project.version}</tag>-->
-            <!--                                </tags>-->
-            <!--                            </build>-->
-            <!--                        </image>-->
-            <!--                    </images>-->
-            <!--                    <buildArgs>-->
-            <!--                        &lt;!&ndash; dockerfile参数，指定jar路径 &ndash;&gt;-->
-            <!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
-            <!--                    </buildArgs>-->
-            <!--                </configuration>-->
-            <!--            </plugin>-->
         </plugins>
     </build>
-</project>
+</project>

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

@@ -3,17 +3,17 @@ package com.zd.bottle.controller;
 import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.service.AlarmRecordService;
 import com.zd.bottle.vo.AlarmRecordVo;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.bean.TransferUtils;
-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.utils.TransferUtils;
 import com.zd.common.core.web.controller.BaseController;
-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.domain.InventoryTag;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.InventoryTag;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;

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

@@ -7,20 +7,21 @@ import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.BottleStorageUseVo;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.bottle.vo.UseRecordVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+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.SecurityUtils;
 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.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.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 java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -3,20 +3,21 @@ package com.zd.bottle.controller;
 import com.zd.bottle.domain.BottleStorageError;
 import com.zd.bottle.service.BottleStorageErrorService;
 import com.zd.bottle.vo.BottleStorageErrorVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.bean.TransferUtils;
-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.utils.TransferUtils;
 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.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 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/controller/BottleStorageOutController.java

@@ -3,18 +3,19 @@ package com.zd.bottle.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zd.bottle.domain.BottleStorageOut;
 import com.zd.bottle.service.BottleStorageOutService;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-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.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.web.controller.BaseController;
+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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.core.web.controller.BaseController;
+
 import java.util.List;
 
 /**

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

@@ -5,16 +5,16 @@ 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.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 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.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.common.core.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

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

@@ -6,22 +6,20 @@ import com.zd.bottle.service.BottleStorageOutService;
 import com.zd.bottle.service.BottleStorageService;
 import com.zd.bottle.vo.BottleStorageOutVo;
 import com.zd.bottle.vo.BottleStorageVo;
-import com.zd.bottle.vo.UseRecordVo;
-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.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-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.AjaxResult;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+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.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;

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

@@ -7,17 +7,17 @@ import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UseRecordVo;
 import com.zd.bottle.vo.WebUseRecordVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+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.DateUtils;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.SecurityUtils;
-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.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;

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

@@ -8,23 +8,24 @@ import com.zd.bottle.service.UsegasAuditRecordService;
 import com.zd.bottle.vo.UsegasApplyDetailVo;
 import com.zd.bottle.vo.UsegasApplyTabVo;
 import com.zd.bottle.vo.UsegasApplyVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.SecurityUtils;
 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.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
-import com.zd.system.api.domain.SysUser;
+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.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
 import java.util.List;
 

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

@@ -2,16 +2,17 @@ package com.zd.bottle.controller;
 
 import com.zd.bottle.domain.UsegasAuditRecord;
 import com.zd.bottle.service.UsegasAuditRecordService;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.web.controller.BaseController;
+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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.core.web.controller.BaseController;
+
 import java.util.List;
 
 /**

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

@@ -1,11 +1,9 @@
 package com.zd.bottle.service;
 
-import com.zd.bottle.domain.AlarmRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zd.bottle.domain.BottleStorage;
+import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.vo.AlarmRecordVo;
-import com.zd.bottle.vo.BottleStorageVo;
-import com.zd.system.api.domain.InventoryTag;
+import com.zd.model.entity.InventoryTag;
 
 import java.util.List;
 

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

@@ -1,9 +1,15 @@
 package com.zd.bottle.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.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.algorithm.api.forward.feign.RemoteForwardService;
+import com.zd.algorithm.api.netty.feign.RemoteNettyService;
 import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.RfidTag;
@@ -11,31 +17,24 @@ import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.mapper.AlarmRecordMapper;
 import com.zd.bottle.properties.AlarmProperties;
 import com.zd.bottle.service.AlarmRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.service.BottleStorageService;
 import com.zd.bottle.service.RfidTagService;
 import com.zd.bottle.service.UsegasApplyService;
 import com.zd.bottle.vo.AlarmRecordVo;
-import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.domain.R;
+import com.zd.chemical.api.fegin.RemoteStockService;
+import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.redis.service.RedisService;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.alarm.RemoteAlarmService;
-import com.zd.system.api.alarm.domain.AlarmEntrty;
-import com.zd.system.api.alarm.domain.Routes;
-import com.zd.system.api.alarm.domain.SendTypes;
-import com.zd.system.api.chemical.RemoteStockService;
-import com.zd.system.api.domain.InventoryTag;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.forward.RemoteForwardService;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.RemoteMessageContentService;
-import com.zd.system.api.laboratory.RemoteSubQueryService;
-import com.zd.system.api.laboratory.domain.LabSubject;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
-import com.zd.system.api.netty.RemoteNettyService;
+import com.zd.laboratory.api.entity.LabSubjectEntity;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteMessageContentService;
+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.SysFile;
+import com.zd.system.api.feign.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.jetbrains.annotations.Nullable;
@@ -197,12 +196,12 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
 
     private void sendAlarm(BottleStorage storage) {
         Long subjectId = storage.getSubjectId();
-        R<List<LabSubject>> resultList = remoteSubQueryService.listByIds(Collections.singletonList(subjectId));
+        R<List<LabSubjectEntity>> resultList = remoteSubQueryService.listByIds(Collections.singletonList(subjectId));
         log.info("==========>查询实验室：状态码：{},结果：{}", resultList.getCode(), resultList.getData());
         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();
@@ -239,7 +238,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         }
     }
 
-    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();

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

@@ -2,17 +2,17 @@ package com.zd.bottle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.BottleStorageError;
 import com.zd.bottle.domain.UseRecord;
 import com.zd.bottle.mapper.BottleStorageErrorMapper;
 import com.zd.bottle.service.BottleStorageErrorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.service.BottleStorageService;
 import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.BottleStorageErrorVo;
 import com.zd.bottle.vo.UseRecordVo;
-import com.zd.common.core.utils.bean.TransferUtils;
+import com.zd.common.core.utils.TransferUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

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

@@ -13,8 +13,7 @@ import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.BottleStorageOutVo;
 import com.zd.common.core.exception.ServiceException;
 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;

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

@@ -11,8 +11,8 @@ import com.zd.bottle.service.RfidTagService;
 import com.zd.bottle.vo.BottleStorageUseVo;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.common.core.security.TokenService;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -8,9 +8,9 @@ import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.mapper.RfidTagMapper;
 import com.zd.bottle.service.RfidTagService;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.model.LoginUser;
+import com.zd.common.core.security.TokenService;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.entity.SysUser;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 

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

@@ -17,16 +17,15 @@ import com.zd.bottle.service.UsegasApplyService;
 import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UseRecordVo;
 import com.zd.bottle.vo.WebUseRecordVo;
-import com.zd.model.constant.HttpStatus;
-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.core.utils.SecurityUtils;
-import com.zd.common.core.utils.bean.TransferUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.model.LoginUser;
+import com.zd.common.core.utils.TransferUtils;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.R;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.feign.RemoteUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

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

@@ -1,17 +1,12 @@
 package com.zd.bottle.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.zd.bottle.domain.UsegasApply;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.domain.UsegasAuditRecord;
 import com.zd.bottle.mapper.UsegasAuditRecordMapper;
 import com.zd.bottle.service.UsegasAuditRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zd.common.security.service.TokenService;
-import jdk.nashorn.internal.parser.Token;
+import com.zd.common.core.security.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpStockController.java

@@ -14,11 +14,11 @@ import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.laboratory.api.vo.InventoryTag;
 import com.zd.model.domain.R;
 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.InventoryTag;
 import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/IHxpStockService.java

@@ -5,7 +5,7 @@ import com.zd.chemical.domain.vo.HxpStockDetailVO;
 import com.zd.chemical.domain.vo.HxpStockJoinVO;
 import com.zd.chemical.domain.vo.HxpStockOutVO;
 import com.zd.chemical.domain.vo.HxpStockSearch;
-import com.zd.laboratory.api.vo.InventoryTag;
+import com.zd.model.entity.InventoryTag;
 
 import java.util.List;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -7,7 +7,6 @@ import com.zd.algorithm.api.alarm.entity.Routes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.algorithm.api.forward.feign.RemoteForwardService;
 import com.zd.algorithm.api.netty.feign.RemoteNettyService;
-import com.zd.model.entity.SysFile;
 import com.zd.chemical.controller.HxpAIOController;
 import com.zd.chemical.domain.*;
 import com.zd.chemical.domain.vo.*;
@@ -26,11 +25,12 @@ import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.laboratory.api.feign.RemoteMessageContentService;
-import com.zd.laboratory.api.vo.InventoryTag;
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.R;
 import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.InventoryTag;
 import com.zd.model.entity.RemoteLabHardware;
+import com.zd.model.entity.SysFile;
 import com.zd.system.api.entity.SysDictData;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;