Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -103,13 +103,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!--  SpringBoot 监控客户端 -->
-            <!--<dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>-->
-
             <!-- FastDFS 分布式文件系统 -->
             <dependency>
                 <groupId>com.github.tobato</groupId>
@@ -274,13 +267,10 @@
                 <version>${zd.version}</version>
             </dependency>
             <dependency>
-
                 <groupId>org.springframework.boot</groupId>
-
                 <artifactId>spring-boot-starter-test</artifactId>
                 <version>${spring-boot.version}</version>
                 <scope>test</scope>
-
             </dependency>
 
             <dependency>
@@ -288,11 +278,13 @@
                 <artifactId>hutool-all</artifactId>
                 <version>${hutools.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
                 <version>${knife4j.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-ui</artifactId>
@@ -367,7 +359,11 @@
                 <artifactId>zd-algorithm-api</artifactId>
                 <version>${zd.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.zd.airbottle</groupId>
+                <artifactId>zd-airbottle-api</artifactId>
+                <version>${zd.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

zd-api/pom.xml

@@ -19,6 +19,7 @@
         <module>zd-exam-api</module>
         <module>zd-chemical-api</module>
         <module>zd-algorithm-api</module>
+        <module>zd-airbottle-api</module>
     </modules>
 
     <dependencies>

zd-api/zd-airbottle-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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-api</artifactId>
+        <groupId>com.zd</groupId>
+        <version>3.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.zd.airbottle</groupId>
+    <artifactId>zd-airbottle-api</artifactId>
+    <packaging>jar</packaging>
+    <description>airbottle-api</description>
+
+
+</project>

zd-api/zd-airbottle-api/src/main/java/com/zd/Main.java

@@ -0,0 +1,12 @@
+package com.zd;
+
+/**
+ * @创建人 hzw
+ * @描述
+ * @创建时间 ${DATE}
+ */
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.zd.airbottle.api.feign;
+
+import com.zd.airbottle.api.feign.entity.InventoryTag;
+import com.zd.airbottle.api.feign.fallback.RemoteAirBottleFallbackFactory;
+import com.zd.model.constant.ApplicationConstants;
+import com.zd.model.domain.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author Administrator
+ */
+@FeignClient(contextId = "remoteAirBottleService", value = ApplicationConstants.AIR_BOTTLE_SERVICE, fallbackFactory = RemoteAirBottleFallbackFactory.class)
+public interface RemoteAirBottleService {
+
+    /**
+     * 识别器新增报警记录
+     * @param tag 标签数据
+     * @return R<Boolean>
+     */
+    @PostMapping("alarm/record/remote/add")
+    R<Boolean> remoteAdd(@RequestBody InventoryTag tag);
+
+}

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

@@ -0,0 +1,40 @@
+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-airbottle-api/src/main/java/com/zd/airbottle/api/feign/entity/SysUserDto.java

@@ -0,0 +1,38 @@
+package com.zd.airbottle.api.feign.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+public class SysUserDto {
+
+    /** 主键 */
+    @ApiModelProperty(value = "数据主键",notes = "数据主键，数据产生修改时由前端带入，新增可忽略")
+    private Long id;
+
+    /**
+     * 用户账号
+     */
+    @NotBlank(message = "请输入用户名")
+    @ApiModelProperty(value = "登录账号",required = true)
+    private String userName;
+
+    /**
+     * 密码
+     */
+    @NotBlank(message = "请输入密码")
+    @ApiModelProperty(value = "登录密码",required = true)
+    private String password;
+
+    @ApiModelProperty(value = "登录确认密码")
+    private String rePassword;
+
+}

zd-api/zd-airbottle-api/src/main/java/com/zd/airbottle/api/feign/fallback/RemoteAirBottleFallbackFactory.java

@@ -0,0 +1,20 @@
+package com.zd.airbottle.api.feign.fallback;
+
+import com.zd.airbottle.api.feign.RemoteAirBottleService;
+import com.zd.model.domain.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteAirBottleFallbackFactory implements FallbackFactory<RemoteAirBottleService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteAirBottleFallbackFactory.class);
+
+    @Override
+    public RemoteAirBottleService create(Throwable throwable) {
+        log.error("气瓶服务调用失败:{}", throwable.getMessage());
+        return (tag) -> R.fail("新增报警记录失败:" + throwable.getMessage());
+    }
+}

zd-api/zd-base-api/src/main/java/com/zd/base/api/feign/RemoteMessageService.java

@@ -0,0 +1,88 @@
+package com.zd.base.api.feign;
+
+
+import com.zd.base.api.feign.fallback.RemoteMessageFallbackFactory;
+import com.zd.model.constant.ApplicationConstants;
+import com.zd.model.domain.R;
+import com.zd.model.entity.TemplateResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Date;
+import java.util.List;
+
+@FeignClient(contextId = "remoteMessageService", value = ApplicationConstants.BASE_SERVICE, fallbackFactory = RemoteMessageFallbackFactory.class)
+public interface RemoteMessageService {
+
+    @GetMapping("/wx/backlog")
+    @ApiOperation(value = "待办事项消息发送")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "backlogName",value = "待办事项名称"),
+            @ApiImplicitParam(name = "remark",value = "备注")
+    })
+    R<TemplateResult> backlog(@RequestParam("userId") Long userId,
+                              @RequestParam("backlogName") String backlogName,
+                              @RequestParam("remark") String remark);
+
+    @GetMapping("/wx/check")
+    @ApiOperation(value = "审核消息发送")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "checkType",value = "审核类型 1：资格申请 2：用气申请"),
+            @ApiImplicitParam(name = "checkStatus",value = "审核状态 1：通过 2：已驳回"),
+            @ApiImplicitParam(name = "checkTime",value = "审核时间")
+    })
+    R<TemplateResult> check(@RequestParam("userId") Long userId,
+                            @RequestParam("checkType") Integer checkType,
+                            @RequestParam("checkStatus") Integer checkStatus,
+                            @RequestParam("checkTime") Date checkTime,
+                            @RequestParam("taskId")Long taskId);
+    @GetMapping("stu/check")
+    @ApiOperation(value = "学生端审核消息发送")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "checkType",value = "审核类型 1：资格申请 2：用气申请"),
+            @ApiImplicitParam(name = "checkStatus",value = "审核状态 1：通过 2：已驳回"),
+            @ApiImplicitParam(name = "checkTime",value = "审核时间"),
+            @ApiImplicitParam(name = "taskId",value = "任务主键"),
+    })
+    R<TemplateResult> stuCheck(@RequestParam("userId") Long userId,
+                               @RequestParam("checkType") Integer checkType,
+                               @RequestParam("checkStatus") Integer checkStatus,
+                               @RequestParam("checkTime") Date checkTime,
+                               @RequestParam("taskId")Long taskId);
+
+    @GetMapping("/wx/storage/out")
+    @ApiOperation(value = "出库确认通知")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "outType",value = "出库类型"),
+            @ApiImplicitParam(name = "outTime",value = "出库时间")
+    })
+    R<TemplateResult> storageOut(@RequestParam("userId") Long userId,
+                                 @RequestParam("outType") String outType,
+                                 @RequestParam("outTime") Date outTime);
+
+    @GetMapping("/wx/wait/check")
+    @ApiOperation(value = "待审核消息发送")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "checkType",value = "审核类型 1：资格申请 2：用气申请"),
+            @ApiImplicitParam(name = "name",value = "申请人"),
+            @ApiImplicitParam(name = "applyTime",value = "申请时间")
+    })
+    R<TemplateResult> waitCheck(@RequestParam("userId") Long userId,
+                                @RequestParam("checkType") Integer checkType,
+                                @RequestParam("name") String name,
+                                @RequestParam("applyTime") Date applyTime);
+
+    @PostMapping("/wx/send/alarm")
+    @ApiOperation(value = "气瓶超出范围通知")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userIds",value = "上报接收人"),
+            @ApiImplicitParam(name = "address",value = "报警位置")
+    })
+    R<TemplateResult> sendAlarm(@RequestBody List<Long> userIds, @RequestParam("address") String address);
+}

