【修改】 更新优化响应类

zd-common/pom.xml

@@ -17,7 +17,8 @@
         <module>zd-common-redis</module>
         <module>zd-common-swagger</module>
         <module>zd-common-security</module>
-		<module>zd-common-datasource</module>
+        <module>zd-common-datascope</module>
+	<module>zd-common-datasource</module>
         <module>zd-common-mqtt</module>
     </modules>
 

zd-common/zd-common-datascope/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.zd</groupId>
+        <artifactId>zd-common</artifactId>
+        <version>3.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zd-common-datascope</artifactId>
+
+    <description>
+        zd-common-datascope权限范围
+    </description>
+
+    <dependencies>
+
+        <!-- zd Common Security -->
+        <dependency>
+            <groupId>com.zd</groupId>
+            <artifactId>zd-common-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+    </dependencies>
+</project>

zd-common/zd-common-datascope/src/main/java/com/zd/common/datascope/annotation/DataScope.java

@@ -0,0 +1,37 @@
+package com.zd.common.datascope.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 数据权限过滤注解
+ *
+ * @author zd
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataScope {
+    /**
+     * 部门表的别名
+     */
+    public String deptAlias() default "";
+
+    /**
+     * 用户表的别名
+     */
+    public String userAlias() default "";
+
+    /**
+     * 是否应用实验室负责人
+     */
+    public boolean subAdmin() default false;
+
+    /**
+     * 权限模块
+     */
+    public String permi() default "";
+}

zd-common/zd-common-datascope/src/main/java/com/zd/common/datascope/aspect/DataScopeAspect.java

