化学品依赖调整

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/forward/feign/RemoteForwardService.java

@@ -3,6 +3,7 @@ package com.zd.algorithm.api.forward.feign;
 import com.zd.algorithm.api.forward.feign.fallback.RemoteForwardFallbackFactory;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.R;
+import com.zd.model.entity.SysFile;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,5 +30,5 @@ public interface RemoteForwardService {
     Object saveData(@RequestBody Map<String, Object> data);
 
     @GetMapping("/alarm/photograph")
-    R<Object> photograph(@RequestParam("streamUrl") String streamUrl);
+    R<SysFile> photograph(@RequestParam("streamUrl") String streamUrl);
 }

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/forward/feign/fallback/RemoteForwardFallbackFactory.java

@@ -2,6 +2,7 @@ package com.zd.algorithm.api.forward.feign.fallback;
 
 import com.zd.algorithm.api.forward.feign.RemoteForwardService;
 import com.zd.model.domain.R;
+import com.zd.model.entity.SysFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -37,7 +38,7 @@ public class RemoteForwardFallbackFactory implements FallbackFactory<RemoteForwa
             }
 
             @Override
-            public R<Object> photograph(String streamUrl) {
+            public R<SysFile> photograph(String streamUrl) {
                 return R.fail("报警拍照服务调用失败:" + throwable.getMessage());
             }
         };

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

@@ -1,7 +1,7 @@
 package com.zd.base.api.feign;
 
 
-import com.zd.base.api.entity.SysFile;
+import com.zd.model.entity.SysFile;
 import com.zd.base.api.feign.fallback.RemoteFileFallbackFactory;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.R;

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

@@ -1,6 +1,6 @@
 package com.zd.base.api.feign.fallback;
 
-import com.zd.base.api.entity.SysFile;
+import com.zd.model.entity.SysFile;
 import com.zd.base.api.feign.RemoteFileService;
 import com.zd.model.domain.R;
 import org.slf4j.Logger;

zd-api/zd-base-api/src/main/java/com/zd/base/api/entity/SysFile.java

@@ -1,4 +1,4 @@
-package com.zd.base.api.entity;
+package com.zd.model.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

zd-modules/zd-base/src/main/java/com/zd/base/files/file/controller/SysFileController.java

@@ -1,9 +1,9 @@
 package com.zd.base.files.file.controller;
 
-import com.zd.base.api.entity.SysFile;
 import com.zd.base.files.file.service.ISysFileService;
 import com.zd.common.core.utils.file.FileUtils;
 import com.zd.model.domain.R;
+import com.zd.model.entity.SysFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-chemical/pom.xml

@@ -44,13 +44,13 @@
         </dependency>
 
         <!-- zd Common DataSource -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datasource</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common DataScope -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datascope</artifactId>
             <exclusions>
@@ -59,13 +59,13 @@
                     <artifactId>spring-webmvc</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common Log -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-log</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common Swagger -->
         <dependency>
@@ -74,6 +74,26 @@
         </dependency>
 
         <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
+        </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>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
@@ -83,7 +103,7 @@
                     <artifactId>junit-vintage-engine</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
 
         <!-- 四医大短信依赖包 -->
         <dependency>
@@ -152,7 +172,6 @@
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/main/resources/libs/sms-syd/xstream-1.3.1.jar</systemPath>
         </dependency>
-
         <!-- 四医大短信依赖包 -->
 
     </dependencies>

zd-modules/zd-chemical/src/main/java/com/zd/chemical/ZdChemicalApplication.java

@@ -4,22 +4,17 @@ import com.zd.chemical.domain.HxpChemicalClassify;
 import com.zd.chemical.domain.HxpClassifyConfig;
 import com.zd.chemical.service.IHxpChemicalClassifyService;
 import com.zd.chemical.service.IHxpClassifyConfigService;
-import com.zd.common.core.utils.StringUtils;
-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.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @EnableCustomConfig
 @EnableRyFeignClients

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

@@ -1,34 +1,25 @@
 package com.zd.chemical.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.chemical.domain.vo.ActApplytaskVo;
-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.chemical.domain.ActApplytask;
+import com.zd.chemical.domain.vo.ActApplytaskVo;
 import com.zd.chemical.service.IActApplytaskService;
+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.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-chemical/src/main/java/com/zd/chemical/controller/ActApplytaskNodeController.java

@@ -1,31 +1,21 @@
 package com.zd.chemical.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-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.chemical.domain.ActApplytaskNode;
 import com.zd.chemical.service.IActApplytaskNodeService;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.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-chemical/src/main/java/com/zd/chemical/controller/ActAuditconfigController.java