zd-api/zd-base-api/src/main/java/com/zd/base/api/feign/fallback/RemoteMessageFallbackFactory.java

@@ -0,0 +1,54 @@
+package com.zd.base.api.feign.fallback;
+
+import com.zd.base.api.feign.RemoteMessageService;
+import com.zd.model.domain.R;
+import com.zd.model.entity.TemplateResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class RemoteMessageFallbackFactory implements FallbackFactory<RemoteMessageService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteMessageFallbackFactory.class);
+
+    @Override
+    public RemoteMessageService create(Throwable throwable) {
+        log.error("消息服务调用失败:{}", throwable.getMessage());
+        return new RemoteMessageService() {
+            @Override
+            public R<TemplateResult> backlog(Long userId, String backlogName, String remark) {
+                return R.fail("待办事项消息发送失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<TemplateResult> check(Long userId, Integer checkType, Integer checkStatus, Date checkTime,Long taskId) {
+                return R.fail("审核消息发送失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<TemplateResult> stuCheck(Long userId, Integer checkType, Integer checkStatus, Date checkTime, Long taskId) {
+                return R.fail("审核消息发送失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<TemplateResult> storageOut(Long userId, String outType, Date outTime) {
+                return R.fail("出库确认通知失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<TemplateResult> waitCheck(Long userId, Integer checkType, String name, Date applyTime) {
+                return R.fail("待审核消息发送失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<TemplateResult> sendAlarm(List<Long> userIds, String address) {
+                return R.fail("气瓶超出范围通知:" + throwable.getMessage());
+            }
+        };
+    }
+}

zd-common/zd-common-resultdata/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.zd.common.response.ResponseAdvice
-
-  

zd-model/pom.xml

@@ -20,19 +20,23 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+
         <!-- Swagger -->
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
+
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -52,19 +56,27 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
-        <dependency>
+
+        <!--<dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
             <version>5.2.1</version>
             <scope>compile</scope>
+        </dependency>-->
+
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 </project>

zd-model/src/main/java/com/zd/model/constant/ApplicationConstants.java

@@ -61,4 +61,9 @@ public interface ApplicationConstants {
      */
     String BOTTLE_SERVICE = "zd-bottle";
 
+    /**
+     * 小程序服务
+     */
+    String APP_SERVICE = "zd-app";
+
 }

zd-model/src/main/java/com/zd/model/entity/TemplateResult.java

@@ -0,0 +1,21 @@
+package com.zd.model.entity;
+
+import lombok.Data;
+
+/**
+ * 40003	touser字段 openid 为空或者不正确
+ * 40037	订阅模板 id 为空不正确
+ * 43101	用户拒绝接受消息，如果用户之前曾经订阅过，则表示用户取消了订阅关系
+ * 47003	模板参数不准确，可能为空或者不满足规则，errmsg会提示具体是哪个字段出错
+ * 41030	page路径不正确，需要保证在现网版本小程序中存在，与 app.json 保持一致
+ */
+@Data
+public class TemplateResult {
+
+    private int errcode;
+
+    private String errmsg;
+
+    private Long msgid;
+
+}

zd-model/src/main/java/com/zd/model/page/TableDataInfo.java

@@ -2,7 +2,6 @@ package com.zd.model.page;
 
 import com.github.pagehelper.PageInfo;
 import com.zd.model.constant.HttpStatus;
-
 import java.io.Serializable;
 import java.util.List;
 

zd-modules/zd-airbottle/pom.xml

@@ -46,11 +46,11 @@
         </dependency>
 
         <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.springfox</groupId>-->
+<!--            <artifactId>springfox-swagger-ui</artifactId>-->
+<!--            <version>${swagger.fox.version}</version>-->
+<!--        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>
@@ -59,38 +59,46 @@
         </dependency>
 
         <!-- zd Common DataSource -->
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-datasource</artifactId>
-        </dependency>
+<!--        <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>
+<!--        &lt;!&ndash; zd Common DataScope &ndash;&gt;-->
+<!--        <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>
+<!--        <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>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
+<!--        <dependency>-->
+<!--            <groupId>com.zd</groupId>-->
+<!--            <artifactId>zd-common-swagger</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-test</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.junit.vintage</groupId>-->
+<!--                    <artifactId>junit-vintage-engine</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>com.zd.swagger</groupId>
+            <artifactId>common-swagger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -110,6 +118,24 @@
             <artifactId>javase</artifactId>
             <version>3.2.0</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.base</groupId>
+            <artifactId>zd-base-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zd.airbottle</groupId>
+            <artifactId>zd-airbottle-api</artifactId>
+        </dependency>
+
+
     </dependencies>
 
     <build>
@@ -126,15 +152,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>
         </plugins>
     </build>
 </project>

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/ZdAirbottleApplication.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle;
 
 import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
-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 org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;

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

@@ -4,18 +4,17 @@ import com.zd.airbottle.domain.AlarmRecord;
 import com.zd.airbottle.domain.vo.AlarmRecordVo;
 import com.zd.airbottle.domain.vo.BottleStorageInfoVo;
 import com.zd.airbottle.service.IAlarmRecordService;
-import com.zd.common.core.domain.R;
+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.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.bean.TransferUtils;
-import com.zd.common.core.utils.poi.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.system.api.laboratory.domain.RemoteLabHardware;
+import com.zd.laboratory.api.vo.InventoryTag;
+import com.zd.model.domain.R;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;

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

@@ -5,16 +5,17 @@ import com.zd.airbottle.domain.QpAirBottle;
 import com.zd.airbottle.domain.dto.QpAirBottleDto;
 import com.zd.airbottle.domain.vo.QpAirBottleRVo;
 import com.zd.airbottle.service.IQpAirBottleService;
+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.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.BeanUtils;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 

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

@@ -4,7 +4,7 @@ import com.zd.airbottle.domain.QpAirGoodsConfig;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigVo;
 import com.zd.airbottle.service.IQpAirGoodsConfigService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
+import com.zd.model.domain.ResultData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import java.util.List;
 
 /**

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

@@ -6,19 +6,20 @@ import com.zd.airbottle.domain.dto.QpAirGoogsDto;
 import com.zd.airbottle.domain.vo.QpAirGoogsVo;
 import com.zd.airbottle.service.IQpAirBottleService;
 import com.zd.airbottle.service.IQpAirGoogsService;
-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.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.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 

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

@@ -7,20 +7,21 @@ import com.zd.airbottle.domain.QpTaskDetail;
 import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.domain.vo.report.AirAmount;
 import com.zd.airbottle.service.*;
+import com.zd.common.core.annotation.Log;
 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.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.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.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;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;

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

@@ -3,19 +3,20 @@ package com.zd.airbottle.controller;
 import com.zd.airbottle.domain.QpBottleStorageError;
 import com.zd.airbottle.domain.vo.QpBottleStorageErrorVo;
 import com.zd.airbottle.service.IQpBottleStorageErrorService;
-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.page.TableDataInfo;
 import io.swagger.annotations.Api;
 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.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

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

@@ -3,22 +3,25 @@ package com.zd.airbottle.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.airbottle.domain.QpBottleStorage;
 import com.zd.airbottle.domain.QpTask;
-import com.zd.airbottle.domain.vo.*;
+import com.zd.airbottle.domain.vo.QpBottleStorageExcelVo;
+import com.zd.airbottle.domain.vo.QpBottleStorageVO;
+import com.zd.airbottle.domain.vo.QpTaskDetailVO;
 import com.zd.airbottle.service.*;
-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.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 javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -1,34 +1,30 @@
 package com.zd.airbottle.controller;
 
-import java.util.HashMap;
-import java.util.List;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.airbottle.domain.*;
+import com.zd.airbottle.domain.QpBottleStorage;
+import com.zd.airbottle.domain.QpBottleStorageOut;
+import com.zd.airbottle.domain.QpTask;
+import com.zd.airbottle.domain.QpTaskDetail;
 import com.zd.airbottle.domain.vo.QpBottleStorageOutVO;
 import com.zd.airbottle.domain.vo.QpTransportUserVo;
 import com.zd.airbottle.service.*;
+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.utils.StringUtils;
-import com.zd.common.core.web.domain.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.utils.poi.ExcelUtil;
+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 com.zd.common.core.web.page.TableDataInfo;
+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.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 气瓶出库Controller

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

@@ -4,25 +4,29 @@ import com.alibaba.fastjson.JSONObject;
 import com.zd.airbottle.domain.QpBottleStorage;
 import com.zd.airbottle.domain.QpBottleStorageOut;
 import com.zd.airbottle.domain.QpTask;
-import com.zd.airbottle.domain.vo.*;
+import com.zd.airbottle.domain.vo.QpBottleStorageOutExcelVo;
+import com.zd.airbottle.domain.vo.QpBottleStorageOutVO;
+import com.zd.airbottle.domain.vo.QpBottleStorageVO;
+import com.zd.airbottle.domain.vo.QpTaskDetailVO;
 import com.zd.airbottle.service.IQpBottleStorageOutService;
 import com.zd.airbottle.service.IQpBottleStorageService;
 import com.zd.airbottle.service.IQpTaskDetailService;
 import com.zd.airbottle.service.IQpTaskService;
-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.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 javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -1,31 +1,23 @@
 package com.zd.airbottle.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.airbottle.domain.vo.QpFlowVO;
-import com.zd.common.core.web.domain.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.airbottle.domain.QpFlow;
+import com.zd.airbottle.domain.vo.QpFlowVO;
 import com.zd.airbottle.service.IQpFlowService;
+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.utils.poi.ExcelUtil;
+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 com.zd.common.core.web.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 气瓶审核流程Controller

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

@@ -1,33 +1,25 @@
 package com.zd.airbottle.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.airbottle.domain.vo.QpFlowDetailVO;
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.airbottle.domain.QpFlowDetail;
+import com.zd.airbottle.domain.vo.QpFlowDetailVO;
 import com.zd.airbottle.service.IQpFlowDetailService;
+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.utils.poi.ExcelUtil;
+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.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 气瓶流程详情Controller

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

@@ -7,14 +7,13 @@ import com.zd.airbottle.service.IQpBottleStorageOutService;
 import com.zd.airbottle.service.IQpBottleStorageService;
 import com.zd.airbottle.service.IQpTaskDetailService;
 import com.zd.airbottle.service.IQpTaskService;
-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.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.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;

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

@@ -5,23 +5,23 @@ import com.zd.airbottle.domain.QpQualificationApply;
 import com.zd.airbottle.domain.QpQualificationApplyRecord;
 import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.service.*;
-import com.zd.common.core.domain.R;
+import com.zd.base.api.feign.RemoteMessageService;
+import com.zd.common.core.annotation.Log;
 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.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.service.TokenService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.message.RemoteMessageService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.ResultData;
+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;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -230,7 +230,7 @@ public class QpQualificationApplyController extends BaseController
     //@PreAuthorize(hasPermi = "airbottle:apply:query")
     //@PreAuthorize(hasPermi = PerPrefix.AIRBOTTLE_QUALIFICATIONAPPLY+ PerFun.QUERY)
     @GetMapping("/getById")
-    public AjaxResult getById( Long id)
+    public AjaxResult getById(Long id)
     {
         Map<String,Object> map = new HashMap<>();
         //申请单详情

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

@@ -4,23 +4,22 @@ import com.zd.airbottle.domain.QpFlowDetail;
 import com.zd.airbottle.domain.QpQualificationApply;
 import com.zd.airbottle.domain.QpQualificationApplyRecord;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo;
-import com.zd.airbottle.domain.vo.QpFlowDetailVO;
 import com.zd.airbottle.domain.vo.QpQualificationApplyExcelVo;
 import com.zd.airbottle.domain.vo.QpQualificationApplyVO;
 import com.zd.airbottle.service.*;
-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.base.api.feign.RemoteMessageService;
+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.system.api.message.RemoteMessageService;
+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;
@@ -170,7 +169,7 @@ public class QpQualificationApplyManageController extends BaseController
     //@PreAuthorize(hasPermi = "airbottle:apply:query")
     @PreAuthorize(hasPermi = PerPrefix.AIRBOTTLE_QUALIFICATIONAPPLYMANAGE+ PerFun.QUERY)
     @GetMapping("/getById")
-    public AjaxResult getById( Long id)
+    public AjaxResult getById(Long id)
     {
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();

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

@@ -2,14 +2,14 @@ package com.zd.airbottle.controller;
 
 import com.zd.airbottle.domain.QpQualificationCertificate;
 import com.zd.airbottle.service.IQpQualificationCertificateService;
+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.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.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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

@@ -2,19 +2,20 @@ package com.zd.airbottle.controller;
 
 import com.zd.airbottle.domain.QpRfidTag;
 import com.zd.airbottle.service.IQpRfidTagService;
-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.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.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

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

@@ -4,17 +4,18 @@ import com.zd.airbottle.domain.QpSpecification;
 import com.zd.airbottle.domain.dto.QpSpecificationDto;
 import com.zd.airbottle.domain.vo.QpSpecificationVo;
 import com.zd.airbottle.service.IQpSpecificationService;
+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.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.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**

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

@@ -1,28 +1,29 @@
 package com.zd.airbottle.controller;
 
+import com.zd.airbottle.api.feign.entity.SysUserDto;
 import com.zd.airbottle.domain.QpSupplier;
 import com.zd.airbottle.domain.dto.QpSupplierDto;
 import com.zd.airbottle.domain.vo.QpSupplierVo;
 import com.zd.airbottle.service.IQpSupplierService;
-import com.zd.model.constant.HttpStatus;
-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.exception.ServiceException;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.StringUtils;
-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.dto.SysUserDto;
+import com.zd.model.constant.HttpStatus;
+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.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 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 javax.validation.Valid;

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

@@ -2,19 +2,20 @@ package com.zd.airbottle.controller;
 
 import com.zd.airbottle.domain.QpSupplierCredentials;
 import com.zd.airbottle.service.IQpSupplierCredentialsService;
-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.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.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

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

@@ -1,21 +1,22 @@
 package com.zd.airbottle.controller;
 
 import com.zd.airbottle.domain.QpSupplierSyntheticalAudit;
-import com.zd.airbottle.service.IQpSupplierSyntheticalAuditService;
 import com.zd.airbottle.domain.vo.QpSupplierSyntheticalAuditVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.airbottle.service.IQpSupplierSyntheticalAuditService;
+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.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.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**

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

@@ -4,23 +4,24 @@ import com.alibaba.fastjson.JSONObject;
 import com.zd.airbottle.domain.*;
 import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.service.*;
+import com.zd.common.core.annotation.Log;
 import com.zd.common.core.exception.ServiceException;
+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.utils.StringUtils;
-import com.zd.common.core.utils.poi.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.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.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 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.text.SimpleDateFormat;

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

@@ -4,22 +4,23 @@ import com.zd.airbottle.domain.QpBottleStorage;
 import com.zd.airbottle.domain.QpTask;
 import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.service.*;
-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;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -4,12 +4,12 @@ import com.zd.airbottle.domain.QpTransportCar;
 import com.zd.airbottle.domain.dto.QpTransportCarDto;
 import com.zd.airbottle.domain.vo.QpTransportCarVo;
 import com.zd.airbottle.service.IQpTransportCarService;
+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.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.BeanUtils;

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

@@ -4,17 +4,18 @@ import com.zd.airbottle.domain.QpTransportUser;
 import com.zd.airbottle.domain.dto.QpTransportUserDto;
 import com.zd.airbottle.domain.vo.QpTransportUserVo;
 import com.zd.airbottle.service.IQpTransportUserService;
+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.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.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**

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

@@ -8,21 +8,22 @@ import com.zd.airbottle.domain.vo.QpUseRecordVo;
 import com.zd.airbottle.domain.vo.report.AirAmount;
 import com.zd.airbottle.domain.vo.report.WebUseRecordVo;
 import com.zd.airbottle.service.IQpUseRecordService;
+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.DateUtils;
-import com.zd.common.core.utils.poi.ExcelUtil;
+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.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.model.domain.ResultData;
+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.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;

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

@@ -1,38 +1,37 @@
 package com.zd.airbottle.controller;
 
-import java.time.LocalDate;
-import java.util.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.airbottle.domain.*;
-import com.zd.airbottle.domain.vo.*;
+import com.zd.airbottle.domain.QpUsegasApply;
+import com.zd.airbottle.domain.QpUsegasAuditRecord;
+import com.zd.airbottle.domain.vo.QpFlowDetailVO;
+import com.zd.airbottle.domain.vo.QpUsegasApplyExcelVo;
+import com.zd.airbottle.domain.vo.QpUsegasApplyVO;
 import com.zd.airbottle.service.IQpFlowDetailService;
+import com.zd.airbottle.service.IQpUsegasApplyService;
 import com.zd.airbottle.service.IQpUsegasAuditRecordService;
+import com.zd.common.core.annotation.Log;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.airbottle.service.IQpUsegasApplyService;
+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.utils.poi.ExcelUtil;
+import com.zd.common.swagger.config.Knife4jConfiguration;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.ResultData;
+import com.zd.model.entity.SysUser;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-import com.zd.common.core.web.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用气申请Controller
@@ -111,7 +110,7 @@ public class QpUsegasApplyController extends BaseController
     // @PreAuthorize(hasPermi = "airbottle:apply:query")
     // @PreAuthorize(hasPermi = PerPrefix.AIRBOTTLE_USEAGSAPPLY+ PerFun.QUERY)
     @GetMapping("/getById")
-    public AjaxResult getById( Long id)
+    public AjaxResult getById(Long id)
     {
         Map<String,Object> map = new HashMap<String,Object>();
         //申请详情

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

@@ -4,26 +4,25 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.airbottle.domain.QpFlowDetail;
 import com.zd.airbottle.domain.QpUsegasApply;
 import com.zd.airbottle.domain.QpUsegasAuditRecord;
-import com.zd.airbottle.domain.vo.QpFlowDetailVO;
 import com.zd.airbottle.domain.vo.QpUsegasApplyExcelVo;
 import com.zd.airbottle.domain.vo.QpUsegasApplyVO;
 import com.zd.airbottle.service.IQpFlowDetailService;
 import com.zd.airbottle.service.IQpUsegasApplyService;
 import com.zd.airbottle.service.IQpUsegasAuditRecordService;
-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.exception.ServiceException;
-import com.zd.common.core.utils.poi.ExcelUtil;
+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.common.swagger.config.Knife4jConfiguration;
-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;
@@ -152,7 +151,7 @@ public class QpUsegasApplyManageController extends BaseController
     // @PreAuthorize(hasPermi = "airbottle:apply:query")
     @PreAuthorize(hasPermi = PerPrefix.AIRBOTTLE_USEAGSAPPLY+ PerFun.QUERY)
     @GetMapping("/getById")
-    public AjaxResult getById( Long id)
+    public AjaxResult getById(Long id)
     {
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/AlarmRecord.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpAirBottle.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpAirBottleConfig.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain;
 
-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-airbottle/src/main/java/com/zd/airbottle/domain/QpAirGoodsConfig.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain;
 
-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-airbottle/src/main/java/com/zd/airbottle/domain/QpAirGoogs.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpBottleStorage.java

@@ -1,15 +1,16 @@
 package com.zd.airbottle.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+
 /**
  * 气瓶入库对象 qp_bottle_storage
  * 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpBottleStorageError.java

@@ -1,9 +1,8 @@
 package com.zd.airbottle.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,7 +10,9 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import com.zd.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 气瓶异常记录对象 qp_bottle_storage_error

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpBottleStorageOut.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,8 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import com.zd.common.core.web.domain.BaseEntity;
+
+import java.util.Date;
 
 /**
  * 气瓶出库对象 qp_bottle_storage_out

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpFlow.java

@@ -1,6 +1,7 @@
 package com.zd.airbottle.domain;
 
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,7 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import com.zd.common.core.web.domain.BaseEntity;
 
 /**
  * 气瓶审核流程对象 qp_flow

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpFlowDetail.java

@@ -1,6 +1,7 @@
 package com.zd.airbottle.domain;
 
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,7 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import com.zd.common.core.web.domain.BaseEntity;
 
 /**
  * 气瓶流程详情对象 qp_flow_detail

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpQualificationApply.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpQualificationApplyDetail.java

@@ -1,11 +1,11 @@
 package com.zd.airbottle.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 资格申请详情对象 qp_qualification_apply_detail

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpQualificationApplyRecord.java

@@ -1,12 +1,12 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpQualificationCertificate.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpRfidTag.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpSpecification.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain;
 
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpSpecificationDetail.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain;
 
-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-airbottle/src/main/java/com/zd/airbottle/domain/QpSupplier.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain;
 
 import com.zd.airbottle.constant.Constants;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpSupplierCredentials.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpSupplierSyntheticalAudit.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTask.java

@@ -1,11 +1,11 @@
 package com.zd.airbottle.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
 /**

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTaskDetail.java

@@ -1,12 +1,12 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTransportCar.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTransportCarCredentials.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTransportUser.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTransportUserCredentials.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpUseRecord.java

@@ -1,9 +1,8 @@
 package com.zd.airbottle.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,7 +10,9 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-import com.zd.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 使用记录对象 qp_use_record

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpUsegasApply.java

@@ -1,15 +1,16 @@
 package com.zd.airbottle.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+
 /**
  * 用气申请对象 qp_usegas_apply
  *

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpUsegasAuditRecord.java

@@ -1,15 +1,16 @@
 package com.zd.airbottle.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+
 /**
  * 用气审核对象 qp_usegas_audit_record
  * 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/dto/QpAirBottleConfigDto.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain.dto;
 
-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-airbottle/src/main/java/com/zd/airbottle/domain/dto/QpSpecificationDetailDto.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain.dto;
 
-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-airbottle/src/main/java/com/zd/airbottle/domain/dto/QpSpecificationDto.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain.dto;
 
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/dto/QpSupplierDto.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain.dto;
 
-import com.zd.system.api.dto.SysUserDto;
+import com.zd.airbottle.api.feign.entity.SysUserDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/AlarmRecordVo.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain.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-airbottle/src/main/java/com/zd/airbottle/domain/vo/BottleStorageInfoVo.java

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

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpBottleStorageErrorVo.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain.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-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpBottleStorageExcelVo.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain.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;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpBottleStorageOutExcelVo.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain.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-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpBottleStorageRVo.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain.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-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpFlowVO.java

@@ -2,15 +2,7 @@ package com.zd.airbottle.domain.vo;
 
 import com.zd.airbottle.domain.QpFlow;
 import com.zd.airbottle.domain.QpFlowDetail;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
 
 import java.util.List;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpQualificationApplyExcelVo.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain.vo;
 
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpSupplierVo.java

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

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpTaskExcelVo.java

@@ -1,6 +1,6 @@
 package com.zd.airbottle.domain.vo;
 
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpTaskRVo.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain.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-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpUseRecordVo.java

@@ -1,7 +1,7 @@
 package com.zd.airbottle.domain.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-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpUsegasApplyExcelVo.java

@@ -1,8 +1,8 @@
 package com.zd.airbottle.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;

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

@@ -3,8 +3,8 @@ 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.system.api.domain.InventoryTag;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+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

@@ -9,24 +9,24 @@ import com.zd.airbottle.mapper.AlarmRecordMapper;
 import com.zd.airbottle.service.IAlarmRecordService;
 import com.zd.airbottle.service.IQpBottleStorageService;
 import com.zd.airbottle.service.IQpUseRecordService;
-import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.template.TemplateResult;
+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.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.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.domain.InventoryTag;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-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.message.RemoteMessageService;
-import com.zd.system.api.netty.RemoteNettyService;
+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;
+import com.zd.model.entity.RemoteLabHardware;
+import com.zd.model.entity.TemplateResult;
+import com.zd.system.api.feign.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.stereotype.Service;

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

@@ -1,23 +1,23 @@
 package com.zd.airbottle.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.zd.airbottle.domain.QpAirBottleConfig;
 import com.zd.airbottle.domain.vo.QpAirBottleConfigVo;
 import com.zd.airbottle.domain.vo.QpAirBottleRVo;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigVo;
+import com.zd.airbottle.mapper.QpAirBottleConfigMapper;
+import com.zd.airbottle.service.IQpAirBottleConfigService;
 import com.zd.airbottle.service.IQpAirBottleService;
 import com.zd.airbottle.service.IQpAirGoodsConfigService;
-import com.zd.common.core.utils.bean.TransferUtils;
+import com.zd.common.core.utils.TransferUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.airbottle.mapper.QpAirBottleConfigMapper;
-import com.zd.airbottle.domain.QpAirBottleConfig;
-import com.zd.airbottle.service.IQpAirBottleConfigService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 气瓶配置Service业务层处理
  *

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

@@ -17,11 +17,11 @@ import com.zd.airbottle.service.IQpAirGoodsConfigService;
 import com.zd.airbottle.service.IQpSupplierService;
 import com.zd.airbottle.utils.SupplierUtil;
 import com.zd.common.core.exception.ServiceException;
+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.utils.bean.TransferUtils;
-import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.TransferUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -6,16 +6,17 @@ import com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigVo;
 import com.zd.airbottle.mapper.QpAirGoodsConfigMapper;
 import com.zd.airbottle.service.IQpAirGoodsConfigService;
-import com.zd.common.core.utils.bean.TransferUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.RemoteDeptService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.TransferUtils;
+import com.zd.system.api.feign.RemoteDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

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

@@ -10,12 +10,12 @@ import com.zd.airbottle.domain.vo.QpAirGoogsVo;
 import com.zd.airbottle.mapper.QpAirGoogsMapper;
 import com.zd.airbottle.service.IQpAirGoodsConfigService;
 import com.zd.airbottle.service.IQpAirGoogsService;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 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.utils.bean.TransferUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.TransferUtils;
+import com.zd.model.domain.per.PerPrefix;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -12,14 +12,14 @@ import com.zd.airbottle.service.IQpBottleStorageErrorService;
 import com.zd.airbottle.service.IQpBottleStorageService;
 import com.zd.airbottle.service.IQpTaskService;
 import com.zd.airbottle.service.IQpUseRecordService;
-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.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysUser;
+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.SysUser;
+import com.zd.system.api.feign.RemoteUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,25 +1,24 @@
 package com.zd.airbottle.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.alibaba.fastjson.JSONObject;
 import com.zd.airbottle.domain.*;
 import com.zd.airbottle.domain.vo.QpBottleStorageOutVO;
 import com.zd.airbottle.domain.vo.QpBottleStorageVO;
 import com.zd.airbottle.mapper.*;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.airbottle.service.IQpBottleStorageOutService;
+import com.zd.base.api.feign.RemoteMessageService;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
-
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.message.RemoteMessageService;
+import com.zd.common.core.security.TokenService;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.airbottle.service.IQpBottleStorageOutService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 气瓶出库Service业务层处理
  *

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

@@ -6,13 +6,13 @@ import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.domain.vo.report.AirAmount;
 import com.zd.airbottle.mapper.QpBottleStorageMapper;
 import com.zd.airbottle.service.*;
-import com.zd.common.core.domain.per.PerPrefix;
+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.SecurityUtils;
-import com.zd.common.core.utils.bean.TransferUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.SysUser;
+import com.zd.common.core.utils.TransferUtils;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;