@@ -0,0 +1,250 @@
+package com.zd.common.datascope.aspect;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+
+import com.zd.common.core.constant.UserConstants;
+import com.zd.common.core.domain.per.PerFun;
+import com.zd.common.core.exception.CheckedException;
+import com.zd.common.core.exception.PreAuthorizeException;
+import com.zd.common.core.exception.ServiceException;
+import com.zd.system.api.domain.SysPermitInfo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.common.core.web.domain.BaseEntity;
+import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.security.service.TokenService;
+import com.zd.system.api.domain.SysRole;
+import com.zd.system.api.domain.SysUser;
+import com.zd.system.api.model.LoginUser;
+
+/**
+ * 数据过滤处理
+ *
+ * @author zd
+ */
+@Aspect
+@Component
+public class DataScopeAspect {
+    /**
+     * 全部数据权限
+     */
+    public static final String DATA_SCOPE_ALL = "1";
+
+    /**
+     * 自定数据权限
+     */
+    public static final String DATA_SCOPE_CUSTOM = "2";
+
+    /**
+     * 部门数据权限
+     */
+    public static final String DATA_SCOPE_DEPT = "3";
+
+    /**
+     * 部门及以下数据权限
+     */
+    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+    /**
+     * 仅本人数据权限
+     */
+    public static final String DATA_SCOPE_SELF = "5";
+
+    /**
+     * 数据权限过滤关键字
+     */
+    public static final String DATA_SCOPE = "dataScope";
+
+    @Autowired
+    private TokenService tokenService;
+
+    // 配置织入点
+    @Pointcut("@annotation(com.zd.common.datascope.annotation.DataScope)")
+    public void dataScopePointCut() {
+    }
+
+    @Before("dataScopePointCut()")
+    public void doBefore(JoinPoint point) throws Throwable {
+        clearDataScope(point);
+        handleDataScope(point);
+    }
+
+    protected void handleDataScope(final JoinPoint joinPoint) {
+        // 获得注解
+        DataScope controllerDataScope = getAnnotationLog(joinPoint);
+        if (controllerDataScope == null) {
+            return;
+        }
+        // 获取当前的用户
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (StringUtils.isNotNull(loginUser)) {
+            SysUser currentUser = loginUser.getSysUser();
+            // 如果是超级管理员，则不过滤数据
+            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin() && UserConstants.USER_LOGIN_PC == loginUser.getLoginType()) {
+                dataScopeNewFilter(joinPoint, currentUser, controllerDataScope);
+            }
+        }
+    }
+
+    @Deprecated
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, boolean isSubAdmin) {
+        StringBuilder sqlString = new StringBuilder();
+        Boolean f = true;
+        for (SysRole role : user.getRoles()) {
+            String dataScope = role.getDataScope();
+            if (DATA_SCOPE_ALL.equals(dataScope)) {
+                sqlString = new StringBuilder();
+                f = false;
+                break;
+            } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
+                sqlString.append(StringUtils.format(
+                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
+                        role.getRoleId()));
+            } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
+                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+            } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
+                sqlString.append(StringUtils.format(
+                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                        deptAlias, user.getDeptId(), user.getDeptId()));
+            } else if (DATA_SCOPE_SELF.equals(dataScope)) {
+                if (StringUtils.isNotBlank(userAlias)) {
+                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+                } else {
+                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
+                    sqlString.append(" OR 1=0 ");
+                }
+            }
+        }
+        if (f && isSubAdmin) {
+            sqlString.append(StringUtils.format(" OR {}.admin_id = {} ", userAlias, user.getUserId()));
+        }
+        if (StringUtils.isNotBlank(sqlString.toString())) {
+            Object params = joinPoint.getArgs()[0];
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+                BaseEntity baseEntity = (BaseEntity) params;
+                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+            }
+        }
+    }
+
+    /**
+     * 2.6需求变动数据范围过滤
+     *
+     * @param joinPoint  切点
+     * @param user       用户
+     * @param controllerDataScope  权限注解
+     */
+    public static void dataScopeNewFilter(JoinPoint joinPoint, SysUser user, DataScope controllerDataScope) {
+        StringBuilder sqlString = new StringBuilder();
+        Boolean f = true;
+
+        String deptAlias = controllerDataScope.deptAlias();
+        String userAlias = controllerDataScope.userAlias();
+        if(org.apache.commons.lang3.StringUtils.isBlank(controllerDataScope.permi())){
+            System.err.println("\r\n" + joinPoint.getSignature().getName() + "()方法： 未添加模块注解，请尽快补充！！！" + "\r\n");
+            return;
+        }
+
+        List<SysPermitInfo> permits = user.getPermits();
+        if(CollectionUtils.isEmpty(permits)){
+            throw new PreAuthorizeException();
+        }
+
+        String finalPermi = controllerDataScope.permi() + PerFun.LIST;
+        SysPermitInfo permitInfo = permits.stream().filter(a -> finalPermi.equals(a.getMenuPerms())).findFirst().orElse(null);
+        if(permitInfo == null){
+            return;
+        }
+
+        // 1：全部数据权限
+        String dataScope = permitInfo.getDataScope() + "";
+        if (DATA_SCOPE_ALL.equals(dataScope)) {
+            sqlString = new StringBuilder();
+            f = false;
+        } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
+            // 2：本部门以及下级部门
+            sqlString.append(StringUtils.format(
+                    " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                    deptAlias, user.getDeptId(), user.getDeptId()));
+        } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
+            // 3：本部门以及指定部门（指定部门关联表中查询）
+            List<Long> deptIds = permitInfo.getDeptIds();
+            if(CollectionUtils.isEmpty(deptIds)){
+                // TODO 数据问题暂这样处理
+                throw new PreAuthorizeException();
+            }else {
+
+                StringBuffer sb = new StringBuffer();
+                for (Long deptId : deptIds) {
+                    sb.append("\'").append(deptId).append("\'").append(",");
+                }
+                sqlString.append(StringUtils.format(
+                        " OR {}.dept_id IN ( {} ) ", deptAlias, sb.substring(0, sb.length()-1)));
+            }
+
+        } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
+            // 4：仅本人
+            if (StringUtils.isNotBlank(userAlias)) {
+                sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+            } else {
+                // 数据权限为仅本人且没有userAlias别名不查询任何数据
+                sqlString.append(" OR 1=0 ");
+            }
+        }
+
+        /*if (f && controllerDataScope.subAdmin()) {
+            sqlString.append(StringUtils.format(" OR {}.admin_id = {} ", userAlias, user.getUserId()));
+        }*/
+
+        if (StringUtils.isNotBlank(sqlString.toString())) {
+            Predicate<JoinPoint> predicate = x-> x.getArgs().length>0;
+            if(predicate.test(joinPoint)) {
+                Object params = joinPoint.getArgs()[0];
+                if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+                    BaseEntity baseEntity = (BaseEntity) params;
+                    baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+                }
+            }
+        }
+    }
+
+    /**
+     * 是否存在注解，如果存在就获取
+     */
+    private DataScope getAnnotationLog(JoinPoint joinPoint) {
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = (MethodSignature) signature;
+        Method method = methodSignature.getMethod();
+
+        if (method != null) {
+            return method.getAnnotation(DataScope.class);
+        }
+        return null;
+    }
+
+    /**
+     * 拼接权限sql前先清空params.dataScope参数防止注入
+     */
+    private void clearDataScope(final JoinPoint joinPoint) {
+        Predicate<JoinPoint> predicate = x-> x.getArgs().length>0;
+        if(predicate.test(joinPoint)){
+            Object params = joinPoint.getArgs()[0];
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+                BaseEntity baseEntity = (BaseEntity) params;
+                baseEntity.getParams().put(DATA_SCOPE, "");
+            }
+        }
+
+    }
+}