@@ -5,9 +5,9 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zd.chemical.domain.vo.ActAuditconfigVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.web.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,17 +17,17 @@ 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.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.chemical.domain.ActAuditconfig;
 import com.zd.chemical.service.IActAuditconfigService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.page.TableDataInfo;
 
 /**
  * 工作流审批Controller

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

@@ -1,31 +1,21 @@
 package com.zd.chemical.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-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.chemical.domain.ActAudituser;
 import com.zd.chemical.service.IActAudituserService;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.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-chemical/src/main/java/com/zd/chemical/controller/ActHxpapplyController.java

@@ -1,31 +1,29 @@
 package com.zd.chemical.controller;
 
-import java.util.Collections;
-import java.util.List;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Optional;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zd.chemical.domain.vo.*;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.web.domain.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.chemical.domain.ActHxpapply;
+import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IActHxpapplyService;
+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.SecurityUtils;
 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.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.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 化学品申购Controller

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

@@ -1,31 +1,21 @@
 package com.zd.chemical.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-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.chemical.domain.ActHxpapplyDetail;
 import com.zd.chemical.service.IActHxpapplyDetailService;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.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-chemical/src/main/java/com/zd/chemical/controller/HxpAIOController.java

@@ -1,20 +1,22 @@
 package com.zd.chemical.controller;
 
-import com.zd.chemical.domain.*;
+import com.zd.chemical.domain.HxpAlarmRecord;
+import com.zd.chemical.domain.HxpStock;
+import com.zd.chemical.domain.HxpUserecord;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.*;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.enums.LockTypeEnum;
+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.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 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.service.TokenService;
-import com.zd.system.api.laboratory.CabinetV2Lock;
-import com.zd.system.api.model.LoginUser;
+import com.zd.laboratory.api.entity.CabinetV2Lock;
+import com.zd.model.domain.R;
+import com.zd.model.entity.LoginUser;
+import com.zd.model.enums.LockTypeEnum;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

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

@@ -3,15 +3,15 @@ package com.zd.chemical.controller;
 import com.zd.chemical.domain.HxpAlarmConfig;
 import com.zd.chemical.domain.vo.HxpAlarmConfigVo;
 import com.zd.chemical.service.IHxpAlarmConfigService;
-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.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+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 com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,30 +1,28 @@
 package com.zd.chemical.controller;
 
-import java.util.*;
-import java.io.IOException;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
+import com.zd.chemical.domain.HxpAlarmRecord;
 import com.zd.chemical.domain.vo.HxpAlarmRecordSearch;
 import com.zd.chemical.domain.vo.HxpAlarmRecordVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.web.domain.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.chemical.domain.HxpAlarmRecord;
 import com.zd.chemical.service.IHxpAlarmRecordService;
+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.SecurityUtils;
 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.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 com.zd.common.swagger.config.Knife4jConfiguration;
+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.*;
+import java.util.stream.Collectors;
 
 /**
  * 化学品报警记录Controller

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

@@ -1,32 +1,32 @@
 package com.zd.chemical.controller;
 
-import java.util.*;
-import java.io.IOException;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
+import com.zd.chemical.domain.HxpCabinet;
 import com.zd.chemical.domain.vo.HxpCabinetInclusionChemicalVo;
 import com.zd.chemical.domain.vo.HxpCabinetSearch;
 import com.zd.chemical.domain.vo.HxpCabinetVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.web.domain.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.chemical.domain.HxpCabinet;
 import com.zd.chemical.service.IHxpCabinetService;
+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.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-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 com.zd.common.swagger.config.Knife4jConfiguration;
+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.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 化学品机柜管理信息Controller

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

@@ -1,35 +1,26 @@
 package com.zd.chemical.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
+import com.zd.chemical.domain.HxpCabinetlockLog;
 import com.zd.chemical.domain.vo.HxpCabinetlockLogSearch;
 import com.zd.chemical.domain.vo.HxpCabinetlockLogVo;
-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.chemical.domain.HxpCabinetlockLog;
 import com.zd.chemical.service.IHxpCabinetlockLogService;
+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.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-chemical/src/main/java/com/zd/chemical/controller/HxpChemicalClassifyController.java

@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.common.core.web.domain.ResultData;
+import com.zd.model.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,16 +15,16 @@ 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.annotation.Log;
+import com.zd.common.core.log.BusinessType;
 import com.zd.chemical.domain.HxpChemicalClassify;
 import com.zd.chemical.service.IHxpChemicalClassifyService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.utils.ExcelUtil;
 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 com.zd.model.page.TableDataInfo;
 
 /**
  * 化学品分类Controller

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

@@ -1,39 +1,39 @@
 package com.zd.chemical.controller;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.*;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.hutool.core.collection.ListUtil;
+import com.zd.chemical.domain.HxpChemical;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpChemicalJoinCabinetService;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.chemical.service.IHxpChemicalService;
+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.redis.RedisService;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.redis.service.RedisService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.chemical.domain.HxpChemical;
-import com.zd.chemical.service.IHxpChemicalService;
 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.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.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 org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 化学品信息Controller
  *
@@ -97,7 +97,7 @@ public class HxpChemicalController extends BaseController {
     @Log(title = "化学品导入", businessType = BusinessType.IMPORT)
     @PreAuthorize(hasPermi = PerPrefix.HPX_CHEMICAL+PerFun.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file,HxpChemicalByExcel hxpChemicalByExcel) throws Exception {
+    public AjaxResult importData(MultipartFile file, HxpChemicalByExcel hxpChemicalByExcel) throws Exception {
         ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<HxpChemicalByExcel>(HxpChemicalByExcel.class);
         List<HxpChemicalByExcel> chemicalList = util.importExcel(file.getInputStream(),true);
         String operName = SecurityUtils.getUsername();

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

@@ -7,10 +7,10 @@ import javax.servlet.http.HttpServletResponse;
 import com.zd.chemical.domain.vo.HxpChemicalJoinCabinetListVo;
 import com.zd.chemical.domain.vo.HxpChemicalJoinCabinetSearch;
 import com.zd.chemical.domain.vo.HxpChemicalJoinCabinetVo;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.web.domain.ResultData;
+import com.zd.model.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,17 +20,17 @@ 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.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.chemical.domain.HxpChemicalJoinCabinet;
 import com.zd.chemical.service.IHxpChemicalJoinCabinetService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.model.page.TableDataInfo;
 
 /**
  * 化学品和机柜关联Controller

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

@@ -1,35 +1,26 @@
 package com.zd.chemical.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-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.chemical.domain.HxpClassifyConfig;
 import com.zd.chemical.service.IHxpClassifyConfigService;
+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.utils.poi.ExcelUtil;
+import com.zd.common.swagger.config.Knife4jConfiguration;
+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 com.zd.common.swagger.config.Knife4jConfiguration;
+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
@@ -39,11 +30,9 @@ import com.zd.common.core.web.page.TableDataInfo;
  */
 @RestController
 @Api(tags = "【【请填写功能名称】】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
 @ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/classifyConfig")
-public class HxpClassifyConfigController extends BaseController
-{
+public class HxpClassifyConfigController extends BaseController {
     @Autowired
     private IHxpClassifyConfigService hxpClassifyConfigService;
 
@@ -53,8 +42,7 @@ public class HxpClassifyConfigController extends BaseController
     @PreAuthorize(hasPermi = "chemical:config:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询【请填写功能名称】列表")
-    public TableDataInfo<HxpClassifyConfig> list(HxpClassifyConfig hxpClassifyConfig)
-    {
+    public TableDataInfo<HxpClassifyConfig> list(HxpClassifyConfig hxpClassifyConfig) {
         startPage();
         List<HxpClassifyConfig> list = hxpClassifyConfigService.selectHxpClassifyConfigList(hxpClassifyConfig);
         return getDataTable(list);
@@ -67,8 +55,7 @@ public class HxpClassifyConfigController extends BaseController
     @PreAuthorize(hasPermi = "chemical:config:export")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, HxpClassifyConfig hxpClassifyConfig) throws IOException
-    {
+    public void export(HttpServletResponse response, HxpClassifyConfig hxpClassifyConfig) throws IOException {
         List<HxpClassifyConfig> list = hxpClassifyConfigService.selectHxpClassifyConfigList(hxpClassifyConfig);
         ExcelUtil<HxpClassifyConfig> util = new ExcelUtil<HxpClassifyConfig>(HxpClassifyConfig.class);
         util.exportExcel(response, list, "【请填写功能名称】数据");
@@ -78,10 +65,9 @@ public class HxpClassifyConfigController extends BaseController
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "获取【请填写功能名称】详细信息")
-    @PreAuthorize(hasPermi = PerPrefix.HXP_CONFIG+ PerFun.QUERY)
+    @PreAuthorize(hasPermi = PerPrefix.HXP_CONFIG + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<HxpClassifyConfig> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<HxpClassifyConfig> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(hxpClassifyConfigService.selectHxpClassifyConfigById(id));
     }
 
@@ -89,11 +75,10 @@ public class HxpClassifyConfigController extends BaseController
      * 新增【请填写功能名称】
      */
     @ApiOperation(value = "新增【请填写功能名称】")
-    @PreAuthorize(hasPermi = PerPrefix.HXP_CONFIG+ PerFun.ADD)
+    @PreAuthorize(hasPermi = PerPrefix.HXP_CONFIG + PerFun.ADD)
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody HxpClassifyConfig hxpClassifyConfig)
-    {
+    public ResultData add(@RequestBody HxpClassifyConfig hxpClassifyConfig) {
         return ResultData.result(hxpClassifyConfigService.insertHxpClassifyConfig(hxpClassifyConfig));
     }
 
@@ -101,12 +86,11 @@ public class HxpClassifyConfigController extends BaseController
      * 修改【请填写功能名称】
      */
     @ApiOperation(value = "修改【请填写功能名称】")
-    @PreAuthorize(hasPermi = PerPrefix.HXP_CONFIG+ PerFun.ADD)
+    @PreAuthorize(hasPermi = PerPrefix.HXP_CONFIG + PerFun.ADD)
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody HxpClassifyConfig hxpClassifyConfig)
-    {
-        return  ResultData.result(hxpClassifyConfigService.updateHxpClassifyConfig(hxpClassifyConfig));
+    public ResultData edit(@RequestBody HxpClassifyConfig hxpClassifyConfig) {
+        return ResultData.result(hxpClassifyConfigService.updateHxpClassifyConfig(hxpClassifyConfig));
     }
 
     /**
@@ -115,9 +99,8 @@ public class HxpClassifyConfigController extends BaseController
     @ApiOperation(value = "删除【请填写功能名称】")
     @PreAuthorize(hasPermi = "chemical:config:remove")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(hxpClassifyConfigService.deleteHxpClassifyConfigByIds(ids));
     }
 }

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

@@ -5,12 +5,12 @@ import com.zd.chemical.domain.HxpStock;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpAlarmRecordService;
 import com.zd.chemical.service.IHxpChemicalService;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.ResultData;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,44 +1,42 @@
 package com.zd.chemical.controller;
 
-import java.util.HashMap;
-import java.util.List;
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletResponse;
-
+import com.zd.chemical.domain.HxpSmartTerminal;
 import com.zd.chemical.domain.HxpSmartTerminalConfig;
 import com.zd.chemical.domain.vo.HxpSmartTerminalByExcel;
 import com.zd.chemical.domain.vo.HxpSmartTerminalSearch;
 import com.zd.chemical.domain.vo.HxpSmartTerminalVo;
 import com.zd.chemical.service.IHxpSmartTerminalConfigService;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.chemical.service.IHxpSmartTerminalService;
+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.redis.RedisService;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.redis.service.RedisService;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.chemical.domain.HxpSmartTerminal;
-import com.zd.chemical.service.IHxpSmartTerminalService;
-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 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.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 化学品设备管理Controller
  *

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

@@ -7,19 +7,19 @@ import com.zd.chemical.domain.vo.HxpStockOutVO;
 import com.zd.chemical.domain.vo.HxpStockSearch;
 import com.zd.chemical.service.IHxpStockService;
 import com.zd.chemical.util.SmsSydUtil;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.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.utils.SecurityUtils;
-import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
-import com.zd.system.api.domain.InventoryTag;
+import com.zd.laboratory.api.vo.InventoryTag;
+import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,17 +4,17 @@ import com.zd.chemical.domain.HxpUserecord;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpUserecordService;
 import com.zd.chemical.util.SmsSydUtil;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+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.model.domain.ResultData;
+import com.zd.model.page.TableDataInfo;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.security.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActApplytask.java

@@ -1,7 +1,7 @@
 package com.zd.chemical.domain;
 
 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;
@@ -9,7 +9,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 import java.util.Date;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActApplytaskNode.java

@@ -1,6 +1,6 @@
 package com.zd.chemical.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;
@@ -8,7 +8,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 /**
  * 化学品申购任务节点对象 act_applytask_node

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActAuditconfig.java

@@ -1,6 +1,6 @@
 package com.zd.chemical.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;
@@ -8,7 +8,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 /**
  * 工作流审批对象 act_auditconfig

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActAudituser.java

@@ -1,6 +1,6 @@
 package com.zd.chemical.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;
@@ -8,7 +8,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 /**
  * 工作流审批用户对象 act_audituser

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActHxpapply.java

@@ -1,6 +1,6 @@
 package com.zd.chemical.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;
@@ -8,7 +8,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 /**
  * 化学品申购对象 act_hxpapply

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/ActHxpapplyDetail.java

@@ -1,7 +1,7 @@
 package com.zd.chemical.domain;
 
 import java.math.BigDecimal;
-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;
@@ -9,7 +9,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 /**
  * 化学品申购详情对象 act_hxpapply_detail

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpAlarmConfig.java

@@ -2,10 +2,10 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpAlarmRecord.java

@@ -5,10 +5,10 @@ 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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpCabinet.java

@@ -2,10 +2,10 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpCabinetlockLog.java

@@ -2,7 +2,7 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 /**
  * 【请填写功能名称】对象 hxp_cabinetlock_log

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpChemical.java

@@ -2,10 +2,10 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpChemicalClassify.java

@@ -2,10 +2,10 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 化学品分类对象 hxp_chemical_classify

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpChemicalJoinCabinet.java

@@ -3,10 +3,10 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpClassifyConfig.java

@@ -1,7 +1,7 @@
 package com.zd.chemical.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 org.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpSmartTerminal.java

@@ -2,10 +2,10 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import org.hibernate.validator.constraints.Length;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpSmartTerminalConfig.java

@@ -2,14 +2,14 @@ package com.zd.chemical.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 
 /**
  * 报警硬件控制时长配置对象 hxp_smart_terminal_config
- * 
+ *
  * @author liubo
  * @date 2022-06-28
  */
@@ -37,48 +37,48 @@ public class HxpSmartTerminalConfig extends BaseEntity
     @Excel(name = "处理时长", readConverterExp = "单=位分钟")
     @ApiModelProperty(value = "处理时长")
     private Integer dealTime;
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setTerminalId(Long terminalId) 
+    public void setTerminalId(Long terminalId)
     {
         this.terminalId = terminalId;
     }
 
-    public Long getTerminalId() 
+    public Long getTerminalId()
     {
         return terminalId;
     }
-    public void setSubId(Long subId) 
+    public void setSubId(Long subId)
     {
         this.subId = subId;
     }
 
-    public Long getSubId() 
+    public Long getSubId()
     {
         return subId;
     }
-    public void setRingTime(Integer ringTime) 
+    public void setRingTime(Integer ringTime)
     {
         this.ringTime = ringTime;
     }
 
-    public Integer getRingTime() 
+    public Integer getRingTime()
     {
         return ringTime;
     }
-    public void setDealTime(Integer dealTime) 
+    public void setDealTime(Integer dealTime)
     {
         this.dealTime = dealTime;
     }
 
-    public Integer getDealTime() 
+    public Integer getDealTime()
     {
         return dealTime;
     }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpStock.java

@@ -1,8 +1,8 @@
 package com.zd.chemical.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 org.hibernate.validator.constraints.Length;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/HxpUserecord.java

@@ -1,9 +1,9 @@
 package com.zd.chemical.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.valid.ValidGroup;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
+import com.zd.model.valid.ValidGroup;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/SydSmsLog.java

@@ -3,7 +3,7 @@ package com.zd.chemical.domain;
 import javax.validation.constraints.NotBlank;
 
 import org.hibernate.validator.constraints.Length;
-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;
@@ -11,7 +11,7 @@ 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 com.zd.model.entity.BaseEntity;
 
 /**
  * 四医大校方短信对接日志对象 syd_sms_log

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActApplytaskNodeVo.java

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

@@ -1,8 +1,8 @@
 package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.ActHxpapplyDetail;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/ActAuditconfigInfoVo.java

@@ -2,8 +2,8 @@ package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.chemical.domain.ActApplytaskNode;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/ActAudituserVo.java

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

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

@@ -2,8 +2,8 @@ package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.ActApplytask;
 import com.zd.chemical.domain.ActHxpapplyDetail;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplyListVo.java

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

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplySearch.java

@@ -1,6 +1,6 @@
 package com.zd.chemical.domain.vo;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplyVo.java

@@ -1,8 +1,8 @@
 package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.ActHxpapplyDetail;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/AioCabinetLockVo.java

@@ -1,6 +1,6 @@
 package com.zd.chemical.domain.vo;
 
-import com.zd.common.core.enums.LockTypeEnum;
+import com.zd.model.enums.LockTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpAlarmConfigVo.java

@@ -1,8 +1,8 @@
 package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.HxpAlarmConfig;
-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.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpAlarmRecordSearch.java

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

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

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

@@ -1,6 +1,6 @@
 package com.zd.chemical.domain.vo;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetVo.java

@@ -2,8 +2,8 @@ package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-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.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetlockLogSearch.java

@@ -1,8 +1,8 @@
 package com.zd.chemical.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 lombok.Data;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetlockLogVo.java

@@ -1,8 +1,8 @@
 package com.zd.chemical.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 lombok.Data;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalByExcel.java

@@ -1,7 +1,7 @@
 package com.zd.chemical.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 org.hibernate.validator.constraints.Length;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalJoinCabinetGrandSon.java

@@ -1,7 +1,7 @@
 package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.HxpChemicalJoinCabinet;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalJoinCabinetListVo.java

@@ -1,8 +1,8 @@
 package com.zd.chemical.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.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalJoinCabinetSon.java

@@ -1,7 +1,7 @@
 package com.zd.chemical.domain.vo;
 
 import com.zd.chemical.domain.HxpChemicalJoinCabinet;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalJoinCabinetVo.java

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

@@ -1,6 +1,6 @@
 package com.zd.chemical.domain.vo;
 
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalVo.java

@@ -3,8 +3,8 @@ package com.zd.chemical.domain.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zd.chemical.domain.HxpChemical;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/HxpSmartTerminalByExcel.java

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

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpSmartTerminalSearch.java

@@ -1,7 +1,7 @@
 package com.zd.chemical.domain.vo;
 
-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.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpSmartTerminalVo.java

@@ -2,8 +2,8 @@ package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-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.apache.commons.lang3.builder.ToStringBuilder;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpStockDetailVO.java

@@ -1,16 +1,10 @@
 package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.valid.ValidGroup;
-import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpStockJoinVO.java

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

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

@@ -2,8 +2,8 @@ package com.zd.chemical.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.chemical.domain.HxpUserecord;
-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-chemical/src/main/java/com/zd/chemical/domain/vo/HxpStockVO.java

@@ -3,7 +3,7 @@ package com.zd.chemical.domain.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.chemical.domain.HxpClassifyConfig;
 import com.zd.chemical.domain.HxpUserecord;
-import com.zd.common.core.annotation.Excel;
+import com.zd.model.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpUserecordSearch.java

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

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpUserecordVo.java

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

zd-modules/zd-chemical/src/main/java/com/zd/chemical/mapper/HxpCabinetMapper.java

@@ -1,12 +1,12 @@
 package com.zd.chemical.mapper;
 
-import java.util.List;
-
 import com.zd.chemical.domain.HxpCabinet;
 import com.zd.chemical.domain.vo.*;
-import com.zd.system.api.laboratory.CabinetV2Lock;
+import com.zd.laboratory.api.entity.CabinetV2Lock;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 化学品机柜管理信息Mapper接口
  *

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

@@ -1,11 +1,10 @@
 package com.zd.chemical.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.zd.chemical.domain.HxpCabinet;
 import com.zd.chemical.domain.vo.*;
-import com.zd.system.api.laboratory.CabinetV2Lock;
+import com.zd.laboratory.api.entity.CabinetV2Lock;
+
+import java.util.List;
 
 /**
  * 化学品机柜管理信息Service接口

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

@@ -1,12 +1,13 @@
 package com.zd.chemical.service;
 
-import java.util.List;
 import com.zd.chemical.domain.HxpStock;
 import com.zd.chemical.domain.vo.HxpStockDetailVO;
 import com.zd.chemical.domain.vo.HxpStockJoinVO;
 import com.zd.chemical.domain.vo.HxpStockOutVO;
 import com.zd.chemical.domain.vo.HxpStockSearch;
-import com.zd.system.api.domain.InventoryTag;
+import com.zd.laboratory.api.vo.InventoryTag;
+
+import java.util.List;
 
 /**
  * 库存管理Service接口

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

@@ -1,36 +1,32 @@
 package com.zd.chemical.service.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.atomic.LongAdder;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import com.alibaba.nacos.shaded.org.checkerframework.checker.nullness.Opt;
+import com.zd.chemical.domain.ActApplytask;
 import com.zd.chemical.domain.ActApplytaskNode;
 import com.zd.chemical.domain.ActHxpapply;
 import com.zd.chemical.domain.ActHxpapplyDetail;
 import com.zd.chemical.domain.vo.ActApplytaskVo;
 import com.zd.chemical.domain.vo.ActHxpapplyInfoVo;
+import com.zd.chemical.mapper.ActApplytaskMapper;
 import com.zd.chemical.mapper.ActApplytaskNodeMapper;
 import com.zd.chemical.mapper.ActHxpapplyDetailMapper;
 import com.zd.chemical.mapper.ActHxpapplyMapper;
+import com.zd.chemical.service.IActApplytaskService;
 import com.zd.common.core.exception.ServiceException;
-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.StringUtils;
-import com.zd.common.security.utils.SaveUtil;
-
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.LabMessageContent;
+import com.zd.laboratory.api.entity.LabMessageContent;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.zd.chemical.mapper.ActApplytaskMapper;
-import com.zd.chemical.domain.ActApplytask;
-import com.zd.chemical.service.IActApplytaskService;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * 化学品申购任务Service业务层处理

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

@@ -9,7 +9,7 @@ import com.zd.chemical.mapper.ActAudituserMapper;
 import com.zd.chemical.service.IActAuditconfigService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,38 +1,32 @@
 package com.zd.chemical.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.atomic.LongAdder;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import cn.hutool.core.util.NumberUtil;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.nullness.Opt;
 import com.zd.chemical.domain.*;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.*;
 import com.zd.chemical.service.IActAuditconfigService;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.chemical.service.IActHxpapplyService;
+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.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
-
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.LabMessageContent;
-import org.apache.poi.ss.formula.functions.T;
+import com.zd.laboratory.api.entity.LabMessageContent;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.model.domain.per.PerPrefix;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.zd.chemical.service.IActHxpapplyService;
 
-import javax.swing.text.html.Option;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * 化学品申购Service业务层处理

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

@@ -6,7 +6,7 @@ import java.util.Optional;
 
 import com.zd.chemical.domain.vo.HxpAlarmConfigVo;
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -12,11 +12,11 @@ import com.zd.chemical.domain.vo.HxpAlarmRecordSearch;
 import com.zd.chemical.domain.vo.HxpAlarmRecordVo;
 import com.zd.chemical.mapper.HxpUserecordMapper;
 import com.zd.chemical.util.SmsSydUtil;
-import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.core.annotation.DataScope;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,31 +1,28 @@
 package com.zd.chemical.service.impl;
 
-import java.util.*;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
+import com.zd.algorithm.api.camera.feign.RemoteCameraService;
+import com.zd.chemical.domain.HxpCabinet;
 import com.zd.chemical.domain.HxpCabinetlockLog;
 import com.zd.chemical.domain.vo.*;
+import com.zd.chemical.mapper.HxpCabinetMapper;
 import com.zd.chemical.mapper.HxpCabinetlockLogMapper;
+import com.zd.chemical.service.IHxpCabinetService;
 import com.zd.chemical.service.IHxpCabinetlockLogService;
-import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.enums.LockTypeEnum;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
 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.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
-
 import com.zd.common.swagger.config.AppListener;
-import com.zd.system.api.camera.RemoteCameraService;
-import com.zd.system.api.laboratory.CabinetV2Lock;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.RemoteSubQueryService;
-import com.zd.system.api.laboratory.domain.CabinetLock;
+import com.zd.laboratory.api.entity.CabinetLock;
+import com.zd.laboratory.api.entity.CabinetV2Lock;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteSubQueryService;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.enums.LockTypeEnum;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
@@ -35,9 +32,11 @@ import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombi
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.chemical.mapper.HxpCabinetMapper;
-import com.zd.chemical.domain.HxpCabinet;
-import com.zd.chemical.service.IHxpCabinetService;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * 化学品机柜管理信息Service业务层处理

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

@@ -7,7 +7,7 @@ import com.zd.chemical.domain.vo.HxpCabinetlockLogSearch;
 import com.zd.chemical.domain.vo.HxpCabinetlockLogVo;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -3,7 +3,7 @@ package com.zd.chemical.service.impl;
 import java.util.List;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,27 +1,24 @@
 package com.zd.chemical.service.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.atomic.LongAdder;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
+import com.zd.chemical.domain.HxpChemicalJoinCabinet;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.HxpChemicalJoinCabinetMapper;
 import com.zd.chemical.mapper.HxpClassifyConfigMapper;
+import com.zd.chemical.service.IHxpChemicalJoinCabinetService;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.common.security.utils.SaveUtil;
-
-import com.zd.system.api.domain.SysDictData;
+import com.zd.common.core.utils.DictUtils;
+import com.zd.common.core.utils.SaveUtil;
+import com.zd.system.api.entity.SysDictData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.chemical.domain.HxpChemicalJoinCabinet;
-import com.zd.chemical.service.IHxpChemicalJoinCabinetService;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.ServletException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * 化学品和机柜关联Service业务层处理

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

@@ -1,8 +1,9 @@
 package com.zd.chemical.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
+import com.zd.algorithm.api.alarm.entity.AlarmEntrty;
+import com.zd.algorithm.api.alarm.entity.Routes;
+import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.chemical.domain.HxpAlarmRecord;
 import com.zd.chemical.domain.HxpChemical;
 import com.zd.chemical.domain.HxpChemicalClassify;
@@ -14,21 +15,11 @@ import com.zd.chemical.mapper.HxpChemicalMapper;
 import com.zd.chemical.mapper.HxpUserecordMapper;
 import com.zd.chemical.service.IHxpChemicalService;
 import com.zd.chemical.util.SmsSydUtil;
-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.utils.DateUtils;
-import com.zd.common.core.utils.Pinyin4jUtil;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.common.security.utils.SaveUtil;
-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.SysDictData;
+import com.zd.common.core.utils.*;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.system.api.entity.SysDictData;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;

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

@@ -1,29 +1,21 @@
 package com.zd.chemical.service.impl;
 
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.zd.chemical.domain.HxpChemical;
-import com.zd.chemical.domain.HxpChemicalClassify;
-import com.zd.chemical.domain.vo.*;
-import com.zd.common.core.domain.R;
+import com.zd.chemical.domain.HxpSmartTerminal;
+import com.zd.chemical.domain.vo.HxpSmartTerminalByExcel;
+import com.zd.chemical.domain.vo.HxpSmartTerminalSearch;
+import com.zd.chemical.domain.vo.HxpSmartTerminalVo;
+import com.zd.chemical.mapper.HxpSmartTerminalMapper;
+import com.zd.chemical.service.IHxpSmartTerminalService;
 import com.zd.common.core.exception.ServiceException;
 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.StringUtils;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.common.security.utils.SaveUtil;
-
-import com.zd.system.api.domain.SysDictData;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.RemoteSubQueryService;
-import com.zd.system.api.laboratory.domain.LabSubjectVO;
+import com.zd.laboratory.api.feign.RemoteSubQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.chemical.mapper.HxpSmartTerminalMapper;
-import com.zd.chemical.domain.HxpSmartTerminal;
-import com.zd.chemical.service.IHxpSmartTerminalService;
-import com.zd.common.core.utils.SecurityUtils;
+
+import java.util.*;
 
 /**
  * 化学品设备管理Service业务层处理

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

@@ -2,33 +2,36 @@ package com.zd.chemical.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
+import com.zd.algorithm.api.alarm.entity.AlarmEntrty;
+import com.zd.algorithm.api.alarm.entity.Routes;
+import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
+import com.zd.algorithm.api.forward.feign.RemoteForwardService;
+import com.zd.algorithm.api.netty.feign.RemoteNettyService;
+import com.zd.model.entity.SysFile;
 import com.zd.chemical.controller.HxpAIOController;
 import com.zd.chemical.domain.*;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.*;
 import com.zd.chemical.properties.AlarmProperties;
-import com.zd.chemical.service.*;
+import com.zd.chemical.service.IHxpChemicalJoinCabinetService;
+import com.zd.chemical.service.IHxpClassifyConfigService;
+import com.zd.chemical.service.IHxpStockService;
+import com.zd.chemical.service.IHxpUserecordService;
 import com.zd.chemical.util.SmsSydUtil;
-import com.zd.common.core.domain.R;
-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.utils.DateUtils;
+import com.zd.common.core.utils.DictUtils;
+import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.DictUtils;
-import com.zd.common.security.utils.SaveUtil;
-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.domain.InventoryTag;
-import com.zd.system.api.domain.SysDictData;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.forward.RemoteForwardService;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.RemoteMessageContentService;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
-import com.zd.system.api.netty.RemoteNettyService;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
+import com.zd.laboratory.api.feign.RemoteMessageContentService;
+import com.zd.laboratory.api.vo.InventoryTag;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.RemoteLabHardware;
+import com.zd.system.api.entity.SysDictData;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

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

@@ -1,5 +1,7 @@
 package com.zd.chemical.service.impl;
 
+import com.zd.algorithm.api.face.feign.FaceCompare;
+import com.zd.algorithm.api.face.feign.RemoteFaceService;
 import com.zd.chemical.domain.*;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.HxpAlarmRecordMapper;
@@ -8,28 +10,25 @@ import com.zd.chemical.mapper.HxpStockMapper;
 import com.zd.chemical.mapper.HxpUserecordMapper;
 import com.zd.chemical.service.IHxpClassifyConfigService;
 import com.zd.chemical.service.IHxpUserecordService;
-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.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
 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.StringUtils;
-import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.utils.SaveUtil;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.face.FaceCompare;
-import com.zd.system.api.face.RemoteFaceService;
-import com.zd.system.api.laboratory.RemoteMessageContentService;
+import com.zd.laboratory.api.feign.RemoteMessageContentService;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.constant.SecurityConstants;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.SysUser;
+import com.zd.system.api.feign.RemoteUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 /**

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

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.security.utils.SaveUtil;
+import com.zd.common.core.utils.SaveUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;