zd-modules/zd-airbottle/pom.xml

@@ -93,10 +93,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-resultdata</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>

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

@@ -6,16 +6,15 @@ import com.zd.airbottle.domain.dto.QpAirBottleDto;
 import com.zd.airbottle.domain.vo.QpAirBottleRVo;
 import com.zd.airbottle.service.IQpAirBottleService;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import java.util.List;
 

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

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

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

@@ -9,17 +9,16 @@ import com.zd.airbottle.service.IQpAirGoogsService;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import java.util.List;
 

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

@@ -11,17 +11,16 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;

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

@@ -6,17 +6,16 @@ import com.zd.airbottle.service.IQpBottleStorageErrorService;
 import com.zd.common.core.utils.bean.TransferUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

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

@@ -10,16 +10,15 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -11,6 +11,7 @@ import com.zd.airbottle.domain.vo.QpBottleStorageOutVO;
 import com.zd.airbottle.domain.vo.QpTransportUserVo;
 import com.zd.airbottle.service.*;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.common.core.web.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +21,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.core.web.controller.BaseController;
@@ -28,7 +28,6 @@ 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.core.web.page.TableDataInfo;
 
 /**

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

@@ -14,16 +14,15 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -5,6 +5,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zd.airbottle.domain.vo.QpFlowVO;
+import com.zd.common.core.web.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,7 +15,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.zd.airbottle.domain.vo.QpFlowDetailVO;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.web.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,7 +17,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -10,10 +10,10 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
 import com.zd.system.api.laboratory.RemoteLaboratoryService;
@@ -22,7 +22,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -13,10 +13,10 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;

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

@@ -5,10 +5,10 @@ import com.zd.airbottle.service.IQpQualificationCertificateService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -6,16 +6,15 @@ import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

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

@@ -5,17 +5,16 @@ import com.zd.airbottle.domain.dto.QpSpecificationDto;
 import com.zd.airbottle.domain.vo.QpSpecificationVo;
 import com.zd.airbottle.service.IQpSpecificationService;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**

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

@@ -11,10 +11,10 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.system.api.dto.SysUserDto;
 import io.swagger.annotations.Api;
@@ -23,7 +23,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;

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

@@ -6,16 +6,15 @@ import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

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

@@ -6,17 +6,16 @@ import com.zd.airbottle.domain.vo.QpSupplierSyntheticalAuditVo;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**

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

@@ -9,10 +9,10 @@ import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
 import io.swagger.annotations.Api;
@@ -21,7 +21,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -9,10 +9,10 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
@@ -20,7 +20,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

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

@@ -5,10 +5,10 @@ import com.zd.airbottle.domain.dto.QpTransportCarDto;
 import com.zd.airbottle.domain.vo.QpTransportCarVo;
 import com.zd.airbottle.service.IQpTransportCarService;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -5,17 +5,16 @@ import com.zd.airbottle.domain.dto.QpTransportUserDto;
 import com.zd.airbottle.domain.vo.QpTransportUserVo;
 import com.zd.airbottle.service.IQpTransportUserService;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**

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

@@ -11,10 +11,10 @@ import com.zd.airbottle.service.IQpUseRecordService;
 import com.zd.common.core.utils.DateUtils;
 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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
@@ -23,7 +23,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;

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

@@ -11,6 +11,7 @@ import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.service.IQpFlowDetailService;
 import com.zd.airbottle.service.IQpUsegasAuditRecordService;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.airbottle.service.IQpUsegasApplyService;
@@ -32,7 +32,6 @@ 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;
 
 /**

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

@@ -16,10 +16,10 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.common.swagger.config.Knife4jConfiguration;

zd-modules/zd-base/pom.xml

@@ -58,11 +58,6 @@
             <groupId>com.zd</groupId>
             <artifactId>zd-common-log</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-resultdata</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

zd-modules/zd-base/src/main/java/com/zd/base/message/controller/UserOpenIdController.java

@@ -6,10 +6,10 @@ import com.zd.common.core.domain.R;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

zd-modules/zd-base/src/main/java/com/zd/base/message/controller/WechatMsgController.java

@@ -3,7 +3,7 @@ package com.zd.base.message.controller;
 import com.zd.base.message.service.IWechatMsgSendService;
 import com.zd.common.core.domain.R;
 import com.zd.common.core.template.TemplateResult;
-import com.zd.common.response.ResultData;
+import com.zd.common.core.web.domain.ResultData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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

@@ -35,11 +35,5 @@
             <groupId>com.zd</groupId>
             <artifactId>zd-common-swagger</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-resultdata</artifactId>
-        </dependency>
     </dependencies>
-
 </project>

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

@@ -12,16 +12,15 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -71,7 +70,6 @@ public class BottleStorageController extends BaseController<BottleStorage> {
         return ResultData.result(bottleStorageService.add(bottleStorage));
     }
 
-
     /***
      * 入库详情
      * @param id

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

@@ -8,16 +8,15 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.bean.TransferUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

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

@@ -5,18 +5,16 @@ import com.zd.bottle.domain.BottleStorageOut;
 import com.zd.bottle.service.BottleStorageOutService;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
-
-import javax.annotation.Resource;
 import java.util.List;
 
 /**

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

@@ -10,16 +10,14 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

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

@@ -13,10 +13,10 @@ import com.zd.common.core.utils.DateUtils;
 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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -13,8 +13,8 @@ import com.zd.common.core.domain.per.PerPrefix;
 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.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.common.security.utils.SaveUtil;
@@ -25,7 +25,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
 import java.util.List;
 

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

@@ -1,21 +1,17 @@
 package com.zd.bottle.controller;
 
-import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.domain.UsegasAuditRecord;
 import com.zd.bottle.service.UsegasAuditRecordService;
-import com.zd.bottle.vo.UsegasApplyVo;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.hadoop.classification.InterfaceAudience;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
-
 import java.util.List;
 
 /**

zd-modules/zd-chemical/pom.xml

@@ -74,11 +74,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-resultdata</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>

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

@@ -7,6 +7,7 @@ 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;
@@ -16,7 +17,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -3,6 +3,8 @@ 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;
@@ -12,7 +14,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -7,6 +7,7 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,7 +17,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -3,6 +3,8 @@ 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;
@@ -12,7 +14,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -11,9 +11,9 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -3,6 +3,8 @@ 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;
@@ -12,7 +14,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -7,10 +7,10 @@ import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -4,17 +4,14 @@ import java.util.*;
 import java.io.IOException;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
-
 import com.zd.chemical.domain.vo.HxpAlarmRecordSearch;
 import com.zd.chemical.domain.vo.HxpAlarmRecordVo;
-import com.zd.chemical.domain.vo.HxpUserecordSearch;
 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.utils.StringUtils;
+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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -11,9 +11,9 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -8,6 +8,7 @@ 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;
@@ -17,7 +18,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -5,6 +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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,19 +15,15 @@ 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.response.ResultData;
 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.HxpChemicalClassify;
 import com.zd.chemical.service.IHxpChemicalClassifyService;
 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;
 
 /**

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

@@ -8,7 +8,6 @@ import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.map.MapUtil;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpChemicalJoinCabinetService;
 import com.zd.common.core.domain.R;
@@ -16,13 +15,10 @@ 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.utils.SecurityUtils;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.redis.service.RedisService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.domain.SysUserTeaCherByExcel;
-import com.zd.system.api.domain.SysUserTeaCherByExport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;
@@ -168,7 +164,6 @@ public class HxpChemicalController extends BaseController {
         return ResultData.success(hxpChemicalService.selectHxpChemicalById(id));
     }
 
-
     /**
      * 获取化学品信息详细信息(学生端专用)
      */

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

@@ -10,6 +10,7 @@ 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.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.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,7 +20,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -7,6 +7,7 @@ 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;
@@ -16,7 +17,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -8,14 +8,13 @@ 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.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -17,13 +17,13 @@ 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.utils.StringUtils;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.redis.service.RedisService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

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

@@ -13,10 +13,10 @@ import com.zd.common.core.domain.per.PerPrefix;
 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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.InventoryTag;

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

@@ -9,10 +9,10 @@ import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import io.swagger.annotations.Api;

zd-modules/zd-common-face/pom.xml

@@ -61,10 +61,6 @@
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/main/resources/libs/arcsoft-sdk-face-3.0.0.0.jar</systemPath>
         </dependency>
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-resultdata</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>

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

@@ -5,7 +5,7 @@ import com.arcsoft.face.FaceInfo;
 import com.arcsoft.face.toolkit.ImageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.domain.R;
-import com.zd.common.response.ResultData;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.face.utils.FileUtil;
 import com.zd.system.api.face.FaceCompare;
@@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.io.*;
 import java.util.List;
 

zd-modules/zd-modules-laboratory/pom.xml

@@ -101,10 +101,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-resultdata</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/ApkMachineconfigController.java

@@ -7,6 +7,7 @@ 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;
@@ -16,7 +17,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabAudioSynthesisController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 
 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;
@@ -16,7 +17,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabBlacklistController.java

@@ -7,13 +7,12 @@ import com.zd.common.core.utils.bean.BeanUtils;
 import com.zd.common.core.valid.ValidGroup;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
-import com.zd.laboratory.domain.LabBlackdetail;
 import com.zd.laboratory.domain.LabBlacklist;
 import com.zd.laboratory.domain.dto.LabBlacklistAdd;
 import com.zd.laboratory.domain.dto.LabBlacklistDTO;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabBuildingController.java

@@ -5,10 +5,10 @@ import com.zd.common.core.enums.HardwareTypeEnum;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.laboratory.domain.LabBuilding;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.domain.LabSensor;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCeditScoreSiteController.java

@@ -3,9 +3,9 @@ package com.zd.laboratory.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
-
 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;
@@ -15,7 +15,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;
@@ -26,8 +25,6 @@ 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;
 
 /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckConfigController.java

@@ -4,9 +4,9 @@ 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.web.controller.BaseController;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabCheckConfig;
 import com.zd.laboratory.service.ILabCheckConfigService;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckOptionController.java

@@ -6,10 +6,10 @@ import com.zd.common.core.domain.per.PerPrefix;
 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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabCheckOption;
 import com.zd.laboratory.domain.vo.LabCheckOptionExcelVo;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordController.java

@@ -4,7 +4,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
-
 import com.zd.common.core.constant.SecurityConstants;
 import com.zd.common.core.constant.UserConstants;
 import com.zd.common.core.domain.R;
@@ -13,6 +12,7 @@ import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.*;
 import com.zd.laboratory.domain.vo.LabCheckRecordDetailsVO;
@@ -30,7 +30,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;
@@ -39,7 +38,6 @@ 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.core.web.page.TableDataInfo;
 
 /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordDetailsController.java

@@ -11,6 +11,7 @@ import com.zd.common.core.constant.UserConstants;
 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 com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.LabCheckRecord;
 import com.zd.laboratory.domain.LabCheckRecordDetailslog;
@@ -30,7 +31,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordDetailslogController.java

@@ -7,10 +7,10 @@ import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.*;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordReleaseController.java

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.LabCheckRecord;
 import com.zd.laboratory.domain.vo.LabCheckRecordReleaseVO;
@@ -24,7 +25,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabConfigController.java

@@ -3,7 +3,7 @@ package com.zd.laboratory.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.domain.R;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.response.ResultData;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabConfig;
 import com.zd.laboratory.service.ILabConfigService;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabContentMachineMsgController.java

@@ -13,7 +13,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabExitLightController.java

@@ -7,6 +7,7 @@ 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 com.zd.laboratory.domain.vo.LabExitLightVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,7 +18,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabExitLineController.java

@@ -7,6 +7,7 @@ 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 com.zd.laboratory.domain.vo.LabExitLineJoinVO;
 import com.zd.laboratory.domain.vo.LabExitLineVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabGradeManageController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 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.web.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +16,7 @@ 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.response.ResultData;
+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;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabGradeManageRecordController.java

@@ -3,10 +3,10 @@ package com.zd.laboratory.controller;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.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.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.service.ILabGradeManageRecordService;
 import com.zd.system.api.laboratory.domain.LabGradeManageRecord;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHardwareController.java

@@ -12,11 +12,11 @@ import com.zd.common.core.utils.bean.TransferUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.redis.service.RedisService;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.LabHardware;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHazardBookController.java

@@ -4,10 +4,10 @@ import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabHazardBook;
 import com.zd.laboratory.service.ILabHazardBookService;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHazardController.java

@@ -6,17 +6,16 @@ import com.zd.common.core.enums.HazardTypeEnum;
 import com.zd.common.core.valid.ValidGroup;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabHazard;
 import com.zd.laboratory.domain.LabQpSubjectRelation;
 import com.zd.laboratory.domain.dto.LabHazardDTO;
 import com.zd.laboratory.domain.dto.LabHazardJoinSubDTO;
 import com.zd.laboratory.domain.dto.LabHazardNewVo;
-import com.zd.laboratory.domain.vo.LabHazardBigViewVO;
 import com.zd.laboratory.domain.vo.LabHazardColumnarVO;
 import com.zd.laboratory.domain.vo.LabHazardSubVO;
 import com.zd.laboratory.domain.vo.LabHazardVO;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabMessageContentController.java

@@ -7,17 +7,16 @@ import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.valid.ValidGroup;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.vo.LiteMessageNoticeVO;
 import com.zd.laboratory.mapper.LabMessageUserMapper;
 import com.zd.system.api.laboratory.domain.LabMessageContent;
 import com.zd.system.api.laboratory.domain.LabMessageUser;
-import com.zd.laboratory.domain.dto.LabMessageContentDTO;
 import com.zd.laboratory.domain.dto.LabMessageContentListQuery;
 import com.zd.laboratory.domain.vo.LabMessageContentVO;
 import com.zd.laboratory.service.ILabMessageContentService;
@@ -28,7 +27,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabMoldController.java

@@ -3,10 +3,10 @@ package com.zd.laboratory.controller;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.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.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabMold;
 import com.zd.laboratory.service.ILabMoldService;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNegativeListRecordsController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 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.web.domain.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.LabBlacklist;
 import com.zd.laboratory.domain.LabNegativelistHistory;
@@ -22,7 +23,6 @@ import com.zd.laboratory.service.ILabViolationService;
 import com.zd.system.api.exam.RemoteExamService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zd.common.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNegativeListSiteController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 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;
@@ -15,7 +16,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNegativelistHistoryController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.vo.LabNegativelistVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,19 +18,14 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabNegativelistHistory;
 import com.zd.laboratory.service.ILabNegativelistHistoryService;
 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;
 
 /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNoticeconfigController.java

@@ -7,6 +7,7 @@ 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;
@@ -16,7 +17,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNotifyplanController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 
 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.laboratory.domain.vo.LabNotifyplanExcelVO;
 import com.zd.laboratory.domain.vo.LabNotifyplanVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabPhotoNoteController.java

@@ -14,6 +14,7 @@ import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.valid.ValidGroup;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.LabMessageDynamic;
 import com.zd.laboratory.domain.dto.LabPhotoNoteADD;
@@ -35,7 +36,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;
@@ -43,7 +43,6 @@ import com.zd.laboratory.domain.LabPhotoNote;
 import com.zd.laboratory.service.ILabPhotoNoteService;
 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;
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabPintsScoreSiteController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 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;
@@ -15,7 +16,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabProcessSiteController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 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;
@@ -15,19 +16,15 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabProcessSite;
 import com.zd.laboratory.service.ILabProcessSiteService;
 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;
 
 /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanDistributionController.java

@@ -7,6 +7,7 @@ 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 com.zd.laboratory.domain.vo.LabRiskPlanDistributionVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,7 +18,6 @@ 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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRotationChartController.java

@@ -7,6 +7,7 @@ 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 com.zd.laboratory.mqtt.constants.MqttConstants;
 import com.zd.laboratory.mqtt.service.impl.CommonSend;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,19 +19,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.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabRotationChart;
 import com.zd.laboratory.service.ILabRotationChartService;
 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;
 
 /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSafeBookController.java

@@ -7,10 +7,10 @@ import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.UrlFormatUtils;
 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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.utils.DictUtils;
 import com.zd.laboratory.domain.LabSafeBook;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSafeClassifiedController.java

@@ -4,10 +4,10 @@ import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabSafeClassified;
 import com.zd.laboratory.service.ILabSafeClassifiedService;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSafeClasstypeController.java

@@ -4,10 +4,10 @@ import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.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.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.laboratory.domain.LabSafeClasstype;
 import com.zd.laboratory.service.ILabSafeClasstypeService;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -17,10 +17,10 @@ import com.zd.common.core.utils.UrlFormatUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
+import com.zd.common.core.web.domain.ResultData;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.security.service.TokenService;
 import com.zd.laboratory.domain.LabSecurityApply;