【移除】 架构优化后原有模块移除

zd-api/zd-api-system/pom.xml

@@ -1,28 +0,0 @@
-<?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-api</artifactId>
-        <version>3.1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>zd-api-system</artifactId>
-
-    <description>
-        zd-api-system系统接口模块
-    </description>
-
-    <dependencies>
-
-        <!-- zd Common Core-->
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-core</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

zd-api/zd-api-system/src/main/java/com/zd/system/api/RemoteDeptService.java

@@ -1,42 +0,0 @@
-package com.zd.system.api;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.system.api.domain.SysDept;
-import com.zd.system.api.factory.RemoteDeptFallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 部门服务
- *
- * @author zd
- */
-@FeignClient(contextId = "remoteDeptService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDeptFallbackFactory.class)
-public interface RemoteDeptService {
-    /**
-     * 查询部门列表
-     *
-     * @param sysDept 用户名
-     * @return 结果
-     */
-    @PostMapping("/dept/listOption")
-    public R<List<SysDept>> getDeptList(@RequestBody SysDept sysDept);
-
-    @ApiOperation("通过ids 查询所有的本节点和父节点ID集合")
-    @PostMapping("/dept/allParentId")
-    public AjaxResult allParentId(@RequestBody List<Long> deptIds);
-
-    @ApiOperation(value = "用户查询是否有电子签章")
-    @GetMapping("/dept/sign/queryDeptSignByUserId")
-    Map<String, Object> queryDeptSignByUserId();
-
-    @ApiOperation(value = "根据部门id查询部门信息")
-    @GetMapping("/dept/info/{id}")
-    AjaxResult getInfoById(@PathVariable("id") Long id);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/RemoteFileService.java

@@ -1,30 +0,0 @@
-package com.zd.system.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.multipart.MultipartFile;
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.factory.RemoteFileFallbackFactory;
-
-/**
- * 文件服务
- *
- * @author zd
- */
-@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
-public interface RemoteFileService {
-    /**
-     * 上传文件
-     *
-     * @param file 文件信息
-     * @return 结果
-     */
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
-
-
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/RemoteLogService.java

@@ -1,40 +0,0 @@
-package com.zd.system.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SysLogininfor;
-import com.zd.system.api.domain.SysOperLog;
-import com.zd.system.api.factory.RemoteLogFallbackFactory;
-
-/**
- * 日志服务
- *
- * @author zd
- */
-@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
-public interface RemoteLogService {
-    /**
-     * 保存系统日志
-     *
-     * @param sysOperLog 日志实体
-     * @param source     请求来源
-     * @return 结果
-     */
-    @PostMapping("/operlog")
-    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 保存访问记录
-     *
-     * @param sysLogininfor 访问实体
-     * @param source        请求来源
-     * @return 结果
-     */
-    @PostMapping("/logininfor")
-    public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/RemoteUserService.java

@@ -1,199 +0,0 @@
-package com.zd.system.api;
-
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.system.api.domain.SysLogoConfigVO;
-import com.zd.system.api.model.SimpleUserVO;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.factory.RemoteUserFallbackFactory;
-import com.zd.system.api.model.LoginUser;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-/**
- * 用户服务
- *
- * @author zd
- */
-@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteUserService {
-    /**
-     * 通过用户名查询用户信息
-     *
-     * @param username 用户名
-     * @param source   请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/info/{username}")
-     R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-    /**
-     * 通过用户名查询用户信息
-     *
-     * @param username 用户名
-     * @param source   请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/info/{username}/{loginType}")
-     R<LoginUser> getUserInfo(@PathVariable("username") String username, @PathVariable("loginType") Integer loginType,
-                                    @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过用户ID查询用户信息
-     *
-     * @param id     用户id
-     * @param source 请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/info/id/{id}")
-     R<SysUser> getUserInfoByUserId(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 通过用户账户查询用户信息
-     *
-     * @param userName 用户账户
-     * @param source   请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/info/username/{username}")
-     R<SysUser> getUserInfoByUserName(@PathVariable("username") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-    /**
-     * 通过用户卡号查询用户信息
-     *
-     * @param cardnum 用户账户
-     * @param source   请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/info/cardnum/{cardnum}")
-     R<SysUser> getUserInfoByCardNum(@PathVariable("cardnum")String cardnum, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 注册用户信息
-     *
-     * @param sysUser 用户信息
-     * @param source  请求来源
-     * @return 结果
-     */
-    @PostMapping("/user/register")
-     R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    @GetMapping("/user/my/info/Simple")
-     R<SimpleUserVO> myInfoSimple(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-    /**
-     * 获取所有可用户IDS
-     *
-     * @return 结果
-     */
-    @GetMapping("/user/all")
-     R<List<Long>> userALLIDS(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 根据用户ids获取电话
-     *
-     * @return 结果
-     */
-    @GetMapping("/user/phone/{ids}")
-     R<List<String>> getPhoneByUserIDS(@PathVariable("ids") String ids);
-    /**
-     * 获取指定院系用户IDS
-     *
-     * @param deptId
-     * @return 结果
-     */
-    @GetMapping("/user/dept/{deptIds}")
-     R<List<Long>> userDeptIDS(@PathVariable("deptIds") String deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 小程序查询院系列表（用户端，管理端）
-     */
-    @ApiOperation(value = "小程序查询院系列表（用户端，管理端）")
-    @GetMapping(value = "/dept/departments/list")
-     R<Object> departmentsList();
-
-
-    /**
-     * 小程序查询院系下楼栋列表（用户端，管理端）
-     */
-    @ApiOperation(value = "小程序查询院系下楼栋列表（用户端，管理端）")
-    @GetMapping(value = "/dept/{deptId}/building/list")
-     R<Object> building(@PathVariable("deptId") Long deptId);
-
-    /**
-     * 登录查询大屏用户的路由菜单
-     */
-    @GetMapping("/menu/getRouterById/{userId}")
-     AjaxResult getRouters(@PathVariable("userId") Long userId);
-
-    /**
-     * 大屏用户权限判断
-     */
-    @GetMapping("/role/authUser/power")
-     AjaxResult selectAuthUserPower(@RequestParam("userId") Long userId);
-
-    /**
-     * 修改学生信息
-     */
-    @PutMapping("/user/student")
-     AjaxResult editUser(@RequestBody SysUser user);
-
-    /**
-     * 修改学生信息
-     */
-    @PutMapping("/user/student/editStudent")
-     AjaxResult editStudent(@RequestBody SysUser user);
-
-    @PostMapping(value = "/user/updateSignature", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-     R updateSignature(@RequestPart("file") MultipartFile file);
-
-
-    /**
-     * 获取用户默认密码
-     */
-    @GetMapping("/config/configKey/{configKey}")
-     AjaxResult getConfigKey(@PathVariable("configKey") String configKey);
-
-    @PostMapping("/user/querySignature")
-    R querySignature();
-
-
-    /**
-     * 获取用户默认密码
-     */
-    @GetMapping("/logo/config/getLogoInfo")
-     R<SysLogoConfigVO> getConfigLogo();
-
-    @DeleteMapping("/user/{userIds}")
-    AjaxResult remove(@PathVariable("userIds") Long[] userIds);
-
-    /**
-     * 获取当前登录用户所属学校以及院系id集合
-     * @return
-     */
-    @GetMapping("/user/getLogingUserDeptids")
-    R<List<Long>> getLogingUserDeptids();
-
-    /**
-     * 获取当前登录用户所属学校的deptid
-     * @return
-     */
-    @GetMapping("/user/getLoginUserSchoolDeptid")
-    R<Long> getLoginUserSchoolDeptid();
-
-    /***
-     * 根据电话查询用户信息
-     * @param phone
-     * @return
-     */
-    @RequestMapping("/user/getUserByPhone/{phone}")
-    R<SysUser> getUserByPhone(@PathVariable("phone") String phone);
-}

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

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

zd-api/zd-api-system/src/main/java/com/zd/system/api/airbottle/factory/RemoteAirBottleFallbackFactory.java

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

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/RemoteCabinetService.java

@@ -1,27 +0,0 @@
-package com.zd.system.api.chemical;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.chemical.factory.RemoteCabinetFallbackFactory;
-import com.zd.system.api.factory.RemoteExamFallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 化学品管理Feign调用接口
- */
-@FeignClient(contextId = "remoteCabinetService", value = ServiceNameConstants.CHEMICAL_SERVICE, fallbackFactory = RemoteCabinetFallbackFactory.class)
-public interface RemoteCabinetService {
-
-    /**
-     * 查询返回化学品机柜列表
-     */
-    @ApiOperation(value = "修改 化学品设备管理状态")
-    @PostMapping("/hxpCabinet/getCabinetList")
-    R<List <LinkedHashMap <String,String>>> getCabinetList(@RequestBody Map subMap);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/RemoteChemicalAlarmService.java

@@ -1,36 +0,0 @@
-package com.zd.system.api.chemical;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.chemical.factory.RemoteChemicalAlarmFallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 化学品智能报警Feign调用接口
- */
-@FeignClient(contextId = "remoteChemicalAlarmService", value = ServiceNameConstants.CHEMICAL_SERVICE, fallbackFactory = RemoteChemicalAlarmFallbackFactory.class)
-public interface RemoteChemicalAlarmService {
-
-    /**
-     * 化学品智能报警日志列表
-     */
-    @ApiOperation(value = "查询化学品数据列表")
-    @PostMapping("/hxpAlarmRecord/getList")
-    R<List <LinkedHashMap <String,String>>> getList(@RequestBody Map alarmMap);
-
-    /**
-     * 修改报警日志变为已处理
-     */
-    @ApiOperation(value = "修改 化学品设备管理状态")
-    @PutMapping("/hxpAlarmRecord/handle")
-    R<Boolean> updateStatus(@RequestBody Map alarmMap);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/RemoteChemicalService.java

@@ -1,30 +0,0 @@
-package com.zd.system.api.chemical;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.factory.RemoteExamFallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 化学品管理Feign调用接口
- */
-@FeignClient(contextId = "remoteChemicalService", value = ServiceNameConstants.CHEMICAL_SERVICE, fallbackFactory = RemoteExamFallbackFactory.class)
-public interface RemoteChemicalService {
-
-    /**
-     * 修改 化学品设备管理状态
-     */
-    @ApiOperation(value = "修改 化学品设备管理状态")
-    @PutMapping("/hxpSmartTerminal/update/status")
-    R<Boolean> updateStatus(@RequestParam("ipAddress") String ipAddress,@RequestParam("terminalStatus")Integer terminalStatus);
-
-    @ApiOperation(value = "查询实验室化学品临界量风险指标")
-    @GetMapping("/hxpChemical/queryCriticaliBySubId")
-    R<List<Map<String, Object>>> queryCriticaliBySubId(@RequestParam("subIds") List<Long> subIds);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/RemoteStockService.java

@@ -1,48 +0,0 @@
-package com.zd.system.api.chemical;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.chemical.factory.RemoteStockFallbackFactory;
-import com.zd.system.api.domain.InventoryTag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 化学品库存
- */
-@FeignClient(contextId = "remoteStockService", value = ServiceNameConstants.CHEMICAL_SERVICE, fallbackFactory = RemoteStockFallbackFactory.class)
-public interface RemoteStockService {
-
-
-    @PostMapping(value = "/hxpStock/RFIDCheck")
-    public R<Boolean> rfidCheck(@RequestBody InventoryTag tag);
-
-    @GetMapping(value = "/hxpStock/expireCheck")
-    public void expireCheck();
-
-    @GetMapping(value = "/hxpUserecord/checkOvertime")
-    public void checkOvertime();
-
-    @PostMapping("/hxpChemical/indicatorMonitoring")
-    public void indicatorMonitoring();
-
-    @GetMapping(value = "/hxpUserecord/queryUplink")
-    public void queryUplinkResult();
-
-    @GetMapping(value = "/hxpStock/sendSydSms")
-    public R sendSydSms(@RequestParam(value = "content") String content,
-                        @RequestParam(value = "purpose") Integer purpose,
-                        @RequestParam(value = "lockApplyId", required = false) Long lockApplyId,
-                        @RequestParam(value = "phones") @NotNull String... phones);
-
-    /**
-     * 四医大短信告警方案阶梯式通知流程
-     */
-    @GetMapping("/hxpAlarmRecord/sendPhoneBySyd")
-    public void sendPhoneBySyd();
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/factory/RemoteCabinetFallbackFactory.java

@@ -1,31 +0,0 @@
-package com.zd.system.api.chemical.factory;
-
-
-import com.zd.common.core.domain.R;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.system.api.chemical.RemoteCabinetService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class RemoteCabinetFallbackFactory implements FallbackFactory<RemoteCabinetService> {
-    private final static Logger logger = LoggerFactory.getLogger(RemoteCabinetFallbackFactory.class);
-
-    @Override
-    public RemoteCabinetService create(Throwable throwable) {
-        logger.error("化学品服务调用失败:{}", throwable.getMessage());
-        return new RemoteCabinetService() {
-
-            @Override
-            public R<List<LinkedHashMap <String, String>>> getCabinetList(Map subMap) {
-                throw new ServiceException("获取机柜列表失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/factory/RemoteChemicalAlarmFallbackFactory.java

@@ -1,38 +0,0 @@
-package com.zd.system.api.chemical.factory;
-
-
-import com.zd.common.core.domain.R;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.system.api.chemical.RemoteCabinetService;
-import com.zd.system.api.chemical.RemoteChemicalAlarmService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class RemoteChemicalAlarmFallbackFactory implements FallbackFactory<RemoteChemicalAlarmService> {
-    private final static Logger logger = LoggerFactory.getLogger(RemoteChemicalAlarmFallbackFactory.class);
-
-    @Override
-    public RemoteChemicalAlarmService create(Throwable throwable) {
-        logger.error("化学品服务调用失败:{}", throwable.getMessage());
-        return new RemoteChemicalAlarmService() {
-
-            @Override
-            public R<List<LinkedHashMap <String, String>>> getList(Map alarmMap) {
-                throw new ServiceException("获取智能报警列表失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R <Boolean> updateStatus(Map alarmMap) {
-                throw new ServiceException("变更智能报警日志已处理失败:" + throwable.getMessage());
-            }
-
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/factory/RemoteChemicalFallbackFactory.java

@@ -1,39 +0,0 @@
-package com.zd.system.api.chemical.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.chemical.RemoteChemicalService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 考试服务降级处理
- *
- * @author zhoupan
- */
-@Component
-public class RemoteChemicalFallbackFactory implements FallbackFactory<RemoteChemicalService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteChemicalFallbackFactory.class);
-
-    @Override
-    public RemoteChemicalService create(Throwable throwable) {
-        log.error("化学品管理调用失败:{}", throwable.getMessage());
-        return new RemoteChemicalService() {
-            @Override
-            public R<Boolean> updateStatus(String ipAddress, Integer terminalStatus) {
-                return R.fail("化学品管理调用失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<List<Map<String, Object>>> queryCriticaliBySubId(List<Long> subIds) {
-
-                return R.fail("查询实验室化学品临界量风险指标失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/factory/RemoteStockFallbackFactory.java

@@ -1,63 +0,0 @@
-package com.zd.system.api.chemical.factory;
-
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.chemical.RemoteStockService;
-import com.zd.system.api.domain.InventoryTag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author Administrator
- */
-@Component
-public class RemoteStockFallbackFactory implements FallbackFactory<RemoteStockService> {
-    private static final Logger logger = LoggerFactory.getLogger(RemoteStockFallbackFactory.class);
-
-    @Override
-    public RemoteStockService create(Throwable throwable) {
-        logger.error("化学品服务调用失败:{}", throwable.getMessage());
-        return new RemoteStockService() {
-            @Override
-            public R<Boolean> rfidCheck(InventoryTag tag) {
-                logger.error("保存调用失败:{}" ,throwable.getMessage());
-                return R.fail("保存调用失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public void expireCheck() {
-                logger.error("化学品库存过期调度失败：{}" ,throwable.getMessage());
-            }
-
-            @Override
-            public void checkOvertime() {
-                logger.error("化学品领用超时调度失败：{}" ,throwable.getMessage());
-            }
-
-            @Override
-            public void indicatorMonitoring() {
-                logger.error("定时监测实验室化学品存放风险指标：{}" , throwable.getMessage());
-            }
-
-            @Override
-            public void queryUplinkResult() {
-                logger.error("定时监测四医大短信上行结果异常：{}" , throwable.getMessage());
-            }
-
-            @Override
-            public R sendSydSms(String content, Integer purpose, Long lockApplyId, @NotNull String... phones) {
-                logger.error("四医大短信调用失败:{}" ,throwable.getMessage());
-                return R.fail("四医大短信调用失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public void sendPhoneBySyd() {
-                logger.error("四医大短信告警方案阶梯式通知流程调用失败:{}" ,throwable.getMessage());
-            }
-        };
-    }
-}

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

@@ -1,136 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-/**
- * 算法结果
- * @Author: zhoupan
- * @Date: 2021/11/26/15:33
- * @Description:
- */
-@ApiModel("算法")
-public class Algorithm {
-
-    private Long id;
-    @ApiModelProperty("类型")
-    private String algorithmType;
-    @ApiModelProperty("算法结果json")
-    private String algorithmResult;
-    @ApiModelProperty("业务结果")
-    private Boolean parseResult;
-    @ApiModelProperty("业务结果说明")
-    private String parseResultMsg;
-    @ApiModelProperty("是否报警")
-    private Integer isAlarm;
-
-    /**
-     * 只有签到检查存在
-     */
-    private Long signId;
-
-    private Long subId;
-
-
-    private int status = 0;
-
-    private String algorithmName;
-
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date createTime;
-
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getSubId() {
-        return subId;
-    }
-
-    public void setSubId(Long subId) {
-        this.subId = subId;
-    }
-
-    public Long getSignId() {
-        return signId;
-    }
-
-    public void setSignId(Long signId) {
-        this.signId = signId;
-    }
-
-    public Boolean getParseResult() {
-        return parseResult;
-    }
-
-    public void setParseResult(Boolean parseResult) {
-        this.parseResult = parseResult;
-    }
-
-    public String getParseResultMsg() {
-        return parseResultMsg;
-    }
-
-    public void setParseResultMsg(String parseResultMsg) {
-        this.parseResultMsg = parseResultMsg;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getAlgorithmType() {
-        return algorithmType;
-    }
-
-    public void setAlgorithmType(String algorithmType) {
-        this.algorithmType = algorithmType;
-    }
-
-
-    public String getAlgorithmResult() {
-        return algorithmResult;
-    }
-
-    public void setAlgorithmResult(String algorithmResult) {
-        this.algorithmResult = algorithmResult;
-    }
-
-
-    public int getStatus() {
-       return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getAlgorithmName() {
-
-        return algorithmName;
-    }
-
-    public void setAlgorithmName(String algorithmName) {
-        this.algorithmName = algorithmName;
-    }
-
-    public Integer getIsAlarm() {
-        return isAlarm;
-    }
-
-    public void setIsAlarm(Integer isAlarm) {
-        this.isAlarm = isAlarm;
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.zd.system.api.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 算法结果
- * @Author: zhoupan
- * @Date: 2021/11/26/15:33
- * @Description:
- */
-@ApiModel("算法VO")
-public class AlgorithmVO extends Algorithm {
-    @ApiModelProperty("实验室名称")
-    private String subName;
-    @ApiModelProperty("用户名称")
-    private String userName;
-    private String inTime;
-    private String outTime;
-
-
-
-    public String getSubName() {
-        return subName;
-    }
-
-    public void setSubName(String subName) {
-        this.subName = subName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getInTime() {
-        return inTime;
-    }
-
-    public void setInTime(String inTime) {
-        this.inTime = inTime;
-    }
-
-    public String getOutTime() {
-        return outTime;
-    }
-
-    public void setOutTime(String outTime) {
-        this.outTime = outTime;
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.zd.system.api.domain;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/11/18/17:39
- * @Description:
- */
-public class AppSubQuery {
-
-    /**
-     * 所属院系
-     */
-    Long deptId;
-
-    /**
-     * 学科分了
-     */
-    String subDept;
-
-    /**
-     * 分级
-     */
-    Integer level;
-
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getSubDept() {
-        return subDept;
-    }
-
-    public void setSubDept(String subDept) {
-        this.subDept = subDept;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.zd.system.api.domain;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/11/18/16:00
- * @Description:
- */
-public class CommonCount {
-
-    int count;
-
-    Long id;
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}

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

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

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

@@ -1,226 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.enums.AuditStatusEnum;
-import com.zd.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-
-/**
- * 学生信息对象 lab_students_info
- *
- * @author zhoupan
- * @date 2021-09-10
- */
-@ApiModel("学生卡审核信息")
-public class LabStudentsInfo extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 学生ID（userId）
-     */
-    @Excel(name = "学生ID", readConverterExp = "u=serId")
-    @ApiModelProperty(value = "学生ID")
-    private Long joinStudentsId;
-    /**
-     * 学生卡图片
-     */
-    @Excel(name = "学生卡图片")
-
-    @ApiModelProperty(value = "学生卡图片")
-    private String card;
-    /**
-     * 人脸信息图片
-     */
-    @Excel(name = "人脸信息图片")
-    @ApiModelProperty(value = "人脸信息图片")
-    private String faceImg;
-
-    /**
-     * 审核类型 不接收前端传值
-     */
-    @ApiModelProperty(value = "审核类型不接收前端传值")
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    private AuditStatusEnum auditStatus;
-
-    /**
-     * 审核人id 不接收前端传值
-     */
-    @ApiModelProperty(value = "审核人id不接收前端传值")
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    private Long auditUser;
-
-    /**
-     * 申请时间 不接收前端传值
-     */
-    @ApiModelProperty(value = "申请时间不接收前端传值")
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date commitTime;
-
-    /**
-     * 人脸特征
-     */
-    @ApiModelProperty(value = "人脸特征")
-    private byte[]  faceFeature;
-
-    private Boolean IfFaceFeature;
-
-    public Boolean getIfFaceFeature()
-    {
-        return IfFaceFeature;
-    }
-
-    public void setIfFaceFeature(Boolean ifFaceFeature) {
-        IfFaceFeature = ifFaceFeature;
-    }
-
-    public byte[] getFaceFeature() {
-        return faceFeature;
-    }
-
-    public void setFaceFeature(byte[] faceFeature) {
-        this.faceFeature = faceFeature;
-    }
-
-    public Date getCommitTime() {
-        return commitTime;
-    }
-
-    public void setCommitTime(Date commitTime) {
-        this.commitTime = commitTime;
-    }
-
-    public Long getAuditUser() {
-        return auditUser;
-    }
-
-    public void setAuditUser(Long auditUser) {
-        this.auditUser = auditUser;
-    }
-
-    public AuditStatusEnum getAuditStatus() {
-        return auditStatus;
-    }
-
-    public void setAuditStatus(AuditStatusEnum auditStatus) {
-        this.auditStatus = auditStatus;
-    }
-
-    /**
-     * 部门id
-     */
-    @Excel(name = "部门id")
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-    /**
-     * 部门名称
-     */
-    @Excel(name = "部门名称")
-    @ApiModelProperty(value = "部门名称")
-    private String deptName;
-    /**
-     * 创建人（用于数据权限）
-     */
-    @Excel(name = "创建人", readConverterExp = "用=于数据权限")
-    @ApiModelProperty(value = "创建人")
-    private Long userId;
-
-    @ApiModelProperty(value = "意见")
-    private String opinions;
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-
-    public String getOpinions() {
-        return opinions;
-    }
-
-    public void setOpinions(String opinions) {
-        this.opinions = opinions;
-    }
-
-    public Date getAuditTime() {
-        return auditTime;
-    }
-
-    public void setAuditTime(Date auditTime) {
-        this.auditTime = auditTime;
-    }
-
-
-    public void setJoinStudentsId(Long joinStudentsId) {
-        this.joinStudentsId = joinStudentsId;
-    }
-
-    public Long getJoinStudentsId() {
-        return joinStudentsId;
-    }
-
-    public void setCard(String card) {
-        this.card = card;
-    }
-
-    public String getCard() {
-        return card;
-    }
-
-    public void setFaceImg(String faceImg) {
-        this.faceImg = faceImg;
-    }
-
-    public String getFaceImg() {
-        return faceImg;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("joinStudentsId", getJoinStudentsId())
-                .append("card", getCard())
-                .append("faceImg", getFaceImg())
-                .append("deptId", getDeptId())
-                .append("deptName", getDeptName())
-                .append("userId", getUserId())
-                .append("remark", getRemark())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
-}

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

@@ -1,34 +0,0 @@
-package com.zd.system.api.domain;
-
-import java.util.List;
-import java.util.Optional;
-
-public class ParamVo {
-    private String tid;
-    private Integer vol;
-    private List<UrlVo> urls;
-
-    public String getTid() {
-        return tid;
-    }
-
-    public void setTid(String tid) {
-        this.tid = tid;
-    }
-
-    public Integer getVol() {
-        return vol;
-    }
-
-    public void setVol(Integer vol) {
-        this.vol = Optional.ofNullable(vol).orElse(80);
-    }
-
-    public List<UrlVo> getUrls() {
-        return urls;
-    }
-
-    public void setUrls(List<UrlVo> urls) {
-        this.urls = urls;
-    }
-}

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

@@ -1,106 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.zd.common.core.utils.StringUtils;
-import io.swagger.annotations.ApiModelProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Optional;
-
-/**
- * @author 董高升
- * @descript 播放vo
- */
-public class PlayVo {
-
-    private static Logger logger = LoggerFactory.getLogger(PlayVo.class);
-
-    @ApiModelProperty(required = true, notes = "设备编号")
-    private String sn;
-    @ApiModelProperty(required = false, notes = "方便对接时传递任务类型")
-    private String type;
-    @ApiModelProperty(required = false, notes = "任务名称")
-    private String name;
-    @ApiModelProperty(required = true, notes = "播放速度")
-    private Integer speed;
-    @ApiModelProperty(required = false, notes = "播放参数")
-    private ParamVo params;
-    @ApiModelProperty(required = true, notes = "远程端口")
-    private int port;
-    @ApiModelProperty(required = true, notes = "设备Ip")
-    private String deviceIp;
-
-    public String getSn() {
-        return sn;
-    }
-
-    public void setSn(String sn) {
-        this.sn = sn;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        if(StringUtils.isBlank(name)){
-            this.type="req";
-        }else{
-            this.type = type;
-        }
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        if(StringUtils.isBlank(name)){
-            this.name="songs_queue_append";
-        }else{
-            this.name = name;
-        }
-    }
-
-    public ParamVo getParams() {
-        return params;
-    }
-
-    public void setParams(ParamVo params) {
-        this.params = params;
-    }
-
-    @Override
-    public String toString() {
-        return "PlayVo{" +
-                "sn='" + sn + '\'' +
-                ", type='" + type + '\'' +
-                ", name='" + name + '\'' +
-                ", params=" + params +
-                '}';
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public Integer getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Integer speed) {
-        this.speed = Optional.ofNullable(speed).orElse(50);
-    }
-
-    public String getDeviceIp() {
-        return deviceIp;
-    }
-
-    public void setDeviceIp(String deviceIp) {
-        this.deviceIp = deviceIp;
-    }
-}

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

@@ -1,93 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.annotation.Excel.Type;
-import com.zd.common.core.annotation.Excels;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户对象 sys_user
- *
- * @author zd
- */
-@ApiModel("下拉列表用户")
-public class SelectUserVO {
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty("用户ID")
-    private Long userId;
-
-    /**
-     * 部门ID
-     */
-    @ApiModelProperty("部门ID")
-    private Long deptId;
-
-    /**
-     * 用户账号
-     */
-    @ApiModelProperty("用户账号")
-    private String userName;
-
-    /**
-     * 用户昵称
-     */
-    @ApiModelProperty("用户名称")
-    private String nickName;
-
-
-    @ApiModelProperty("部门名称")
-    private String deptName;
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-}

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

@@ -1,215 +0,0 @@
-package com.zd.system.api.domain;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/11/11/15:57
- * @Description:
- */
-public class SubQueryConfig {
-
-    /**
-     * 查询模式  通过ID查询不应用该功能
-     */
-    private mode queryMode=mode.none;
-
-    /**
-     * 是否查询基础信息，如果为false  ,addr属性配置不起作用，按false对待。
-     */
-    private Boolean baseInfo=true;
-
-    /**
-     * 是否查询安全牌信息
-     */
-    private Boolean safeInfo =false;
-
-    /**
-     * 是否查询安全负责人信息
-     */
-    private Boolean safePhone =false;
-    /**
-     * 是否查询危险等级
-     */
-    private Boolean dangerLevel =false;
-
-    /**
-     * 转换字典学科类型
-     */
-    private Boolean conversionDictSubName =false;
-
-    /**
-     * 是否查询地址
-     */
-    private Boolean addr =false;
-
-    /**
-     * 是否查询传感器测点功能：记着是测点功能不是传感器 ，以后传感器仍可以和实物对应
-     */
-    private Boolean sensorFunction=false;
-
-    /**
-     * 是否初始化传感器测点功能值：依赖sensorFunction为True时有效
-     */
-    private Boolean initSensorFunctionValue=false;
-
-    /**
-     * 是否初始化传感器测点预警：依赖sensorFunction为True时有效
-     * @return
-     */
-    private Boolean initWarnSensorFunction=false;
-
-    /**
-     * 是否初始化危险源
-     */
-    private Boolean initDangerCount=false;
-
-    /**
-     * 是否查询设备
-     */
-    private Boolean hardware=false;
-
-    /**
-     * 列表查询模板
-     */
-    public static final SubQueryConfig subQueryConfigList;
-
-    /**
-     * 预警： 实验室详情查询模板
-     */
-    public static final SubQueryConfig subQueryConfigWran;
-
-
-
-    static {
-
-        subQueryConfigWran = new SubQueryConfig();
-        subQueryConfigWran.setBaseInfo(false);
-        subQueryConfigWran.setHardware(true);
-        subQueryConfigWran.setSafeInfo(true);
-        subQueryConfigWran.setAddr(false);
-        subQueryConfigWran.setSensorFunction(true);
-        subQueryConfigWran.setInitWarnSensorFunction(true);
-        subQueryConfigWran.setInitSensorFunctionValue(true);
-        subQueryConfigWran.setDangerLevel(false);
-        subQueryConfigWran.setInitDangerCount(true);
-
-        subQueryConfigList = new SubQueryConfig();
-        subQueryConfigList.setBaseInfo(true);
-        subQueryConfigList.setHardware(false);
-        subQueryConfigList.setQueryMode(mode.data_business);
-        subQueryConfigList.setSafeInfo(false);
-        subQueryConfigList.setAddr(true);
-        subQueryConfigList.setSensorFunction(true);
-        subQueryConfigList.setInitWarnSensorFunction(true);
-        subQueryConfigList.setInitSensorFunctionValue(true);
-        subQueryConfigList.setDangerLevel(true);
-
-
-    }
-
-    public Boolean getInitDangerCount() {
-        return initDangerCount;
-    }
-
-    public void setInitDangerCount(Boolean initDangerCount) {
-        this.initDangerCount = initDangerCount;
-    }
-
-    public Boolean getHardware() {
-        return hardware;
-    }
-
-    public void setHardware(Boolean hardware) {
-        this.hardware = hardware;
-    }
-
-    public Boolean getSafeInfo() {
-        return safeInfo;
-    }
-
-    public void setSafeInfo(Boolean safeInfo) {
-        this.safeInfo = safeInfo;
-    }
-
-    public Boolean getInitSensorFunctionValue() {
-        return initSensorFunctionValue;
-    }
-
-    public void setInitSensorFunctionValue(Boolean initSensorFunctionValue) {
-        this.initSensorFunctionValue = initSensorFunctionValue;
-    }
-
-    public Boolean getInitWarnSensorFunction() {
-        return initWarnSensorFunction;
-    }
-
-    public void setInitWarnSensorFunction(Boolean initWarnSensorFunction) {
-        this.initWarnSensorFunction = initWarnSensorFunction;
-    }
-
-    public Boolean getSensorFunction() {
-        return sensorFunction;
-    }
-
-    public void setSensorFunction(Boolean sensorFunction) {
-        this.sensorFunction = sensorFunction;
-    }
-
-    public Boolean getBaseInfo() {
-        return baseInfo;
-    }
-
-    public void setBaseInfo(Boolean baseInfo) {
-        this.baseInfo = baseInfo;
-    }
-
-    public Boolean getAddr() {
-        return addr;
-    }
-
-    public void setAddr(Boolean addr) {
-        this.addr = addr;
-    }
-
-    public mode getQueryMode() {
-        return queryMode;
-    }
-
-    public void setQueryMode(mode queryMode) {
-        this.queryMode = queryMode;
-    }
-
-    public Boolean getSafePhone() {
-        return safePhone;
-    }
-
-    public void setSafePhone(Boolean safePhone) {
-        this.safePhone = safePhone;
-    }
-
-    public Boolean getDangerLevel() {
-        return dangerLevel;
-    }
-
-    public void setDangerLevel(Boolean dangerLevel) {
-        this.dangerLevel = dangerLevel;
-    }
-
-    public Boolean getConversionDictSubName() {
-        return conversionDictSubName;
-    }
-
-    public void setConversionDictSubName(Boolean conversionDictSubName) {
-        this.conversionDictSubName = conversionDictSubName;
-    }
-
-    public static enum mode{
-        //无权限
-        none,
-        //数据权限
-        data,
-        //业务权限
-        business,
-        //数据和业务权限
-        data_business;
-    }
-}

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

@@ -1,255 +0,0 @@
-package com.zd.system.api.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.web.domain.BaseEntity;
-
-/**
- * 部门表 sys_dept
- *
- * @author zd
- */
-public class SysDept extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 父部门ID
-     */
-    private Long parentId;
-
-    /**
-     * 祖级列表
-     */
-    private String ancestors;
-
-    /**
-     * 部门编号
-     */
-    private String deptNum;
-
-    /**
-     * 部门名称
-     */
-    private String deptName;
-
-    /**
-     * 显示顺序
-     */
-    private String orderNum;
-
-    /**
-     * 负责人
-     */
-    private String leader;
-
-    /**
-     * 联系电话
-     */
-    private String phone;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 部门状态:0正常,1停用
-     */
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 父部门名称
-     */
-    private String parentName;
-
-    /**
-     * 部门照片
-     */
-    private String deptImg;
-
-    /**
-     * 部门电子签章
-     */
-    private String deptSign;
-
-    /**
-     * 是否适用下级（0 否，1 是）
-     */
-    private Integer isLower;
-
-    /**
-     * 子部门
-     */
-    private List<SysDept> children = new ArrayList<SysDept>();
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getAncestors() {
-        return ancestors;
-    }
-
-    public void setAncestors(String ancestors) {
-        this.ancestors = ancestors;
-    }
-
-    @NotBlank(message = "部门名称不能为空")
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public String getLeader() {
-        return leader;
-    }
-
-    public void setLeader(String leader) {
-        this.leader = leader;
-    }
-
-    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getParentName() {
-        return parentName;
-    }
-
-    public void setParentName(String parentName) {
-        this.parentName = parentName;
-    }
-
-    public List<SysDept> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<SysDept> children) {
-        this.children = children;
-    }
-
-    public String getDeptImg() {
-        return deptImg;
-    }
-
-    public void setDeptImg(String deptImg) {
-        this.deptImg = deptImg;
-    }
-
-    public String getDeptNum() {
-        return deptNum;
-    }
-
-    public void setDeptNum(String deptNum) {
-        this.deptNum = deptNum;
-    }
-
-    public String getDeptSign() {
-        return deptSign;
-    }
-
-    public void setDeptSign(String deptSign) {
-        this.deptSign = deptSign;
-    }
-
-    public Integer getIsLower() {
-        return isLower;
-    }
-
-    public void setIsLower(Integer isLower) {
-        this.isLower = isLower;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("deptId", getDeptId())
-                .append("parentId", getParentId())
-                .append("ancestors", getAncestors())
-                .append("deptName", getDeptName())
-                .append("orderNum", getOrderNum())
-                .append("leader", getLeader())
-                .append("phone", getPhone())
-                .append("email", getEmail())
-                .append("status", getStatus())
-                .append("delFlag", getDelFlag())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("deptImg", getDeptImg())
-                .toString();
-    }
-}

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

@@ -1,72 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.zd.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 部门表 sys_dept
- *
- * @author zd
- */
-public class SysDeptVO{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 部门id
-     */
-    private Long deptId;
-
-    /**
-     * 父部门ID
-     */
-    private Long parentId;
-
-    /**
-     * 向上，向下操作 : 1是向上，2是向下
-     */
-    private Long upDownOper;
-
-    /**
-     * 教职工页面操作部门
-     */
-    private List<SysDept> teaCherDpetList = new ArrayList<>();
-
-    public List <SysDept> getTeaCherDpetList() {
-        return teaCherDpetList;
-    }
-
-    public void setTeaCherDpetList(List <SysDept> teaCherDpetList) {
-        this.teaCherDpetList = teaCherDpetList;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getUpDownOper() {
-        return upDownOper;
-    }
-
-    public void setUpDownOper(Long upDownOper) {
-        this.upDownOper = upDownOper;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-}

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

@@ -1,175 +0,0 @@
-package com.zd.system.api.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.constant.UserConstants;
-import com.zd.common.core.web.domain.BaseEntity;
-
-/**
- * 字典数据表 sys_dict_data
- *
- * @author zd
- */
-public class SysDictData extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 字典编码
-     */
-    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
-    private Long dictCode;
-
-    /**
-     * 字典排序
-     */
-    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
-    private Long dictSort;
-
-    /**
-     * 字典标签
-     */
-    @Excel(name = "字典标签")
-    private String dictLabel;
-
-    /**
-     * 字典键值
-     */
-    @Excel(name = "字典键值")
-    private String dictValue;
-
-    /**
-     * 字典类型
-     */
-    @Excel(name = "字典类型")
-    private String dictType;
-
-    /**
-     * 样式属性（其他样式扩展）
-     */
-    private String cssClass;
-
-    /**
-     * 表格字典样式
-     */
-    private String listClass;
-
-    /**
-     * 是否默认（Y是 N否）
-     */
-    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
-    private String isDefault;
-
-    /**
-     * 状态（0正常 1停用）
-     */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    public Long getDictCode() {
-        return dictCode;
-    }
-
-    public void setDictCode(Long dictCode) {
-        this.dictCode = dictCode;
-    }
-
-    public Long getDictSort() {
-        return dictSort;
-    }
-
-    public void setDictSort(Long dictSort) {
-        this.dictSort = dictSort;
-    }
-
-    @NotBlank(message = "字典标签不能为空")
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel() {
-        return dictLabel;
-    }
-
-    public void setDictLabel(String dictLabel) {
-        this.dictLabel = dictLabel;
-    }
-
-    @NotBlank(message = "字典键值不能为空")
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue() {
-        return dictValue;
-    }
-
-    public void setDictValue(String dictValue) {
-        this.dictValue = dictValue;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType() {
-        return dictType;
-    }
-
-    public void setDictType(String dictType) {
-        this.dictType = dictType;
-    }
-
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass() {
-        return cssClass;
-    }
-
-    public void setCssClass(String cssClass) {
-        this.cssClass = cssClass;
-    }
-
-    public String getListClass() {
-        return listClass;
-    }
-
-    public void setListClass(String listClass) {
-        this.listClass = listClass;
-    }
-
-    public boolean getDefault() {
-        return UserConstants.YES.equals(this.isDefault) ? true : false;
-    }
-
-    public String getIsDefault() {
-        return isDefault;
-    }
-
-    public void setIsDefault(String isDefault) {
-        this.isDefault = isDefault;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("dictCode", getDictCode())
-                .append("dictSort", getDictSort())
-                .append("dictLabel", getDictLabel())
-                .append("dictValue", getDictValue())
-                .append("dictType", getDictType())
-                .append("cssClass", getCssClass())
-                .append("listClass", getListClass())
-                .append("isDefault", getIsDefault())
-                .append("status", getStatus())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
-}

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

@@ -1,94 +0,0 @@
-package com.zd.system.api.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.web.domain.BaseEntity;
-
-/**
- * 字典类型表 sys_dict_type
- *
- * @author zd
- */
-public class SysDictType extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 字典主键
-     */
-    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
-    private Long dictId;
-
-    /**
-     * 字典名称
-     */
-    @Excel(name = "字典名称")
-    private String dictName;
-
-    /**
-     * 字典类型
-     */
-    @Excel(name = "字典类型")
-    private String dictType;
-
-    /**
-     * 状态（0正常 1停用）
-     */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    public Long getDictId() {
-        return dictId;
-    }
-
-    public void setDictId(Long dictId) {
-        this.dictId = dictId;
-    }
-
-    @NotBlank(message = "字典名称不能为空")
-    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName() {
-        return dictName;
-    }
-
-    public void setDictName(String dictName) {
-        this.dictName = dictName;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    public String getDictType() {
-        return dictType;
-    }
-
-    public void setDictType(String dictType) {
-        this.dictType = dictType;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("dictId", getDictId())
-                .append("dictName", getDictName())
-                .append("dictType", getDictType())
-                .append("status", getStatus())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.zd.system.api.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 文件信息
- *
- * @author zd
- */
-public class SysFile {
-    /**
-     * 文件名称
-     */
-    private String name;
-
-    /**
-     * 文件地址
-     */
-    private String url;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("name", getName())
-                .append("url", getUrl())
-                .toString();
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.zd.system.api.domain;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.web.domain.BaseEntity;
-
-/**
- * 系统访问记录表 sys_logininfor
- *
- * @author zd
- */
-public class SysLogininfor extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
-    private Long infoId;
-
-    /**
-     * 用户账号
-     */
-    @Excel(name = "用户账号")
-    private String userName;
-
-    /**
-     * 状态 0成功 1失败
-     */
-    @Excel(name = "状态", readConverterExp = "0=成功,1=失败")
-    private String status;
-
-    /**
-     * 地址
-     */
-    @Excel(name = "地址")
-    private String ipaddr;
-
-    /**
-     * 描述
-     */
-    @Excel(name = "描述")
-    private String msg;
-
-    /**
-     * 访问时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date accessTime;
-
-    private Long userId;
-
-    @Override
-    public Long getUserId() {
-        return userId;
-    }
-
-    @Override
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getInfoId() {
-        return infoId;
-    }
-
-    public void setInfoId(Long infoId) {
-        this.infoId = infoId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getIpaddr() {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr) {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public Date getAccessTime() {
-        return accessTime;
-    }
-
-    public void setAccessTime(Date accessTime) {
-        this.accessTime = accessTime;
-    }
-}

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

@@ -1,152 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * logo配置对象 sys_logo_config
- *
- * @author zd
- * @date 2022-05-06
- */
-@ApiModel("logo配置")
-public class SysLogoConfigVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键id */
-    @ApiModelProperty(value = "${comment}")
-    private Long id;
-    /** 学校名称 */
-    @Excel(name = "学校名称")
-    @ApiModelProperty(value = "学校名称")
-    private String schoolName;
-    /** 圆形logo */
-    @Excel(name = "圆形logo")
-    @ApiModelProperty(value = "圆形logo")
-    private String circularLogo;
-    /** 长方形logo */
-    @Excel(name = "长方形logo")
-    @ApiModelProperty(value = "长方形logo")
-    private String rectangleLogo;
-    /** 签到签出示意图 */
-    @Excel(name = "签到签出示意图")
-    @ApiModelProperty(value = "签到签出示意图")
-    private String signMap;
-    /** 视屏封面 */
-    @Excel(name = "视屏封面")
-    @ApiModelProperty(value = "视屏封面")
-    private String videoCover;
-    /** 操作指南 */
-    @Excel(name = "操作指南")
-    @ApiModelProperty(value = "操作指南")
-    private String operationGuide;
-    /** 登录页banner */
-    @Excel(name = "登录页banner")
-    @ApiModelProperty(value = "登录页banner")
-    private String loginBanner;
-    /** 首页banner */
-    @Excel(name = "首页banner")
-    @ApiModelProperty(value = "首页banner")
-    private String homepageBanner;
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setSchoolName(String schoolName)
-    {
-        this.schoolName = schoolName;
-    }
-
-    public String getSchoolName()
-    {
-        return schoolName;
-    }
-    public void setCircularLogo(String circularLogo)
-    {
-        this.circularLogo = circularLogo;
-    }
-
-    public String getCircularLogo()
-    {
-        return circularLogo;
-    }
-    public void setRectangleLogo(String rectangleLogo)
-    {
-        this.rectangleLogo = rectangleLogo;
-    }
-
-    public String getRectangleLogo()
-    {
-        return rectangleLogo;
-    }
-    public void setSignMap(String signMap)
-    {
-        this.signMap = signMap;
-    }
-
-    public String getSignMap()
-    {
-        return signMap;
-    }
-    public void setVideoCover(String videoCover)
-    {
-        this.videoCover = videoCover;
-    }
-
-    public String getVideoCover()
-    {
-        return videoCover;
-    }
-    public void setOperationGuide(String operationGuide)
-    {
-        this.operationGuide = operationGuide;
-    }
-
-    public String getOperationGuide()
-    {
-        return operationGuide;
-    }
-    public void setLoginBanner(String loginBanner)
-    {
-        this.loginBanner = loginBanner;
-    }
-
-    public String getLoginBanner()
-    {
-        return loginBanner;
-    }
-    public void setHomepageBanner(String homepageBanner)
-    {
-        this.homepageBanner = homepageBanner;
-    }
-
-    public String getHomepageBanner()
-    {
-        return homepageBanner;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("schoolName", getSchoolName())
-            .append("circularLogo", getCircularLogo())
-            .append("rectangleLogo", getRectangleLogo())
-            .append("signMap", getSignMap())
-            .append("videoCover", getVideoCover())
-            .append("operationGuide", getOperationGuide())
-            .append("loginBanner", getLoginBanner())
-            .append("homepageBanner", getHomepageBanner())
-            .toString();
-    }
-}

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

@@ -1,253 +0,0 @@
-package com.zd.system.api.domain;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.web.domain.BaseEntity;
-
-/**
- * 操作日志记录表 oper_log
- *
- * @author zd
- */
-public class SysOperLog extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 日志主键
-     */
-    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
-    private Long operId;
-
-    /**
-     * 操作模块
-     */
-    @Excel(name = "操作模块")
-    private String title;
-
-    /**
-     * 业务类型（0其它 1新增 2修改 3删除）
-     */
-    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
-    private Integer businessType;
-
-    /**
-     * 业务类型数组
-     */
-    private Integer[] businessTypes;
-
-    /**
-     * 请求方法
-     */
-    @Excel(name = "请求方法")
-    private String method;
-
-    /**
-     * 请求方式
-     */
-    @Excel(name = "请求方式")
-    private String requestMethod;
-
-    /**
-     * 操作类别（0其它 1后台用户 2手机端用户）
-     */
-    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
-    private Integer operatorType;
-
-    /**
-     * 操作人员
-     */
-    @Excel(name = "操作人员")
-    private String operName;
-
-    /**
-     * 部门名称
-     */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /**
-     * 请求url
-     */
-    @Excel(name = "请求地址")
-    private String operUrl;
-
-    /**
-     * 操作地址
-     */
-    @Excel(name = "操作地址")
-    private String operIp;
-
-    /**
-     * 请求参数
-     */
-    @Excel(name = "请求参数")
-    private String operParam;
-
-    /**
-     * 返回参数
-     */
-    @Excel(name = "返回参数")
-    private String jsonResult;
-
-    /**
-     * 操作状态（0正常 1异常）
-     */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
-    private Integer status;
-
-    /**
-     * 错误消息
-     */
-    @Excel(name = "错误消息")
-    private String errorMsg;
-
-    /**
-     * 操作时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
-
-    private Long userId;
-
-    @Override
-    public Long getUserId() {
-        return userId;
-    }
-
-    @Override
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getOperId() {
-        return operId;
-    }
-
-    public void setOperId(Long operId) {
-        this.operId = operId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Integer getBusinessType() {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType) {
-        this.businessType = businessType;
-    }
-
-    public Integer[] getBusinessTypes() {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes) {
-        this.businessTypes = businessTypes;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    public String getRequestMethod() {
-        return requestMethod;
-    }
-
-    public void setRequestMethod(String requestMethod) {
-        this.requestMethod = requestMethod;
-    }
-
-    public Integer getOperatorType() {
-        return operatorType;
-    }
-
-    public void setOperatorType(Integer operatorType) {
-        this.operatorType = operatorType;
-    }
-
-    public String getOperName() {
-        return operName;
-    }
-
-    public void setOperName(String operName) {
-        this.operName = operName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getOperUrl() {
-        return operUrl;
-    }
-
-    public void setOperUrl(String operUrl) {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperIp() {
-        return operIp;
-    }
-
-    public void setOperIp(String operIp) {
-        this.operIp = operIp;
-    }
-
-    public String getOperParam() {
-        return operParam;
-    }
-
-    public void setOperParam(String operParam) {
-        this.operParam = operParam;
-    }
-
-    public String getJsonResult() {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult) {
-        this.jsonResult = jsonResult;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg;
-    }
-
-    public Date getOperTime() {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime) {
-        this.operTime = operTime;
-    }
-}

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

@@ -1,77 +0,0 @@
-package com.zd.system.api.domain;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 模块权限实体类
- * 只保留菜单权限数据（不含按钮以及目录数据）
- * @author liubo
- * @date 2022-02-23
- */
-public class SysPermitInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-    /**
-     * 菜单ID
-     */
-    private Long menuId;
-
-    /**
-     * 权限标识
-     */
-    private String menuPerms;
-
-    /**
-     * 数据范围（1：全部数据权限 2：本部门以及下级部门 3：本部门以及指定部门（指定部门关联表中查询） 4：仅本人）
-     */
-    private Integer dataScope;
-
-    /**
-     * 数据范围=3时使用
-     */
-    private List<Long> deptIds = new ArrayList<>();
-
-    public Long getMenuId() {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId) {
-        this.menuId = menuId;
-    }
-
-    public String getMenuPerms() {
-        return menuPerms;
-    }
-
-    public void setMenuPerms(String menuPerms) {
-        this.menuPerms = menuPerms;
-    }
-
-    public Integer getDataScope() {
-        return dataScope;
-    }
-
-    public void setDataScope(Integer dataScope) {
-        this.dataScope = dataScope;
-    }
-
-    public List<Long> getDeptIds() {
-        return deptIds;
-    }
-
-    public void setDeptIds(List<Long> deptIds) {
-        this.deptIds = deptIds;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}

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

@@ -1,222 +0,0 @@
-package com.zd.system.api.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.web.domain.BaseEntity;
-
-/**
- * 角色表 sys_role
- *
- * @author zd
- */
-public class SysRole extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 角色ID
-     */
-    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
-    private Long roleId;
-
-    /**
-     * 角色名称
-     */
-    @Excel(name = "角色名称")
-    private String roleName;
-
-    /**
-     * 角色权限
-     */
-    @Excel(name = "角色权限")
-    private String roleKey;
-
-    /**
-     * 角色排序
-     */
-    @Excel(name = "角色排序")
-    private String roleSort;
-
-    /**
-     * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
-     */
-    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
-    private String dataScope;
-
-    /**
-     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
-     */
-    private boolean menuCheckStrictly;
-
-    /**
-     * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
-     */
-    private boolean deptCheckStrictly;
-
-    /**
-     * 角色状态（0正常 1停用）
-     */
-    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 用户是否存在此角色标识 默认不存在
-     */
-    private boolean flag = false;
-
-    /**
-     * 菜单组
-     */
-    private Long[] menuIds;
-
-    /**
-     * 部门组（数据权限）
-     */
-    private Long[] deptIds;
-
-    public SysRole() {
-
-    }
-
-    public SysRole(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public boolean isAdmin() {
-        return isAdmin(this.roleId);
-    }
-
-    public static boolean isAdmin(Long roleId) {
-        return roleId != null && 1L == roleId;
-    }
-
-    @NotBlank(message = "角色名称不能为空")
-    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    public String getRoleName() {
-        return roleName;
-    }
-
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-
-    @NotBlank(message = "权限字符不能为空")
-    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    public String getRoleKey() {
-        return roleKey;
-    }
-
-    public void setRoleKey(String roleKey) {
-        this.roleKey = roleKey;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getRoleSort() {
-        return roleSort;
-    }
-
-    public void setRoleSort(String roleSort) {
-        this.roleSort = roleSort;
-    }
-
-    public String getDataScope() {
-        return dataScope;
-    }
-
-    public void setDataScope(String dataScope) {
-        this.dataScope = dataScope;
-    }
-
-    public boolean isMenuCheckStrictly() {
-        return menuCheckStrictly;
-    }
-
-    public void setMenuCheckStrictly(boolean menuCheckStrictly) {
-        this.menuCheckStrictly = menuCheckStrictly;
-    }
-
-    public boolean isDeptCheckStrictly() {
-        return deptCheckStrictly;
-    }
-
-    public void setDeptCheckStrictly(boolean deptCheckStrictly) {
-        this.deptCheckStrictly = deptCheckStrictly;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public boolean isFlag() {
-        return flag;
-    }
-
-    public void setFlag(boolean flag) {
-        this.flag = flag;
-    }
-
-    public Long[] getMenuIds() {
-        return menuIds;
-    }
-
-    public void setMenuIds(Long[] menuIds) {
-        this.menuIds = menuIds;
-    }
-
-    public Long[] getDeptIds() {
-        return deptIds;
-    }
-
-    public void setDeptIds(Long[] deptIds) {
-        this.deptIds = deptIds;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("roleId", getRoleId())
-                .append("roleName", getRoleName())
-                .append("roleKey", getRoleKey())
-                .append("roleSort", getRoleSort())
-                .append("dataScope", getDataScope())
-                .append("menuCheckStrictly", isMenuCheckStrictly())
-                .append("deptCheckStrictly", isDeptCheckStrictly())
-                .append("status", getStatus())
-                .append("delFlag", getDelFlag())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
-}

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

@@ -1,716 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.annotation.Excel.Type;
-import com.zd.common.core.annotation.Excels;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户对象 sys_user
- *
- * @author zd
- */
-public class SysUser extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
-
-    /**
-     * 部门ID
-     */
-    @Excel(name = "部门编号", type = Type.IMPORT)
-    private Long deptId;
-
-    /**
-     * 用户账号
-     */
-    @Excel(name = "登录名称")
-    private String userName;
-
-    /**
-     * 用户类型（00系统用户，11 教职工，22 学生）
-     */
-    @Excel(name = "登录名称", readConverterExp = "用户类型（00系统用户，11 教职工，22 学生，99 大屏,33 供应商）")
-    private String userType;
-
-    /**
-     * 用户昵称
-     */
-    @Excel(name = "用户名称")
-    private String nickName;
-
-    /**
-     * 用户邮箱
-     */
-    @Excel(name = "用户邮箱")
-    private String email;
-
-    /**
-     * 手机号码
-     */
-    @Excel(name = "手机号码")
-    private String phonenumber;
-
-    /**
-     * 用户性别
-     */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
-    private String sex;
-
-    /**
-     * 用户头像
-     */
-    private String avatar;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 最后登录IP
-     */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
-    private Date loginDate;
-
-    /**
-     * 部门对象
-     */
-    @Excels({
-            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-            @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
-    })
-    private SysDept dept;
-
-    /**
-     * 角色对象 -- 2.6 弃用
-     */
-    @Deprecated
-    private List<SysRole> roles;
-
-    /**
-     * 2.6 需求新权限数据
-     */
-    private List<SysPermitInfo> permits;
-
-    /**
-     * 角色组
-     */
-    private Long[] roleIds;
-
-    /**
-     * 岗位组
-     */
-    private Long[] postIds;
-
-    /**
-     * 用户组
-     */
-    private Long[] userIds;
-
-    /**
-     * 角色ID
-     */
-    private Long roleId;
-
-    /**
-     * 专业
-     */
-    private String major;
-
-    /**
-     * 年级id
-     */
-    private String grade;
-
-    /**
-     * 年级名称
-     */
-    private String gradeName;
-
-    /**
-     * 类别（1 博士，2 硕士）
-     */
-    private String category;
-    /**
-     * 关联导师id
-     */
-    private Integer tutorUserId;
-
-    /**
-     * 导师名称
-     */
-    private String tutorUserName;
-
-    /**
-     * 职称 - 职位表
-     */
-    private String position;
-    /**
-     * 职称名称
-     */
-    private String positionName;
-
-    /**
-     * 工作性质（0，非在编  1，在编）
-     */
-    private String nature;
-
-    /**
-     * 卡号
-     */
-    private String cardNum;
-
-    /**
-     * 微信ID
-     */
-    private String wechatId;
-
-    /**
-     * 文化程度
-     */
-    private String education;
-
-    /**
-     * 民族
-     */
-    private String nationality;
-
-    /**
-     * 通信地址
-     */
-    private String addr;
-
-    /**
-     * 用户状态
-     */
-    private String workStatus;
-
-    /**
-     * 科室
-     */
-    private String department;
-
-    /**
-     * 出生年月
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date dateBirth;
-
-    /**
-     * 专业ID
-     */
-    private Long majorId;
-
-    private Integer isCheck;
-    /**
-     * 多ID 查询
-     */
-    private String paramIds;
-    /**
-     * 电子签名
-     */
-    private String signature;
-    /**
-     * 人脸照片
-     */
-    private String faceImg;
-
-    /**
-     * 组合检索 （姓名，学号，导师，电话）
-     */
-    private String searchValue;
-
-    /**
-     * 班级名称
-     */
-    private String className;
-
-    /**
-     * 创建时间字符串 年月日
-     */
-    private String createTimeStr;
-
-    private String safeUserId;
-
-    /**
-     * 管理实验室数量
-     */
-    @Excel(name = "管理实验室数量", type = Excel.Type.EXPORT)
-    @ApiModelProperty(value = "管理实验室数量")
-    private Integer manageSubCount;
-
-    /**
-     * 部门集合
-     * */
-    private List<Long> deptIds;
-
-    private boolean include = false;
-
-    private List<Object> permitMenus = new ArrayList<>();
-
-
-    public Date getDateBirth() {
-        return dateBirth;
-    }
-
-    public void setDateBirth(Date dateBirth) {
-        this.dateBirth = dateBirth;
-    }
-
-    public String getCardNum() {
-        return cardNum;
-    }
-
-    public void setCardNum(String cardNum) {
-        this.cardNum = cardNum;
-    }
-
-    public String getWechatId() {
-        return wechatId;
-    }
-
-    public void setWechatId(String wechatId) {
-        this.wechatId = wechatId;
-    }
-
-    public String getEducation() {
-        return education;
-    }
-
-    public void setEducation(String education) {
-        this.education = education;
-    }
-
-    public String getNationality() {
-        return nationality;
-    }
-
-    public void setNationality(String nationality) {
-        this.nationality = nationality;
-    }
-
-    public String getAddr() {
-        return addr;
-    }
-
-    public void setAddr(String addr) {
-        this.addr = addr;
-    }
-
-    public String getWorkStatus() {
-        return workStatus;
-    }
-
-    public void setWorkStatus(String workStatus) {
-        this.workStatus = workStatus;
-    }
-
-    public SysUser() {
-
-    }
-
-    public SysUser(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public boolean isAdmin() {
-        return isAdmin(this.userId);
-    }
-
-    public static boolean isAdmin(Long userId) {
-        return userId != null && 1L == userId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    @JsonProperty
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getLoginIp() {
-        return loginIp;
-    }
-
-    public void setLoginIp(String loginIp) {
-        this.loginIp = loginIp;
-    }
-
-    public Date getLoginDate() {
-        return loginDate;
-    }
-
-    public void setLoginDate(Date loginDate) {
-        this.loginDate = loginDate;
-    }
-
-    public SysDept getDept() {
-        return dept;
-    }
-
-    public void setDept(SysDept dept) {
-        this.dept = dept;
-    }
-
-    @Deprecated
-    public List<SysRole> getRoles() {
-        return roles;
-    }
-    @Deprecated
-    public void setRoles(List<SysRole> roles) {
-        this.roles = roles;
-    }
-
-    public Long[] getRoleIds() {
-        return roleIds;
-    }
-
-    public void setRoleIds(Long[] roleIds) {
-        this.roleIds = roleIds;
-    }
-
-    public Long[] getPostIds() {
-        return postIds;
-    }
-
-    public void setPostIds(Long[] postIds) {
-        this.postIds = postIds;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public String getMajor() {
-        return major;
-    }
-
-    public void setMajor(String major) {
-        this.major = major;
-    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public Integer getTutorUserId() {
-        return tutorUserId;
-    }
-
-    public void setTutorUserId(Integer tutorUserId) {
-        this.tutorUserId = tutorUserId;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public String getNature() {
-        return nature;
-    }
-
-    public void setNature(String nature) {
-        this.nature = nature;
-    }
-
-    public String getTutorUserName() {
-        return tutorUserName;
-    }
-
-    public void setTutorUserName(String tutorUserName) {
-        this.tutorUserName = tutorUserName;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public Integer getManageSubCount() {
-        return manageSubCount;
-    }
-
-    public void setManageSubCount(Integer manageSubCount) {
-        this.manageSubCount = manageSubCount;
-    }
-
-    public Long getMajorId() {
-        return majorId;
-    }
-
-    public void setMajorId(Long majorId) {
-        this.majorId = majorId;
-    }
-
-    public Integer getIsCheck() {        return isCheck;    }
-
-    public void setIsCheck(Integer isCheck) {        this.isCheck = isCheck;    }
-
-    public Long[] getUserIds() {
-        return userIds;
-    }
-
-    public void setUserIds(Long[] userIds) {
-        this.userIds = userIds;
-    }
-
-    public String getPositionName() {
-        return positionName;
-    }
-
-    public void setPositionName(String positionName) {
-        this.positionName = positionName;
-    }
-
-    public String getParamIds() {
-        return paramIds;
-    }
-
-    public void setParamIds(String paramIds) {
-        this.paramIds = paramIds;
-    }
-
-    public List<SysPermitInfo> getPermits() {
-        return permits;
-    }
-
-    public void setPermits(List<SysPermitInfo> permits) {
-        this.permits = permits;
-    }
-
-    public String getSignature() {
-        return signature;
-    }
-
-    public void setSignature(String signature) {
-        this.signature = signature;
-    }
-
-    public String getFaceImg() {
-        return faceImg;
-    }
-
-    public void setFaceImg(String faceImg) {
-        this.faceImg = faceImg;
-    }
-
-    public List <Object> getPermitMenus() {
-        return permitMenus;
-    }
-
-    public void setPermitMenus(List <Object> permitMenus) {
-        this.permitMenus = permitMenus;
-    }
-
-    @Override
-    public String getSearchValue() {
-        return searchValue;
-    }
-
-    @Override
-    public void setSearchValue(String searchValue) {
-        this.searchValue = searchValue;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-
-    public String getCreateTimeStr() {
-        return createTimeStr;
-    }
-
-    public void setCreateTimeStr(String createTimeStr) {
-        this.createTimeStr = createTimeStr;
-    }
-
-    public String getGradeName() {
-        return gradeName;
-    }
-
-    public void setGradeName(String gradeName) {
-        this.gradeName = gradeName;
-    }
-
-    public boolean isInclude() {
-        return include;
-    }
-
-    public void setInclude(boolean include) {
-        this.include = include;
-    }
-
-    public String getSafeUserId() {
-        return safeUserId;
-    }
-
-    public void setSafeUserId(String safeUserId) {
-        this.safeUserId = safeUserId;
-    }
-
-    public List<Long> getDeptIds() {
-        return deptIds;
-    }
-
-    public void setDeptIds(List<Long> deptIds) {
-        this.deptIds = deptIds;
-    }
-}

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

@@ -1,389 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.annotation.Excel.Type;
-import com.zd.common.core.annotation.Excels;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户对象 sys_user
- *
- * @author zd
- */
-public class SysUserStudent extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    private Long userId;
-
-    private Long deptId;
-
-    private String userType;
-
-    /**
-     * 用户昵称
-     */
-    @Excel(name = "姓名")
-    private String nickName;
-    /**
-     * 用户账号
-     */
-    @Excel(name = "学号")
-    private String userName;
-    /**
-     * 手机号码
-     */
-    @Excel(name = "联系方式")
-    private String phonenumber;
-    @Excel(name = "所属院系")
-    private String deptName;
-    /**
-     * 专业
-     */
-    @Excel(name = "专业")
-    private String major;
-    /**
-     * 年级
-     */
-    @Excel(name = "年级")
-    private String grade;
-    /**
-     * 类别（1 博士，2 硕士）
-     */
-    @Excel(name = "类别")
-    private String category;
-    /**
-     * 导师名称
-     */
-    @Excel(name = "导师")
-    private String tutorUserName;
-
-    /**
-     * 用户邮箱
-     */
-    private String email;
-
-    /**
-     * 用户性别
-     */
-    private String sex;
-
-    /**
-     * 用户头像
-     */
-    private String avatar;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 最后登录IP
-     */
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-    private Date loginDate;
-
-    /**
-     * 部门对象
-     */
-    private SysDept dept;
-
-    /**
-     * 角色对象
-     */
-    private List<SysRole> roles;
-
-    /**
-     * 角色组
-     */
-    private Long[] roleIds;
-
-    /**
-     * 岗位组
-     */
-    private Long[] postIds;
-
-    /**
-     * 角色ID
-     */
-    private Long roleId;
-
-    /**
-     * 关联导师id
-     */
-    private Integer tutorUserId;
-
-    /**
-     * 职称（教授，助教）
-     */
-    private String position;
-    /**
-     * 工作性质（0，非在编  1，在编）
-     */
-    private String nature;
-
-
-    public SysUserStudent() {
-
-    }
-
-    public SysUserStudent(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public boolean isAdmin() {
-        return isAdmin(this.userId);
-    }
-
-    public static boolean isAdmin(Long userId) {
-        return userId != null && 1L == userId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    @JsonProperty
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getLoginIp() {
-        return loginIp;
-    }
-
-    public void setLoginIp(String loginIp) {
-        this.loginIp = loginIp;
-    }
-
-    public Date getLoginDate() {
-        return loginDate;
-    }
-
-    public void setLoginDate(Date loginDate) {
-        this.loginDate = loginDate;
-    }
-
-    public SysDept getDept() {
-        return dept;
-    }
-
-    public void setDept(SysDept dept) {
-        this.dept = dept;
-    }
-
-    public List<SysRole> getRoles() {
-        return roles;
-    }
-
-    public void setRoles(List<SysRole> roles) {
-        this.roles = roles;
-    }
-
-    public Long[] getRoleIds() {
-        return roleIds;
-    }
-
-    public void setRoleIds(Long[] roleIds) {
-        this.roleIds = roleIds;
-    }
-
-    public Long[] getPostIds() {
-        return postIds;
-    }
-
-    public void setPostIds(Long[] postIds) {
-        this.postIds = postIds;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public String getMajor() {
-        return major;
-    }
-
-    public void setMajor(String major) {
-        this.major = major;
-    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public Integer getTutorUserId() {
-        return tutorUserId;
-    }
-
-    public void setTutorUserId(Integer tutorUserId) {
-        this.tutorUserId = tutorUserId;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public String getNature() {
-        return nature;
-    }
-
-    public void setNature(String nature) {
-        this.nature = nature;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
-
-    public String getTutorUserName() {
-        return tutorUserName;
-    }
-
-    public void setTutorUserName(String tutorUserName) {
-        this.tutorUserName = tutorUserName;
-    }
-
-    @Override
-    public String getDeptName() {
-        return deptName;
-    }
-
-    @Override
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-}

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

@@ -1,211 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.Type;
-
-import java.util.Date;
-
-/**
- * 用户对象 sys_user
- *
- * @author zd
- */
-public class SysUserStudentByExcel {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 姓名
-     */
-    @Excel(name = "姓名" ,type = Type.ALL, isRequired=true)
-    private String nickName;
-
-    /**
-     * 工号
-     */
-    @Excel(name = "学号" ,type = Type.ALL, isRequired=true)
-    private String userName;
-
-    /**
-     * 所属学院
-     */
-    @Excel(name = "所属学院" ,type = Type.ALL, isRequired=true)
-    private String deptName;
-
-    /**
-     * 专业
-     */
-    @Excel(name = "专业",type = Type.ALL, isRequired=true)
-    private String major;
-
-    /**
-     * 手机号码
-     */
-    @Excel(name = "手机号码" ,type = Type.ALL, isRequired=true)
-    private String phonenumber;
-
-    /**
-     * 邮箱
-     */
-    @Excel(name = "邮箱" ,type = Type.ALL)
-    private String email;
-
-    /**
-     * 性别
-     */
-    @Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知" ,type = Type.ALL)
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @Excel(name = "出生日期" ,type = Type.ALL,dateFormat = "yyyy-MM-dd")
-    private Date dateBirth;
-
-
-    /**
-     * 校园卡号
-     */
-    @Excel(name = "校园卡号" ,type = Type.ALL)
-    private String cardNum;
-
-    /**
-     * 导师名称
-     */
-    @Excel(name = "导师",type = Type.ALL)
-    private String tutorUserName;
-
-    /**
-     * 导师用户id
-     */
-    private Long tutorUserId;
-
-    /**
-     * 备注，用于记录错误的原因
-     */
-    @Excel(name = "备注" ,type = Type.EXPORT)
-    private StringBuffer failRemark = new StringBuffer();
-
-    /**
-     * 是否启用账户
-     */
-    private Boolean sysUserEnable;
-
-    /**
-     * 是否更新数据
-     */
-    private Boolean upDate;
-
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public Date getDateBirth() {
-        return dateBirth;
-    }
-
-    public void setDateBirth(Date dateBirth) {
-        this.dateBirth = dateBirth;
-    }
-
-    public String getCardNum() {
-        return cardNum;
-    }
-
-    public void setCardNum(String cardNum) {
-        this.cardNum = cardNum;
-    }
-
-    public StringBuffer getFailRemark() {
-        return failRemark;
-    }
-
-    public void setFailRemark(StringBuffer failRemark) {
-        this.failRemark = failRemark;
-    }
-
-    public Boolean getSysUserEnable() {
-        return sysUserEnable;
-    }
-
-    public void setSysUserEnable(Boolean sysUserEnable) {
-        this.sysUserEnable = sysUserEnable;
-    }
-
-    public Boolean getUpDate() {
-        return upDate;
-    }
-
-    public void setUpDate(Boolean upDate) {
-        this.upDate = upDate;
-    }
-
-    public String getMajor() {
-        return major;
-    }
-
-    public void setMajor(String major) {
-        this.major = major;
-    }
-
-    public String getTutorUserName() {
-        return tutorUserName;
-    }
-
-    public void setTutorUserName(String tutorUserName) {
-        this.tutorUserName = tutorUserName;
-    }
-
-    public Long getTutorUserId() {
-        return tutorUserId;
-    }
-
-    public void setTutorUserId(Long tutorUserId) {
-        this.tutorUserId = tutorUserId;
-    }
-
-}

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

@@ -1,203 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.Type;
-import com.zd.common.core.utils.StringUtils;
-import org.springframework.beans.BeanUtils;
-
-import java.text.SimpleDateFormat;
-
-/**
- * 用户对象 sys_user
- *
- * @author zd
- */
-public class SysUserStudentByExport {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 姓名
-     */
-    @Excel(name = "姓名" ,type = Type.EXPORT)
-    private String nickName;
-
-    /**
-     * 学号
-     */
-    @Excel(name = "学号" ,type = Type.EXPORT)
-    private String userName;
-
-    /**
-     * 所属学院
-     */
-    @Excel(name = "所属学院" ,type = Type.EXPORT)
-    private String deptName;
-
-    /**
-     * 专业
-     */
-    @Excel(name = "专业",type = Type.EXPORT)
-    private String major;
-
-    /**
-     * 手机号码
-     */
-    @Excel(name = "手机号码" ,type = Type.EXPORT)
-    private String phonenumber;
-
-    /**
-     * 邮箱
-     */
-    @Excel(name = "邮箱" ,type = Type.EXPORT)
-    private String email;
-
-    /**
-     * 班级
-     */
-    @Excel(name = "班级" ,type = Type.EXPORT)
-    private String grade;
-
-
-    /**
-     * 性别
-     */
-    @Excel(name = "性别" ,type = Type.EXPORT)
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @Excel(name = "出生日期" ,type = Type.EXPORT)
-    private String dateBirth;
-
-    /**
-     * 校园卡号
-     */
-    @Excel(name = "校园卡号" ,type = Type.EXPORT)
-    private String cardNum;
-
-    /**
-     * 导师名称
-     */
-    @Excel(name = "导师",type = Type.EXPORT)
-    private String tutorUserName;
-
-    /**
-     * 学籍状态
-     */
-    @Excel(name = "状态" ,type = Type.EXPORT)
-    private String workStatus;
-
-    public SysUserStudentByExport(SysUser sysUser) {
-        BeanUtils.copyProperties(sysUser, this);
-        if(StringUtils.isNotNull(sysUser.getSex()) && sysUser.getSex().equals("0")){
-            this.sex = "男";
-        }else if(StringUtils.isNotNull(sysUser.getSex()) && sysUser.getSex().equals("1")){
-            this.sex = "女";
-        }else{
-            this.sex = "未知";
-        }
-        if(StringUtils.isNotNull(sysUser.getDateBirth())){
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            this.setDateBirth(sdf.format(sysUser.getDateBirth()));
-        }
-        this.grade = sysUser.getGradeName();
-        this.deptName = sysUser.getDept() == null ? null : sysUser.getDept().getDeptName();
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getMajor() {
-        return major;
-    }
-
-    public void setMajor(String major) {
-        this.major = major;
-    }
-
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getDateBirth() {
-        return dateBirth;
-    }
-
-    public void setDateBirth(String dateBirth) {
-        this.dateBirth = dateBirth;
-    }
-
-    public String getCardNum() {
-        return cardNum;
-    }
-
-    public void setCardNum(String cardNum) {
-        this.cardNum = cardNum;
-    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public String getTutorUserName() {
-        return tutorUserName;
-    }
-
-    public void setTutorUserName(String tutorUserName) {
-        this.tutorUserName = tutorUserName;
-    }
-
-    public String getWorkStatus() {
-        return workStatus;
-    }
-
-    public void setWorkStatus(String workStatus) {
-        this.workStatus = workStatus;
-    }
-}

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

@@ -1,191 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.ColumnType;
-import com.zd.common.core.annotation.Excel.Type;
-import com.zd.common.core.annotation.Excels;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户对象 sys_user
- *
- * @author zd
- */
-public class SysUserTeaCherByExcel {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 姓名
-     */
-    @Excel(name = "姓名" ,type = Excel.Type.ALL, isRequired=true)
-    private String nickName;
-
-    /**
-     * 工号
-     */
-    @Excel(name = "工号" ,type = Excel.Type.ALL, isRequired=true)
-    private String userName;
-
-    /**
-     * 所在部门
-     */
-    @Excel(name = "所在部门" ,type = Excel.Type.ALL, isRequired=true)
-    private String deptName;
-
-    /**
-     * 身份
-     */
-    @Excel(name = "身份" ,type = Excel.Type.ALL, isRequired=true)
-    private String pistionName;
-
-    /**
-     * 手机号码
-     */
-    @Excel(name = "手机号码" ,type = Excel.Type.ALL, isRequired=true)
-    private String phonenumber;
-
-    /**
-     * 邮箱
-     */
-    @Excel(name = "邮箱" ,type = Excel.Type.ALL)
-    private String email;
-
-    /**
-     * 性别
-     */
-    @Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知" ,type = Excel.Type.ALL)
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @Excel(name = "出生日期" ,type = Excel.Type.ALL ,dateFormat = "yyyy-MM-dd")
-    private Date dateBirth;
-
-    /**
-     * 校园卡号
-     */
-    @Excel(name = "校园卡号" ,type = Excel.Type.ALL)
-    private String cardNum;
-
-    /**
-     * 备注，用于记录错误的原因
-     */
-    @Excel(name = "备注" ,type = Excel.Type.EXPORT)
-    private StringBuffer failRemark = new StringBuffer();
-
-    /**
-     * 是否启用账户
-     */
-    private Boolean sysUserEnable;
-
-    /**
-     * 是否更新数据
-     */
-    private Boolean upDate;
-
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getPistionName() {
-        return pistionName;
-    }
-
-    public void setPistionName(String pistionName) {
-        this.pistionName = pistionName;
-    }
-
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public Date getDateBirth() {
-        return dateBirth;
-    }
-
-    public void setDateBirth(Date dateBirth) {
-        this.dateBirth = dateBirth;
-    }
-
-    public String getCardNum() {
-        return cardNum;
-    }
-
-    public void setCardNum(String cardNum) {
-        this.cardNum = cardNum;
-    }
-
-    public StringBuffer getFailRemark() {
-        return failRemark;
-    }
-
-    public void setFailRemark(StringBuffer failRemark) {
-        this.failRemark = failRemark;
-    }
-
-    public Boolean getSysUserEnable() {
-        return sysUserEnable;
-    }
-
-    public void setSysUserEnable(Boolean sysUserEnable) {
-        this.sysUserEnable = sysUserEnable;
-    }
-
-    public Boolean getUpDate() {
-        return upDate;
-    }
-
-    public void setUpDate(Boolean upDate) {
-        this.upDate = upDate;
-    }
-}

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

@@ -1,209 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.annotation.Excel.Type;
-import com.zd.common.core.utils.StringUtils;
-import org.springframework.beans.BeanUtils;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 用户对象 sys_user
- *
- * @author zd
- */
-public class SysUserTeaCherByExport {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 姓名
-     */
-    @Excel(name = "姓名" ,type = Type.EXPORT, isRequired=true)
-    private String nickName;
-
-    /**
-     * 工号
-     */
-    @Excel(name = "工号" ,type = Type.EXPORT, isRequired=true)
-    private String userName;
-
-    /**
-     * 所在部门
-     */
-    @Excel(name = "所在部门" ,type = Type.EXPORT, isRequired=true)
-    private String deptName;
-
-    /**
-     * 身份
-     */
-    @Excel(name = "身份" ,type = Type.EXPORT, isRequired=true)
-    private String positionName;
-
-    /**
-     * 手机号码
-     */
-    @Excel(name = "手机号码" ,type = Type.EXPORT)
-    private String phonenumber;
-
-    /**
-     * 邮箱
-     */
-    @Excel(name = "邮箱" ,type = Type.EXPORT)
-    private String email;
-
-    /**
-     * 职称
-     */
-    @Excel(name = "职称" ,type = Type.EXPORT)
-    private String category;
-
-    /**
-     * 文化程度
-     */
-    @Excel(name = "文化程度" ,type = Type.EXPORT)
-    private String education;
-
-    /**
-     * 性别
-     */
-    @Excel(name = "性别" ,type = Type.EXPORT)
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @Excel(name = "出生日期" ,type = Type.EXPORT)
-    private String dateBirth;
-
-    /**
-     * 校园卡号
-     */
-    @Excel(name = "校园卡号" ,type = Type.EXPORT)
-    private String cardNum;
-
-    /**
-     * 在职状态
-     */
-    @Excel(name = "在职状态" ,type = Type.EXPORT)
-    private String nature;
-
-
-    public SysUserTeaCherByExport(SysUser sysUser) {
-        BeanUtils.copyProperties(sysUser, this);
-        if(StringUtils.isNotNull(sysUser.getSex()) && sysUser.getSex().equals("0")){
-            this.sex = "男";
-        }else if(StringUtils.isNotNull(sysUser.getSex()) && sysUser.getSex().equals("1")){
-            this.sex = "女";
-        }else{
-            this.sex = "未知";
-        }
-        if(StringUtils.isNotNull(sysUser.getDateBirth())){
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            this.setDateBirth(sdf.format(sysUser.getDateBirth()));
-        }
-        if(StringUtils.isNotEmpty(sysUser.getNature()) && sysUser.getNature().equals("0")){
-            this.nature = "在职";
-        }else{
-            this.nature = "离职";
-        }
-
-        this.deptName = sysUser.getDept() == null ? null : sysUser.getDept().getDeptName();
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getPositionName() {
-        return positionName;
-    }
-
-    public void setPositionName(String positionName) {
-        this.positionName = positionName;
-    }
-
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getDateBirth() {
-        return dateBirth;
-    }
-
-    public void setDateBirth(String dateBirth) {
-        this.dateBirth = dateBirth;
-    }
-
-    public String getCardNum() {
-        return cardNum;
-    }
-
-    public void setCardNum(String cardNum) {
-        this.cardNum = cardNum;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getEducation() {
-        return education;
-    }
-
-    public void setEducation(String education) {
-        this.education = education;
-    }
-
-    public String getNature() {
-        return nature;
-    }
-
-    public void setNature(String nature) {
-        this.nature = nature;
-    }
-}

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

@@ -1,172 +0,0 @@
-package com.zd.system.api.domain;
-
-import com.zd.common.core.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.BeanUtils;
-
-import java.util.Optional;
-
-
-/**
- * 教职工列表VO
- *
- * @Author: zhoupan
- * @Date: 2021/09/11/11:14
- * @Description:
- */
-@ApiModel("教职工列表VO")
-public class TeacherListVO {
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
-    /**
-     * 部门ID
-     */
-    @ApiModelProperty(value = "部门ID")
-    private Long deptId;
-
-    /**
-     * 部门名称
-     */
-    @ApiModelProperty(value = "所属院系")
-    @Excel(name = "所属院系", type = Excel.Type.EXPORT, isRequired = true)
-    private String deptName;
-    /**
-     * 工号
-     */
-    @ApiModelProperty(value = "工号")
-    @Excel(name = "工号", type = Excel.Type.EXPORT)
-    private String userName;
-    /**
-     * 用户名称
-     */
-    @ApiModelProperty(value = "用户姓名")
-    @Excel(name = "姓名", type = Excel.Type.EXPORT)
-    private String nickName;
-
-    /**
-     * 手机号码
-     */
-    @ApiModelProperty(value = "手机号码")
-    @Excel(name = "联系方式", type = Excel.Type.EXPORT)
-    private String phonenumber;
-
-    /**
-     * 用户性别
-     */
-    @ApiModelProperty(value = "用户性别")
-    private String sex;
-
-    /**
-     * 职称（教授，助教）
-     */
-    @ApiModelProperty(value = "职称（教授，助教）")
-    @Excel(name = "职称", type = Excel.Type.EXPORT,dictLable="professional")
-    private String position;
-    /**
-     * 工作性质（0，非在编  1，在编）
-     */
-    @Excel(name = "工作性质", type = Excel.Type.EXPORT,dictLable="work_class")
-    @ApiModelProperty(value = "工作性质")
-    private String nature;
-
-
-    /**
-     * 管理实验室数量
-     */
-    @Excel(name = "管理实验室数量", type = Excel.Type.EXPORT)
-    @ApiModelProperty(value = "管理实验室数量")
-    private Integer manageSubCount;
-
-
-    public TeacherListVO(SysUser sysUser) {
-        BeanUtils.copyProperties(sysUser, this);
-        this.deptName = sysUser.getDept() == null ? null : sysUser.getDept().getDeptName();
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public String getNature() {
-        return nature;
-    }
-
-    public void setNature(String nature) {
-        this.nature = nature;
-    }
-
-    public Integer getManageSubCount() {
-        return manageSubCount;
-    }
-
-    public void setManageSubCount(Integer manageSubCount) {
-        this.manageSubCount = manageSubCount;
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.zd.system.api.domain;
-
-public class UrlVo {
-    private String name;
-    private String uri;
-    public UrlVo() {
-
-    }
-    public UrlVo(String name, String uri) {
-        this.name = name;
-        this.uri = uri;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/dto/SysUserDto.java

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

zd-api/zd-api-system/src/main/java/com/zd/system/api/exam/RemoteExamService.java

@@ -1,180 +0,0 @@
-package com.zd.system.api.exam;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.system.api.exam.domain.ElResources;
-import com.zd.system.api.factory.RemoteExamFallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 考试服务Feign调用接口
- *
- * @Author: zhoupan
- * @Date: 2021/09/03/14:29
- * @Description:
- */
-@FeignClient(contextId = "remoteExamService", value = ServiceNameConstants.EXAM_SERVICE, fallbackFactory = RemoteExamFallbackFactory.class)
-public interface RemoteExamService {
-
-    /**
-     * 查询在线考试列表（用户相关，区分列表接口）
-     */
-    @GetMapping(value = "/exam/onlineExamList")
-    @ApiOperation(value = "分页查询当前用户考试列表")
-    public TableDataInfo list(@RequestParam Map exam);
-
-    /**
-     * 去考试自动创建试卷
-     */
-    @ApiOperation(value = "去考试自动创建试卷")
-    @PostMapping(value = "/paper/create-paper")
-    public R<Object> createPaper(@RequestBody Map elPaper);
-
-    /**
-     * 交卷操作
-     */
-    @ApiOperation(value = "交卷操作")
-    @PostMapping(value = "/paper/handPaper")
-    public R<Object> handPaper(@RequestBody Map id);
-
-    /**
-     * 答题过程根据 paperId 和 quId 查询问题和选项
-     */
-    @ApiOperation(value = "查询问题和选项")
-    @PostMapping(value = "/paper/paperDetail")
-    public R<Object> queryQuDetail(@RequestBody Map paperQu);
-
-    /**
-     * 填充答案 下一题实时保存上题答案
-     *
-     * @param paperQuMap
-     */
-    @ApiOperation(value = "保存用户答案")
-    @PostMapping(value = "/paper/fillAnswer")
-    public R<Object> fillAnswer(@RequestBody Map<String,Object> paperQuMap);
-
-    /**
-     * 获取试卷管理详细信息（答题卡信息）
-     */
-    @GetMapping(value = "/paper/{id}")
-    public R<Object> getInfo(@PathVariable("id") Long id);
-
-
-    /**
-     * 根据用户id，修改积分内容
-     */
-    @PostMapping(value = "/points/record/recoveryPoints")
-    public R<Object> recoveryPoints(@RequestBody Map<String,Object> recovery);
-
-    /**
-     * 根据积分类型，扣除积分相关内容
-     */
-    @PostMapping(value = "/points/record/deductionPoints")
-    public R<Object> deductionPoints(@RequestBody Map<String,Object> deductionPoint);
-
-    /**
-     * 获取积分配置表信息
-     */
-    @PostMapping(value = "/markconfig/getPointsConfig")
-    public R<Object> getPointsConfig(@RequestBody Map<String,Object> markconfig);
-
-
-    /**
-     * 初始化奖励积分
-     */
-    @PostMapping(value = "/points/record/initCreditPoints")
-    public R<Object> initCreditPoints(@RequestBody Map<String,Object> initMap);
-
-
-    /**
-     * 获取奖励分接口
-     */
-    @PostMapping(value = "/points/record/obtainBonusPoints")
-    public R<Object> obtainBonusPoints(@RequestBody Map<String,Object> obtainMap);
-
-
-    /**
-     * 获取上月未违规记录接口
-     */
-    @PostMapping(value = "/points/record/getLastMonthViolation")
-    public R<Object> getLastMonthViolation(@RequestBody Map<String,Object> obtainMap);
-
-
-    /**
-     * 交卷查询考试结果
-     */
-    @ApiOperation(value = "查询考试结果")
-    @PostMapping(value = "/paper/paperResult")
-    public R<Map> paperResult(Map elPaper);
-
-    /**
-     * 查询当前用户考试记录列表
-     */
-    @GetMapping("/paper/appListAll")
-    public TableDataInfo myExamResultList(Map elUserExam);
-
-    /**
-     * 根据登录用户查询 我的证书列表
-     */
-    @PostMapping("/exam/queryMyCert")
-    public TableDataInfo queryMyCert(Map<String, Object> userCert);
-
-    /**
-     * 考试过程 查询当前考题的正确和错误数量
-     */
-    @GetMapping(value = "/paper/paperStatistics/{id}")
-    public R<Object> getPaperStatistics(@PathVariable("id") Long id);
-
-    /**
-     * 超时弃考
-     */
-    @ApiOperation(value = "超时弃考")
-    @PostMapping(value = "/paper/abandon")
-    public void abandonPaper();
-
-
-    /**
-     * 根据登录用户查询 我的积分列表
-     */
-    @PostMapping("/points/record/list/myApp")
-    public TableDataInfo recordMyApp(@RequestBody Map<String, Object> myApp);
-
-    /**
-     * 根据登录用户查询 我的积分统计
-     */
-    @PostMapping("/points/record/count/myApp")
-    public R<Object> recordMyAppCount();
-
-    @PostMapping("/points/record/exits")
-    public R<Object> findByUserId(@RequestBody Map<String, Object> map);
-
-    /**
-     * 进入/出加奖励分
-     * @param map
-     * @return
-     */
-    @PostMapping("/rewardconfig/addloginfo")
-    public R addLoginfo(@RequestBody Map map);
-
-    /**
-     * 获取奖励分配置表信息
-     * @param map
-     * @return
-     */
-    @PostMapping("/rewardconfig/getBonusPointsConfig")
-    public R getBonusPointsConfig(@RequestBody Map map);
-
-    /**
-     * 获取所有的学习资源
-     * @return
-     */
-    @RequestMapping("/el_resources/listAll")
-    public R<List<ElResources>> listAll();
-
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/exam/domain/ElPaperQuAnswer.java

@@ -1,58 +0,0 @@
-package com.zd.system.api.exam.domain;
-
-import com.zd.common.core.annotation.Excel;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/09/03/17:25
- * @Description:
- */
-public class ElPaperQuAnswer {
-    /**
-     * 自增ID
-     */
-    private Long id;
-
-    /**
-     * 试卷ID
-     */
-    @Excel(name = "试卷ID")
-    private Long paperId;
-
-    /**
-     * 回答项ID
-     */
-    @Excel(name = "回答项ID")
-    private Long answerId;
-
-    /**
-     * 题目ID
-     */
-    @Excel(name = "题目ID")
-    private Long quId;
-
-    /**
-     * 是否正确项
-     */
-    @Excel(name = "是否正确项")
-    private Integer isRight;
-
-    /**
-     * 是否选中 0 否，1 是
-     */
-    @Excel(name = "是否选中")
-    private Integer checked;
-
-    /**
-     * 排序
-     */
-    @Excel(name = "排序")
-    private Integer sort;
-
-    /**
-     * 选项标签
-     */
-    @Excel(name = "选项标签")
-    private String abc;
-
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/exam/domain/ElPaperQuDTO.java

@@ -1,70 +0,0 @@
-package com.zd.system.api.exam.domain;
-
-import com.zd.common.core.annotation.Excel;
-
-import java.util.List;
-
-/**
- * 试卷考题对象 el_paper_qu
- *
- * @author zd
- * @date 2021-08-31
- */
-public class ElPaperQuDTO {
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 试卷ID
-     */
-    @Excel(name = "试卷ID")
-    private Long paperId;
-
-    /**
-     * 题目ID
-     */
-    @Excel(name = "题目ID")
-    private Long quId;
-
-
-    /**
-     * 主观答案
-     */
-    @Excel(name = "主观答案")
-    private String answer;
-
-
-    List<ElPaperQuAnswer> elPaperQuAnswerList;
-
-    public Long getPaperId() {
-        return paperId;
-    }
-
-    public void setPaperId(Long paperId) {
-        this.paperId = paperId;
-    }
-
-    public Long getQuId() {
-        return quId;
-    }
-
-    public void setQuId(Long quId) {
-        this.quId = quId;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-
-    public List<ElPaperQuAnswer> getElPaperQuAnswerList() {
-        return elPaperQuAnswerList;
-    }
-
-    public void setElPaperQuAnswerList(List<ElPaperQuAnswer> elPaperQuAnswerList) {
-        this.elPaperQuAnswerList = elPaperQuAnswerList;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/exam/domain/ElResources.java

@@ -1,233 +0,0 @@
-package com.zd.system.api.exam.domain;
-
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.valid.ValidGroup;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * 课件资源对象 el_resources
- *
- * @author liubo
- * @date 2021-12-07
- */
-@ApiModel("课件资源")
-public class ElResources extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @ApiModelProperty(value = "${comment}")
-    private Long id;
-    /**
-     * 分类id
-     */
-    @Excel(name = "分类id")
-    @NotNull(groups = ValidGroup.Crud.Create.class, message = "分类id不能为空")
-    @ApiModelProperty(value = "分类id")
-    private Long cateId;
-
-    @ApiModelProperty(value = "分类标题")
-    private String cateTitle;
-
-    /**
-     * 标题
-     */
-    @Excel(name = "标题")
-    @NotBlank(groups = ValidGroup.Crud.Create.class, message = "标题不能为空")
-    @Length(message = "标题长度不能超过128")
-    @ApiModelProperty(value = "标题")
-    private String title;
-    /**
-     * 文件类型 1 文件，2 视频，3 图片，4 音频
-     */
-    @ApiModelProperty(value = "文件类型 1 文件，2 视频，3 图片，4 音频，5 富文本")
-    private Integer type;
-    /**
-     * 文件后缀
-     */
-    @Excel(name = "文件后缀")
-    @ApiModelProperty(value = "文件后缀")
-    private String postfix;
-    /**
-     * 文件大小
-     */
-    @Excel(name = "文件大小")
-    @ApiModelProperty(value = "文件大小")
-    private Long size;
-
-    private String sizeStr;
-    /**
-     * 文件时长
-     */
-    @Excel(name = "文件时长")
-    @ApiModelProperty(value = "文件时长")
-    private Long duration;
-
-    private String durationStr;
-    /**
-     * 文件路径
-     */
-    @Excel(name = "文件路径")
-    @ApiModelProperty(value = "文件路径")
-    private String path;
-
-    @ApiModelProperty(value = "富文本内容")
-    private String content;
-
-    private String beginTime;
-
-    private String endTime;
-
-    private List<Long> cateIds;
-
-    private String fileName;
-
-    private Long fileSize;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setCateId(Long cateId) {
-        this.cateId = cateId;
-    }
-
-    public Long getCateId() {
-        return cateId;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setPostfix(String postfix) {
-        this.postfix = postfix;
-    }
-
-    public String getPostfix() {
-        return postfix;
-    }
-
-    public void setSize(Long size) {
-        this.size = size;
-    }
-
-    public Long getSize() {
-        return size;
-    }
-
-    public void setDuration(Long duration) {
-        this.duration = duration;
-        if(duration != null){
-            this.setDurationStr(duration);
-        }
-    }
-
-    public Long getDuration() {
-        return duration;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public String getCateTitle() {
-        return cateTitle;
-    }
-
-    public void setCateTitle(String cateTitle) {
-        this.cateTitle = cateTitle;
-    }
-
-    public String getSizeStr() {
-         return sizeStr;
-    }
-
-    public void setSizeStr(String sizeStr) {
-        this.sizeStr = sizeStr;
-    }
-
-    public String getBeginTime() {
-        return beginTime;
-    }
-
-    public void setBeginTime(String beginTime) {
-        this.beginTime = beginTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getDurationStr() {
-        return durationStr;
-    }
-
-    public void setDurationStr(Long duration) {
-        this.duration = duration;
-    }
-
-    public List<Long> getCateIds() {
-        return cateIds;
-    }
-
-    public void setCateIds(List<Long> cateIds) {
-        this.cateIds = cateIds;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public Long getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Long fileSize) {
-        this.fileSize = fileSize;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/face/FaceCompare.java

@@ -1,39 +0,0 @@
-package com.zd.system.api.face;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/10/12/17:54
- * @Description:
- */
-@ApiModel("人脸对比提交参数")
-public class FaceCompare {
-    @ApiModelProperty("userId")
-    private Long userId;
-
-
-    @ApiModelProperty("特征码")
-    private byte[] data;
-
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public byte[] getData() {
-        return data;
-    }
-
-    public void setData(byte[] data) {
-        this.data = data;
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.zd.system.api.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.system.api.RemoteDeptService;
-import com.zd.system.api.domain.SysDept;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 部门服务降级处理
- *
- * @author zd
- */
-@Component
-public class RemoteDeptFallbackFactory implements FallbackFactory<RemoteDeptService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteDeptFallbackFactory.class);
-
-    @Override
-    public RemoteDeptService create(Throwable throwable) {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteDeptService() {
-            @Override
-            public R<List<SysDept>> getDeptList(SysDept sysDept) {
-                return R.fail("获取部门失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult allParentId(List<Long> deptIds) {
-                return AjaxResult.error("查询部门ID失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public Map<String, Object> queryDeptSignByUserId() {
-                return AjaxResult.error("查询部门电子签章失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult getInfoById(Long id) {
-                return AjaxResult.error("查询部门信息失败：" + throwable.getMessage());
-            }
-        };
-    }
-}

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

@@ -1,170 +0,0 @@
-package com.zd.system.api.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.system.api.exam.RemoteExamService;
-import com.zd.system.api.exam.domain.ElResources;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 考试服务降级处理
- *
- * @author zhoupan
- */
-@Component
-public class RemoteExamFallbackFactory implements FallbackFactory<RemoteExamService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteExamFallbackFactory.class);
-
-    @Override
-    public RemoteExamService create(Throwable throwable) {
-        log.error("考试服务调用失败:{}", throwable.getMessage());
-        return new RemoteExamService() {
-            @Override
-            public TableDataInfo list(Map exam) {
-                TableDataInfo dataInfo = new TableDataInfo<>();
-                dataInfo.setCode(R.FAIL);
-                return dataInfo;
-            }
-
-            @Override
-            public R<Object> createPaper(Map elPaper) {
-                return R.fail("开始考试失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> handPaper(Map elPaper) {
-                return R.fail("交卷失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> queryQuDetail(Map paperQu) {
-                return R.fail("调用答题过程失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> fillAnswer(Map<String,Object> paperQuMap) {
-                return R.fail("提交答案失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> getInfo(Long id) {
-                return R.fail("获取试卷管理详细信息失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> recoveryPoints(Map<String,Object> recovery) {
-                if(recovery.get("pointsType")!=null && recovery.get("pointsType").equals("2")){
-                    return R.fail("移除黑名单失败:" + throwable.getMessage());
-                }else if(recovery.get("pointsType")!=null && recovery.get("pointsType").equals("1")){
-                    return R.fail("移除负面清单失败:" + throwable.getMessage());
-                }
-                return R.fail("移除失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> deductionPoints(Map<String,Object> deductionPoint) {
-                return R.fail("扣除积分失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> getPointsConfig(Map<String,Object> markconfig) {
-                return R.fail("获取积分列表失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> initCreditPoints(Map<String,Object> initMap) {
-                return R.fail("初始化积分失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> obtainBonusPoints(Map<String,Object> obtainMap) {
-                return R.fail("获取奖励积分失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> getLastMonthViolation(Map<String,Object> obtainMap) {
-                return R.fail("获取上月的违规记录列表失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Map> paperResult(Map elPaper) {
-                return R.fail("查询考试结果失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public TableDataInfo myExamResultList(Map elUserExam) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setMsg("查询当前用户考试记录列表失败:" + throwable.getMessage());
-                tableDataInfo.setCode(500);
-                return tableDataInfo;
-            }
-
-            @Override
-            public TableDataInfo queryMyCert(Map<String, Object> userCert) {
-                TableDataInfo dataInfo = new TableDataInfo<>();
-                dataInfo.setCode(R.FAIL);
-                return dataInfo;
-            }
-
-            @Override
-            public R<Object> getPaperStatistics(Long id) {
-                return R.fail("查询当前考题的正确和错误数量失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public void abandonPaper() {
-                log.error("考试定时检查交卷超时失败！");
-            }
-
-            @Override
-            public TableDataInfo recordMyApp(Map<String, Object> myApp) {
-                TableDataInfo dataInfo = new TableDataInfo<>();
-                dataInfo.setCode(R.FAIL);
-                return dataInfo;
-            }
-
-            @Override
-            public R<Object> recordMyAppCount() {
-                return R.fail("查询我的积分统计失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> findByUserId(Map<String, Object> map) {
-               return R.fail("查询用户是否存在积分表失败:" + throwable.getMessage());
-            }
-
-            /**
-             * 进入/出加奖励分
-             *
-             * @param map
-             * @return
-             */
-            @Override
-            public R addLoginfo(Map map) {
-                return R.fail("用户本次加奖励分失败:" + throwable.getMessage());
-            }
-
-            /**
-             * 获取奖励分配置表信息
-             *
-             * @param map
-             * @return
-             */
-            @Override
-            public R getBonusPointsConfig(Map map) {
-                return R.fail("获取奖励分配置失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<List<ElResources>> listAll() {
-                return R.fail("获取学习资源列表失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

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

@@ -1,32 +0,0 @@
-package com.zd.system.api.factory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.RemoteFileService;
-import com.zd.system.api.domain.SysFile;
-
-/**
- * 文件服务降级处理
- *
- * @author zd
- */
-@Component
-public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
-
-    @Override
-    public RemoteFileService create(Throwable throwable) {
-        log.error("文件服务调用失败:{}", throwable.getMessage());
-        return new RemoteFileService() {
-            @Override
-            public R<SysFile> upload(MultipartFile file) {
-                throwable.printStackTrace();
-                return R.fail("上传文件失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

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

@@ -1,427 +0,0 @@
-package com.zd.system.api.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.model.entity.RemoteLabHardware;
-import com.zd.system.api.domain.Algorithm;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
-import com.zd.system.api.laboratory.domain.LabGradeManageRecord;
-import com.zd.system.api.laboratory.domain.LabMessageContent;
-import com.zd.system.api.laboratory.domain.LabSubjectVO;
-import com.zd.system.api.laboratory.domain.TotalByID;
-import com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class RemoteLaboratoryFallbackFactory implements FallbackFactory<RemoteLaboratoryService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteLaboratoryFallbackFactory.class);
-
-    @Override
-    public RemoteLaboratoryService create(Throwable cause) {
-        log.error("实验室服务调用失败:{}", cause.getMessage());
-        return new RemoteLaboratoryService() {
-            @Override
-            public R<List<LabSubjectVO>> getInfoByUserIds(String ids) {
-                return R.fail("获取负责人实验室数据失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> appReceivePhotoNote(Map<String, Object> photoNote) {
-                return R.fail("登录人接收随手拍统计失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> addPhotoNote(Map<String, Object> labPhotoNote) {
-                return R.fail("随手拍提交失败:" + cause.getMessage());
-            }
-
-            @Override
-            public TableDataInfo getAppList(Map appInfo) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setMsg("查询随手拍记录列表信息列表失败:" + cause.getMessage());
-                tableDataInfo.setCode(500);
-                return tableDataInfo;
-            }
-
-            @Override
-            public R<Object> isadmin(Map<String, Object> map) {
-                return R.fail("查询是否管理员失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> getPhotonoteInfo(Long id) {
-                return R.fail("获取随手拍详情失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> editPhotoNote(Map appInfo) {
-                return R.fail("随手拍审批失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> outSubjectPhoto() {
-                return R.fail("离开实验室拍照附件列表失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> outSubjectList() {
-                return R.fail("获取签到离开的实验室列表失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> addPhotoInspection(Map<String,Object> labPhotoInspection) {
-                return R.fail("拍照检查附件提交失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> getApprovalCount(@RequestParam Map<String, Object> approval) {
-                return R.fail("统计安全准入审批不同信息:" + cause.getMessage());
-            }
-
-            @Override
-            public TableDataInfo getApprovalList(Map approval) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setMsg("查询安全准入审批记录列表失败:" + cause.getMessage());
-                tableDataInfo.setCode(500);
-                return tableDataInfo;
-            }
-
-            @Override
-            public TableDataInfo getViolationList(Map violation) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setMsg("查询查询违规记录列表失败:" + cause.getMessage());
-                tableDataInfo.setCode(500);
-                return tableDataInfo;
-            }
-
-            @Override
-            public R<Object> myViolationCount(Map violation) {
-                return R.fail("查询违规记录列表失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> editViolation(Map<String, Object> params) {
-                return R.fail("修改违规记录失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> mySubjectList(Map violation) {
-                return R.fail("查询我的实验室列表失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R getMyCardInfo() {
-                return R.fail("获取学生卡和人脸信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> subjectMaterialList(Map material) {
-                return R.fail("获取实验室下的安全准入资格材料列表失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> getSubjectDict() {
-                return R.fail("小程序查询实验室列表失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> blacklistLearningRules(Map<String,Object> blackdetailMap) {
-                return R.fail("黑名单完成学习规则执行失败:" + cause.getMessage());
-            }
-
-
-
-
-            /**
-             * 负面清单完成学习规则
-             *
-             * @param violationId
-             * @param status
-             */
-            @Override
-            public R negativelistLearningRules(Long violationId, int status) {
-                return R.fail("负面清单完成学习规则执行失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> getBlackTimeArea(Map<String,Object> blackdetailMap) {
-                return R.fail("获取黑名单惩罚时间区间失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> approvalDetail(String ids) {
-                return R.fail("获取安全准入审批记录详细信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> accessReview(Map<String, Object> labApprovalMap) {
-                return R.fail("提交安全准入资格信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> appOperation(Map<String, Object> labApprovalMap) {
-                return R.fail("安全准入审批失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> failedOperation(Map<String, Object> labApprovalMap) {
-                return R.fail("安全准入审批拒绝失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> uploadFace(MultipartFile file) {
-                return R.fail("获取小程序人脸识别接口失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> userBlacklist(Long userId) {
-                return R.fail("获取用户黑名单信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R sends(String num, HardwareOperate hardwareOperate) {
-                return R.fail("摄像头在线离线调用失败:" + cause.getMessage());
-            }
-
-            @Override
-            public AjaxResult outTimeRecord() {
-                return AjaxResult.error("定时查询离开时间超过24小时，记违规任务失败：" + cause.getMessage());
-            }
-
-            @Override
-            public AjaxResult outTimeClearMessage() {
-                return AjaxResult.error("清理消息失败：" + cause.getMessage());
-            }
-
-            @Override
-            public AjaxResult publishMess(LabMessageContent labMessageContent) {
-                return AjaxResult.error("发送消息失败：" + cause.getMessage());
-            }
-
-            /**
-             * 查询实验室控制数据列表- 仅负责人权限（小程序使用）
-             *
-             * @return
-             */
-            @Override
-            public R queryMyAadminSubCListVO() {
-                return R.fail("查询我的实验室列表失败:" + cause.getMessage());
-
-            }
-
-            @Override
-            public R<List<TotalByID>> queryBuildingSubTotal(Long[] ids) {
-                return R.fail("获取实验室数量信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public TableDataInfo getSafeWarnList(Map riskPlanAbnormalLog) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setMsg("查询安全报警记录列表失败:" + cause.getMessage());
-                tableDataInfo.setCode(500);
-                return tableDataInfo;
-            }
-
-            @Override
-            public R getSafeWarnCount() {
-                return R.fail("查询安全报警记录统计失败:" + cause.getMessage());
-
-            }
-
-            @Override
-            public TableDataInfo getSubByRiskPlan(Map riskPlanAbnormalLog) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setMsg("查询预案列表失败:" + cause.getMessage());
-                tableDataInfo.setCode(500);
-                return tableDataInfo;
-            }
-
-            @Override
-            public R saveData(Algorithm algorithm) {
-                return R.fail("保存算法失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R getCheckInfo(Long id) {
-                return R.fail("获取实验室检查项失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R userexist(Long userId) {
-                return R.fail("查询用户违规项失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R getPersonInfo() {
-                 return R.fail("查询用户及违规信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R getViolationTime(Long violationId) {
-                return R.fail("查询违规起始时间失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R getPracticeNum(Long violationId) {
-                return R.fail("查询做题数量失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> listGroupBy(Map<String, Object> map) {
-                return R.fail("安全检查项按时间分组查询失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> selectInfoByRoom(Map<String, Object> map) {
-                return R.fail("根据参数查询实验室信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> addCg(Map<String, Object> map) {
-                return R.fail("安全检查草稿保存失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> addTj(Map<String, Object> map) {
-                return R.fail("安全检查保存失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> recordDettailsList(Integer id) {
-                return R.fail("根据检查项获取 隐患整改集合失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> editCheckRecord(Map<String, Object> map) {
-                return R.fail("安全检查修改失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> editCheckRecordDetailsList(Map<String, Object> map) {
-                return R.fail("安全检查详情列表添加失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> selectUserInfoById(Long id) {
-                return R.fail("根据用户id查询用户信息失败:" + cause.getMessage());
-            }
-
-            @Override
-            public void genNotice(Long id, HttpServletResponse response) {
-                throw new ServiceException("生成整改通知书失败" + cause.getMessage());
-            }
-
-            @Override
-            public void genReport(Long id, HttpServletResponse response) {
-                throw new ServiceException("生成整改报告" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> getSpeakerByFloor(Long floorId) {
-                throw new ServiceException("根据楼层获取喇叭列表" + cause.getMessage());
-            }
-
-            @Override
-            public R<Object> getSpeakerBySub(Long floorId, Long subId) {
-                throw new ServiceException("根据楼层获取喇叭列表" + cause.getMessage());
-            }
-
-            @Override
-            public void workArrange() {
-                throw new ServiceException("定时任务分级管控工作过期记录 - 并排列下次工作计划失败：" + cause.getMessage());
-            }
-
-            @Override
-            public void workOverdue() {
-                throw new ServiceException("定时任务分级管控早8点管控工作逾期通知：" + cause.getMessage());
-            }
-
-            @Override
-            public void workExecuteByDay() {
-                throw new ServiceException("定时任务分级管控工作下午7点 管控工作执行通知：" + cause.getMessage());
-            }
-
-            @Override
-            public void workExecute() {
-                throw new ServiceException("定时任务分级管控早8点 其他管控工作执行通知：" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<LabGradeManageWorkVO>> havingList(LabGradeManageRecord labGradeManageRecord) {
-                throw new ServiceException("查询分级管控未完成工作列表" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<LabGradeManageWorkVO>> finishList(LabGradeManageRecord labGradeManageRecord) {
-                throw new ServiceException("查询分级管控已完成工作列表" + cause.getMessage());
-            }
-
-            @Override
-            public R<LabGradeManageRecord> finish(LabGradeManageRecord labGradeManageRecord) {
-                throw new ServiceException("完成分级管控工作" + cause.getMessage());
-            }
-
-            @Override
-            public R<LabGradeManageRecord> getInfo(Long id) {
-                throw new ServiceException("获取分级管控工作详细信息" + cause.getMessage());
-            }
-
-            @Override
-            public R<LabGradeManageWorkVO> queryByMessage(LabGradeManageRecord labGradeManageRecord) {
-                throw new ServiceException("获取分级管控工作详细信息" + cause.getMessage());
-            }
-
-            /**
-             * 安全检查隐患项未整改逾期通知
-             */
-            @Override
-            public void checkSendMsgBeOverdue() {
-                throw new ServiceException("安全检查隐患项未整改逾期通知" + cause.getMessage());
-            }
-
-            @Override
-            public void logoNotice() {
-                throw new ServiceException("logo通知失败" + cause.getMessage());
-            }
-
-            @Override
-            public Object controlByInside(Long id, String type) {
-                throw new ServiceException("继电器远程控制失败：" + cause.getMessage());
-            }
-
-            @Override
-            public R <List <LinkedHashMap <String, String>>> getHardwareByLockList(Map cabinetSetId) {
-                throw new ServiceException("获取柜锁列表失败：" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<RemoteLabHardware>> listStart() {
-                return R.fail("查询FRID设备失败：" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<RemoteLabHardware>> remoteList(RemoteLabHardware remoteLabHardware) {
-                return R.fail("查询设备失败：" + cause.getMessage());
-            }
-
-            @Override
-            public R<Integer> update(@RequestParam("operate") HardwareOperate operate, String ipAddress) {
-                return R.fail("FRID设备状态修改失败：" + cause.getMessage());
-            }
-
-        };
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.zd.system.api.factory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.RemoteLogService;
-import com.zd.system.api.domain.SysLogininfor;
-import com.zd.system.api.domain.SysOperLog;
-
-/**
- * 日志服务降级处理
- *
- * @author zd
- */
-@Component
-public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
-
-    @Override
-    public RemoteLogService create(Throwable throwable) {
-        log.error("日志服务调用失败:{}", throwable.getMessage());
-        return new RemoteLogService() {
-            @Override
-            public R<Boolean> saveLog(SysOperLog sysOperLog, String source) {
-                return R.fail("日志存储失败："+throwable.getMessage());
-            }
-
-            @Override
-            public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source) {
-                return null;
-            }
-        };
-
-    }
-}

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

@@ -1,113 +0,0 @@
-package com.zd.system.api.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.system.api.laboratory.RemoteMessageContentService;
-import com.zd.system.api.laboratory.domain.LabMessageUser;
-import com.zd.system.api.laboratory.domain.vo.LabMessageUserListVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/09/07/8:30
- * @Description:
- */
-@Component
-public class RemoteMessageContentFallbackFactory implements FallbackFactory<RemoteMessageContentService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteMessageContentFallbackFactory.class);
-
-
-    @Override
-    public RemoteMessageContentService create(Throwable cause) {
-        log.error("实验室服务调用失败:{}", cause.getMessage());
-        return new RemoteMessageContentService() {
-            /**
-             * 查询我的消息
-             *
-             * @param pagNum
-             * @param PageSize
-             */
-            @Override
-            public TableDataInfo<LabMessageUserListVO> mylist(Long pagNum, Long PageSize) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setCode(500);
-                tableDataInfo.setMsg("查询消息列表错误失败:" + cause.getMessage());
-                return tableDataInfo;
-            }
-
-            /**
-             * 查询我的消息-发送人分组-(只查询管理员消息)
-             *
-             * @param pageNum
-             * @param pageSize
-             */
-            @Override
-            public TableDataInfo myGrouplist(Long pageNum, Long pageSize) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setCode(500);
-                tableDataInfo.setMsg("查询我的消息-发送人分组失败:" + cause.getMessage());
-                return tableDataInfo;
-            }
-
-            /**
-             * 查询我的消息统计数量
-             *
-             * @return
-             */
-            @Override
-            public R<Object> myGroupTotalCount() {
-                return R.fail("查询我的消息统计数量失败:" + cause.getMessage());
-            }
-
-            /**
-             * 查询安全准入消息信息
-             *
-             * @param messageId
-             * @return
-             */
-            @Override
-            public R<Object> myRead(Long messageId) {
-                return R.fail("查询安全准入消息信息失败:" + cause.getMessage());
-            }
-
-            /**
-             * 查询我的消息-发送人分组-分组内消息
-             *
-             * @param pageNum
-             * @param pageSize
-             * @param id
-             */
-            @Override
-            public TableDataInfo myGrouplistById(Long pageNum, Long pageSize, Long id) {
-                TableDataInfo tableDataInfo = new TableDataInfo();
-                tableDataInfo.setCode(500);
-                tableDataInfo.setMsg("查询我的消息-发送人分组失败:" + cause.getMessage());
-                return tableDataInfo;
-            }
-
-            /**
-             * 查询消息内容
-             *
-             * @param id
-             * @return
-             */
-            @Override
-            public R<LabMessageUser> message(Long id) {
-                return R.fail("查询消息内容失败:" + cause.getMessage());
-            }
-
-            @Override
-            public void readByLoginUser(LabMessageUser labMessageUser) {
-
-            }
-
-            @Override
-            public R addDynamicMessage(Object obj) {
-                return null;
-            }
-        };
-    }
-}

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

@@ -1,77 +0,0 @@
-package com.zd.system.api.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SubQueryConfig;
-import com.zd.system.api.laboratory.CabinetV2Lock;
-import com.zd.system.api.laboratory.RemoteSubQueryService;
-import com.zd.system.api.laboratory.domain.CabinetLock;
-import com.zd.system.api.laboratory.domain.LabSubject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class RemoteSubQueryFallbackFactory implements FallbackFactory<RemoteSubQueryService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteSubQueryFallbackFactory.class);
-
-
-    @Override
-    public RemoteSubQueryService create(Throwable cause) {
-        log.error("实验室服务调用失败:{}", cause.getMessage());
-        return new RemoteSubQueryService() {
-
-            /**
-             * 查询实验室详情
-             */
-            @Override
-            public R<Object> getSafeWarnCount(Long id, SubQueryConfig subQueryConfig) {
-                return R.fail("查询实验室详情失败:" + cause.getMessage());
-            }
-
-            /**
-             * 查询实验室数据列表- 数据权限（包括负责人）
-             */
-            @Override
-            public R<Object> querySubCListVO(Map<String,Object> appSubQuery) {
-                return R.fail("查询实验室数据列表失败:" + cause.getMessage());
-            }
-
-            /**
-             * 查询管理实验室和预案执行数量
-             */
-            @Override
-            public R<Map<String,Object>> querySubCListVO() {
-                return R.fail("查询管理实验室和预案执行数量失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<LabSubject>> listByIds(List<Long> ids) {
-                return R.fail("查询管理实验室失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<LabSubject>> listByName(String name) {
-                return R.fail("查询管理实验室失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R cabinetLock(CabinetLock cabinetLock) {
-                return R.fail("柜锁操作失败：" + cause.getMessage());
-            }
-
-            @Override
-            public R cabinetV2OpenLock(CabinetV2Lock cabinetV2Lock) {
-                return R.fail("柜锁开锁失败：" + cause.getMessage());
-            }
-
-            @Override
-            public R cabinetV2CloseLock(CabinetV2Lock cabinetV2Lock) {
-                return R.fail("柜锁关锁失败：" + cause.getMessage());
-            }
-        };
-    }
-}

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

@@ -1,195 +0,0 @@
-package com.zd.system.api.factory;
-
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.system.api.domain.SysLogoConfigVO;
-import com.zd.system.api.model.SimpleUserVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.RemoteUserService;
-import com.zd.system.api.domain.SysUser;
-import com.zd.system.api.model.LoginUser;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-/**
- * 用户服务降级处理
- *
- * @author zd
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable) {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-
-            private static final String MESSAGE_HEAD="获取用户失败:";
-            @Override
-            public R<LoginUser> getUserInfo(String username, String source) {
-                return R.fail(MESSAGE_HEAD + throwable.getMessage());
-            }
-
-            @Override
-            public R<LoginUser> getUserInfo(String username, Integer loginType, String source) {
-                return R.fail(MESSAGE_HEAD + throwable.getMessage());
-            }
-
-            /**
-             * 通过用户ID查询用户信息
-             *
-             * @param id     用户id
-             * @param source 请求来源
-             * @return 结果
-             */
-            @Override
-            public R<SysUser> getUserInfoByUserId(Long id, String source) {
-                return R.fail(MESSAGE_HEAD + throwable.getMessage());
-            }
-
-            /**
-             * 通过用户账户查询用户信息
-             *
-             * @param userName 用户账户
-             * @param source   请求来源
-             * @return 结果
-             */
-            @Override
-            public R<SysUser> getUserInfoByUserName(String userName, String source) {
-                return R.fail(MESSAGE_HEAD + throwable.getMessage());
-            }
-            /**
-             * 通过用户卡号查询用户信息
-             *
-             * @param userName 用户账户
-             * @param source   请求来源
-             * @return 结果
-             */
-            @Override
-            public R<SysUser> getUserInfoByCardNum(String userName, String source) {
-                return R.fail("通过用户卡号查询用户信息失败:" + throwable.getMessage());
-            }
-
-
-
-            @Override
-            public R<Boolean> registerUserInfo(SysUser sysUser, String source) {
-                return R.fail("注册用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<SimpleUserVO> myInfoSimple(String source) {
-                return R.fail("查询当前用户简略信息失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<List<Long>> userALLIDS(String source) {
-                return R.fail("获取所有用户ID失败:" + throwable.getMessage());
-            }
-
-            /**
-             * 根据用户ids获取电话
-             *
-             * @param ids
-             * @return 结果
-             */
-            @Override
-            public R<List<String>> getPhoneByUserIDS(String ids) {
-                return R.fail("获取所有用户手机号失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<List<Long>> userDeptIDS(String deptId, String source) {
-                return R.fail("获取院系下用户ID失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> departmentsList() {
-                return R.fail("获取小程序查询院系列表失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Object> building(Long deptId) {
-                return R.fail("获取小程序查询院系下楼栋列表失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult getRouters(Long userId) {
-                return AjaxResult.error("登录获取菜单失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult selectAuthUserPower(Long userId) {
-                return AjaxResult.error("大屏用户权限失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult editUser(SysUser user) { return AjaxResult.error("学生信息更新失败：" + throwable.getMessage()); }
-
-            @Override
-            public AjaxResult editStudent(SysUser user) { return AjaxResult.error("安全准入学生信息更新失败：" + throwable.getMessage()); }
-
-            @Override
-            public R updateSignature(MultipartFile file) {
-                return R.fail("修改签名信息失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult getConfigKey(String configKey) {
-                return AjaxResult.error("获取默认密码数据失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public R querySignature() {
-                return R.fail("查询签名信息失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public R <SysLogoConfigVO> getConfigLogo() {
-                return R.fail("查询一体机logo信息失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult remove(Long[] userIds) {
-                return AjaxResult.error("用户账号信息删除失败："+throwable.getMessage());
-            }
-
-            /**
-             * 获取当前登录用户所属学校以及院系id集合
-             *
-             * @return
-             */
-            @Override
-            public R<List<Long>> getLogingUserDeptids() {
-                return R.fail("获取登录用户所属学校及院系失败:" + throwable.getMessage());
-            }
-
-            /**
-             * 获取当前登录用户所属学校的deptid
-             *
-             * @return
-             */
-            @Override
-            public R<Long> getLoginUserSchoolDeptid() {
-                return R.fail("获取当前登录用户所属学校的deptid失败:" + throwable.getMessage());
-            }
-
-            /***
-             * 根据电话查询用户信息
-             * @param phone
-             * @return
-             */
-            @Override
-            public R<SysUser> getUserByPhone(String phone) {
-                return R.fail("根据电话查询用户信息失败:" + throwable.getMessage());
-            }
-
-
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/kkFile/RemoteKkFileService.java

@@ -1,17 +0,0 @@
-package com.zd.system.api.kkFile;
-
-import com.zd.system.api.kkFile.factory.RemoteKkFileServiceFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.net.URI;
-
-/**
- * 文件远程调用
- */
-@FeignClient(name = "remoteKkFileService",url = "http://127.0.0.1:8012", fallbackFactory = RemoteKkFileServiceFallbackFactory.class)
-public interface RemoteKkFileService {
-    @GetMapping("/onlinePreview")
-    String getKkFilePath(URI uri,@RequestParam("url") String url);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/kkFile/factory/RemoteKkFileServiceFallbackFactory.java

@@ -1,21 +0,0 @@
-package com.zd.system.api.kkFile.factory;
-
-import com.zd.system.api.kkFile.RemoteKkFileService;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.net.URI;
-
-@Component
-public class RemoteKkFileServiceFallbackFactory implements FallbackFactory<RemoteKkFileService> {
-    @Override
-    public RemoteKkFileService create(Throwable throwable) {
-        return new RemoteKkFileService(){
-            @Override
-            public String getKkFilePath(URI uri,@RequestParam("url") String url) {
-                return throwable.getMessage();
-            }
-        };
-    }
-}

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

@@ -1,115 +0,0 @@
-package com.zd.system.api.laboratory;
-
-public class CabinetV2Lock {
-
-    /**
-     * 柜锁记录Id
-     */
-    private Long lockLogId;
-
-    /**
-     * 硬件ID
-     */
-    private String hardwareId;
-
-    /**
-     * 摄像头IP 地址
-     */
-    private String ipAddress;
-
-    /**
-     * 柜锁bit ID
-     */
-    private String lockId;
-
-    /**
-     * 柜锁名称
-     */
-    private String lockName;
-
-    /**
-     * 机柜名称
-     */
-    private String cabinetName;
-
-    /**
-     * 采集器编号
-     */
-    private String relayCode;
-
-    private boolean success = false;
-
-    private String msg;
-
-    public String getIpAddress() {
-        return ipAddress;
-    }
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public String getLockName() {
-        return lockName;
-    }
-
-    public void setLockName(String lockName) {
-        this.lockName = lockName;
-    }
-
-    public String getCabinetName() {
-        return cabinetName;
-    }
-
-    public void setCabinetName(String cabinetName) {
-        this.cabinetName = cabinetName;
-    }
-
-    public String getHardwareId() {
-        return hardwareId;
-    }
-
-    public void setHardwareId(String hardwareId) {
-        this.hardwareId = hardwareId;
-    }
-
-    public String getLockId() {
-        return lockId;
-    }
-
-    public void setLockId(String lockId) {
-        this.lockId = lockId;
-    }
-
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public String getRelayCode() {
-        return relayCode;
-    }
-
-    public void setRelayCode(String relayCode) {
-        this.relayCode = relayCode;
-    }
-
-    public Long getLockLogId() {
-        return lockLogId;
-    }
-
-    public void setLockLogId(Long lockLogId) {
-        this.lockLogId = lockLogId;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}

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

@@ -1,466 +0,0 @@
-package com.zd.system.api.laboratory;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.model.entity.RemoteLabHardware;
-import com.zd.system.api.domain.Algorithm;
-import com.zd.system.api.factory.RemoteLaboratoryFallbackFactory;
-import com.zd.system.api.laboratory.domain.LabGradeManageRecord;
-import com.zd.system.api.laboratory.domain.LabMessageContent;
-import com.zd.system.api.laboratory.domain.LabSubjectVO;
-import com.zd.system.api.laboratory.domain.TotalByID;
-import com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkVO;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 实验室feign调用服务
- *
- * @Author: zhoupan
- * @Date: 2021/09/06/11:28
- * @Description:
- */
-@FeignClient(contextId = "remoteLaboratoryService", value = ServiceNameConstants.LABORATORY_SERVICE, fallbackFactory = RemoteLaboratoryFallbackFactory.class)
-public interface RemoteLaboratoryService {
-
-    @ApiOperation(value = "批量获取管理实验室数量-根据用户IDS")
-    @GetMapping(value = "/subject/count/{ids}")
-    public R<List<LabSubjectVO>> getInfoByUserIds(@PathVariable("ids") String ids);
-
-    @ApiOperation(value = "新增随手拍记录")
-    @PostMapping("/photonote")
-    public R<Object> addPhotoNote(@RequestBody Map<String, Object> labPhotoNote);
-
-
-    @ApiOperation(value = "小程序查询登录人接收随手拍统计")
-    @GetMapping("/photonote/appReceivePhotoNote")
-    public R<Object> appReceivePhotoNote(@RequestBody Map<String, Object> photoNote);
-
-    @ApiOperation(value = "获取随手拍记录列表信息（管理端）")
-    @GetMapping("/photonote/getAppList")
-    public TableDataInfo getAppList(@RequestBody Map appInfo);
-
-    @ApiOperation(value = "查询登录用户是否是实验室管理员（数据权限）")
-    @GetMapping("/subject/my/isadmin")
-    public R<Object> isadmin(@RequestBody Map<String, Object> map);
-
-    /**
-     * 获取随手拍记录详细信息
-     */
-    @ApiOperation(value = "获取随手拍记录详细信息")
-    @GetMapping(value = "/photonote/getPhotonote/{id}")
-    public R<Object> getPhotonoteInfo(@PathVariable("id") Long id);
-
-    @ApiOperation(value = "处理随手拍记录")
-    @PostMapping("/photonote/appHandle")
-    public R<Object> editPhotoNote(@RequestBody Map appInfo);
-
-
-    @ApiOperation(value = "离开实验室拍照附件列表")
-    @GetMapping("/inspection")
-    public R<Object> outSubjectPhoto();
-
-    @ApiOperation(value = "获取签到离开的实验室列表")
-    @GetMapping("/inspection/outSubjectList")
-    public R<Object> outSubjectList();
-
-
-    @ApiOperation(value = "新增拍照检查附件")
-    @PostMapping("/inspection/savaPhotoFj")
-    public R<Object> addPhotoInspection(@RequestBody Map<String,Object> labPhotoInspection);
-
-
-    @ApiOperation(value = "统计安全准入审批不同信息")
-    @GetMapping("/approval/getApprovalCount")
-    public R<Object> getApprovalCount(@RequestBody Map<String, Object> approval);
-
-
-    @ApiOperation(value = "查询安全准入审批记录列表")
-    @GetMapping("/approval/getApprovalList")
-    public TableDataInfo getApprovalList(@RequestBody Map approval);
-
-    @ApiOperation(value = "查询违规记录列表")
-    @GetMapping("/violation/mylist")
-    public TableDataInfo getViolationList(Map violation);
-
-    @ApiOperation(value = "查询我的违规记录统计")
-    @GetMapping("/workbench/myViolationCount")
-    public R<Object> myViolationCount(@RequestBody Map violation);
-
-    @ApiOperation(value = "修改违规记录")
-    @PutMapping("/violation")
-    public R<Object> editViolation(@RequestBody Map<String, Object> params);
-
-    @ApiOperation(value = "查询我的实验室列表")
-    @GetMapping("/workbench/mySubjectList")
-    public R<Object> mySubjectList(@RequestBody Map subjectMap);
-
-    /**
-     * 获取当前用户学生卡和人脸信息
-     */
-    @ApiOperation(value = "获取当前用户学生卡和人脸信息")
-    @GetMapping(value = "/studentinfo/my")
-    public R getMyCardInfo();
-
-
-    /**
-     * 查询实验室下的安全准入资格材料列表
-     */
-    @ApiOperation(value = "查询实验室下的安全准入资格材料列表")
-    @GetMapping(value = "/material/subjectMaterialList")
-    public R<Object> subjectMaterialList(@RequestBody Map material);
-
-    /**
-     * 小程序查询实验室列表（用户端,管理端）
-     */
-    @ApiOperation(value = "小程序查询实验室列表（用户端,管理端）")
-    @GetMapping(value = "/subject/getSubjectDict")
-    public R<Object> getSubjectDict();
-
-
-    /**
-     * 黑名单完成学习规则
-     */
-    @PostMapping(value = "/blacklist/blacklistLearningRules")
-    public R<Object> blacklistLearningRules(@RequestBody Map<String,Object> blackdetailMap);
-//
-//    /**
-//     * 负面清单更改状态
-//     */
-//
-//    @GetMapping("/negativeListRecords/LearningRules")
-//    public R negativelistLearningRules(@RequestParam Long violationId,
-//                                       @RequestParam int status);
-
-    /**
-      * 负面清单更改状态
-    */
-    @GetMapping("/negativeListRecords/LearningRules/{violationId}/{status}")
-    public R negativelistLearningRules(@PathVariable("violationId") Long violationId,
-                                       @PathVariable("status") int status);
-
-
-    /**
-     * 获取黑名单惩罚时间区间
-     */
-    @PostMapping(value = "/blacklist/getBlackTimeArea")
-    public R<Object> getBlackTimeArea(@RequestBody Map<String,Object> blackdetailMap);
-
-
-    /**
-     * 查询实验室控制数据列表（小程序使用）
-     * 按意见修改为 数据权限&负责人权限
-     *
-     * @return
-     */
-    @ApiOperation("查询实验室控制数据列表")
-    @GetMapping("/subject/manger/list")
-    public R queryMyAadminSubCListVO();
-
-    /**
-     * 获取安全准入审批记录详细信息
-     */
-    @ApiOperation(value = "获取安全准入审批记录详细信息")
-    @GetMapping(value = "/approval/{ids}")
-    public R<Object> approvalDetail(@PathVariable("ids") String ids);
-
-    /**
-     * 小程序安全准入资格提交
-     */
-    @ApiOperation(value = "小程序安全准入资格提交")
-    @PostMapping(value = "/approval/accessReview")
-    public R<Object> accessReview(@RequestBody Map<String, Object> labApprovalMap);
-
-    /**
-     * 安全准入资格审批(管理端)
-     */
-    @ApiOperation(value = "安全准入资格审批(管理端)")
-    @PutMapping(value = "/approval/appOperation")
-    public R<Object> appOperation(@RequestBody Map<String, Object> labApprovalMap);
-
-    /**
-     * 小程序安全准入资格拒绝审批(管理端)
-     */
-    @ApiOperation(value = "小程序安全准入资格拒绝审批(管理端)")
-    @PutMapping(value = "/approval/failedOperation")
-    public R<Object> failedOperation(@RequestBody Map<String, Object> labApprovalMap);
-
-    /**
-     * 小程序人脸识别接口
-     */
-    @ApiOperation(value = "小程序人脸识别接口")
-    @PostMapping(value = "/studentinfo/commit/face" , consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<Object> uploadFace(@RequestPart(value = "file") MultipartFile file);
-
-
-    @GetMapping("/subject/manger/{ids}/SubTotal/")
-    public R<List<TotalByID>> queryBuildingSubTotal(@PathVariable("ids") Long[] ids);
-
-    /**
-     * 根据用户查询黑名单列表
-     */
-    @PostMapping("/blacklist/info/{userId}")
-    public R<Object> userBlacklist(@PathVariable("userId") Long userId);
-
-    @RequestMapping("/service/mqtt/send/{num}/{hardwareOperate}")
-    public R sends(@PathVariable("num") String num, @PathVariable("hardwareOperate") HardwareOperate hardwareOperate);
-
-
-    /**
-     * 定时器定时查询离开时间超过24小时，记违规
-     */
-    @PutMapping("/record/outTimeRecord")
-    public AjaxResult outTimeRecord();
-
-
-    /**
-     * 定时器定时查询预案向一体机推送的消息，如果超过两小时，需要清理
-     */
-    @PutMapping("/content/outTimeClearMessage")
-    public AjaxResult outTimeClearMessage();
-
-
-    /**
-     * 新增消息发布
-     */
-    @PostMapping("/content")
-    public AjaxResult publishMess(@RequestBody LabMessageContent labMessageContent);
-
-
-    @ApiOperation(value = "查询安全预警列表 （管理端）")
-    @GetMapping("/plan/log/app/subBySensorList")
-    public TableDataInfo getSafeWarnList(Map riskPlanAbnormalLog);
-
-
-    /**
-     * 查询违规记录统计
-     */
-    @ApiOperation(value = "查询安全预警统计 （管理端）")
-    @GetMapping("/plan/log/app/subBySensorCount")
-    public R<Object> getSafeWarnCount();
-
-
-    @ApiOperation(value = "查询实验室下的预案列表 （管理端）")
-    @GetMapping("/plan/log/app/adminSubByRiskPlan")
-    public TableDataInfo getSubByRiskPlan(Map riskPlanAbnormalLog);
-
-
-    @PostMapping("/algorithm/save")
-    public R saveData(Algorithm algorithm);
-
-    /**
-     * 小程序查询实验室列表（用户端,管理端）
-     */
-    @ApiOperation(value = "小程序查询实验室列表（用户端,管理端）")
-    @RequestMapping(value = "/subject/check/{id}")
-    R<Map<Object, Object>> getCheckInfo(@PathVariable("id") Long id);
-
-    @PostMapping("/violation/userexist/{userId}")
-    public R userexist(@PathVariable("userId") Long userId);
-
-    @GetMapping("/violation/userInfo")
-    public R getPersonInfo();
-
-
-    /**
-     * 获取违规时间段
-     * @param violationId
-     * @return
-     */
-    @GetMapping("/negativeListRecords/getViolationTime")
-    public R getViolationTime(Long violationId);
-
-//    /**
-//     * 获取做题数量和准确率
-//     * @param violationId
-//     * @return
-//     */
-//    @GetMapping("/negativeListRecords/getpracticenum")
-//    public R getPracticeNum(@RequestParam Long violationId);
-
-
-    /**
-     * 获取做题数量和准确率
-     * @param violationId
-     * @return
-     */
-    @GetMapping("/negativeListRecords/getpracticenum/{violationId}")
-    public R getPracticeNum(@PathVariable("violationId") Long violationId);
-
-    /*@GetMapping("/violation/historyList")
-    @ApiOperation(value = "查询违规记录列表")
-    public TableDataInfo violationhistoryList(@RequestParam(defaultValue = "-1") String overStatus,
-                                              @RequestParam(defaultValue = "") String statTime,
-                                              @RequestParam(defaultValue = "") String endTime);*/
-
-
-
-    @ApiOperation(value = "小程序安全检查记录-按时间分组")
-    @GetMapping("/checkRecord/listGroupBy")
-    public R<Object> listGroupBy(@RequestBody Map<String, Object> map);
-
-    @ApiOperation(value = "小程序安全检查（根据房间号查询实验室信息）")
-    @GetMapping("/checkRecord/selectInfoByRoom")
-    public R<Object> selectInfoByRoom(@RequestBody Map<String, Object> map);
-
-    @ApiOperation(value = "小程序安全检查 草稿保存")
-    @PostMapping("/checkRecord/addCg")
-    public R<Object> addCg(@RequestBody Map<String, Object> map);
-
-    @ApiOperation(value = "小程序安全检查保存")
-    @PostMapping("/checkRecord/addTj")
-    public R<Object> addTj(@RequestBody Map<String, Object> map);
-
-    @ApiOperation(value = "根据检查项获取 隐患整改集合")
-    @GetMapping("/checkRecord/recordDettailsList")
-    public R<Object> recordDettailsList(@PathVariable("id") Integer id);
-
-    @ApiOperation(value = "小程序安全检查修改")
-    @PostMapping("/checkRecord/edit")
-    public R<Object> editCheckRecord(@RequestBody Map<String, Object> map);
-
-    @ApiOperation(value = "修改安全检查隐患列表")
-    @PostMapping("/checkRecordDetails/editList")
-    public R<Object> editCheckRecordDetailsList(@RequestBody Map<String, Object> map);
-
-    @ApiOperation(value = "根据用户id查询用户信息")
-    @GetMapping("/user/info/id/{id}")
-    public R<Object> selectUserInfoById(@PathVariable("id") Long id);
-
-    /**
-     * 小程序单个 生成整改通知书
-     */
-    @ApiOperation(value = "生成整改通知书")
-    @GetMapping("/checkOption/genNotice/{id}")
-    public void genNotice(@PathVariable("id") Long id, HttpServletResponse response);
-
-    /**
-     * 小程序单个 生成整改报告
-     */
-    @ApiOperation(value = "生成整改报告")
-    @GetMapping("/checkOption/genReport/{id}")
-    public void genReport(@PathVariable("id") Long id, HttpServletResponse response);
-
-    /**
-     * 根据楼层获取喇叭列表
-     */
-    @ApiOperation(value = "根据楼层获取喇叭列表")
-    @RequestMapping("/sparseHardware/getSpeakerByFloor/{floorId}")
-    public R<Object> getSpeakerByFloor(@PathVariable("floorId") Long floorId);
-
-    /**
-     * 根据楼层获取喇叭列表
-     */
-    @ApiOperation(value = "根据楼层获取喇叭列表")
-    @RequestMapping("/sparseHardware/getSpeaker/{floorId}/{subId}")
-    public R<Object> getSpeakerBySub(@PathVariable("floorId") Long floorId, @PathVariable("subId") Long subId);
-
-    /**
-     * 定时任务分级管控工作过期记录 - 并排列下次工作计划
-     */
-    @ApiOperation(value = "定时任务分级管控工作过期记录 - 并排列下次工作计划")
-    @GetMapping(value = "/gradeManageRecord/workArrange")
-    public void workArrange();
-
-    /**
-     * 定时任务 早8点 管控工作逾期通知
-     */
-    @ApiOperation(value = "定时任务 早8点管控工作逾期通知")
-    @GetMapping(value = "/gradeManageRecord/workOverdue")
-    public void workOverdue();
-
-    /**
-     * 定时任务 下午7点 天管控工作执行通知
-     */
-    @ApiOperation(value = "定时任务 下午7点 管控工作执行通知")
-    @GetMapping(value = "/gradeManageRecord/workExecuteByDay")
-    public void workExecuteByDay();
-
-    /**
-     * 定时任务 早8点 其他管控工作执行通知
-     */
-    @ApiOperation(value = "定时任务 早8点 管控工作执行通知")
-    @GetMapping(value = "/gradeManageRecord/workExecute")
-    public void workExecute();
-
-    /**
-     * 查询分级管控未完成工作列表
-     */
-    @PostMapping("/gradeManageWork/havingList")
-    @ApiOperation(value = "查询分级管控未完成工作列表")
-    public R<List<LabGradeManageWorkVO>> havingList(@RequestBody LabGradeManageRecord labGradeManageRecord);
-
-    /**
-     * 查询分级管控已完成工作列表
-     */
-    @PostMapping("/gradeManageWork/finishList")
-    @ApiOperation(value = "查询分级管控已完成工作列表")
-    public R<List<LabGradeManageWorkVO>> finishList(@RequestBody LabGradeManageRecord labGradeManageRecord);
-
-    @ApiOperation(value = "完成分级管控工作")
-    @PostMapping(value = "/gradeManageWork/finish")
-    public R<LabGradeManageRecord> finish(@RequestBody LabGradeManageRecord labGradeManageRecord);
-
-    /**
-     * 获取分级管控工作详细信息
-     */
-    @ApiOperation(value = "获取分级管控工作详细信息")
-    @GetMapping(value = "/gradeManageWork/{id}")
-    public R<LabGradeManageRecord> getInfo(@PathVariable("id") Long id);
-
-    @PostMapping(value = "/gradeManageWork/queryByMessage")
-    public R<LabGradeManageWorkVO> queryByMessage(@RequestBody LabGradeManageRecord labGradeManageRecord);
-
-    /**
-     * 安全检查隐患项未整改逾期通知
-     */
-    @ApiOperation(value = "安全检查隐患项未整改逾期通知")
-    @GetMapping(value = "/checkRecord/checkSendMsgBeOverdue")
-    public void checkSendMsgBeOverdue();
-
-    /**
-     * 一体机logo修改通知
-     */
-    @ApiOperation(value = "一体机logo修改通知")
-    @GetMapping(value = "/onemachine/logoNotice")
-    public void logoNotice();
-
-    @PostMapping("/subject/manger/controlByInside")
-    public Object controlByInside(@RequestParam("id") Long id ,@RequestParam("type") String type);
-
-
-    /**
-     * 查询机柜绑定柜锁列表
-     */
-    @ApiOperation(value = "查询机柜绑定柜锁列表")
-    @PostMapping("/hardware/getHardwareByLockList")
-    R<List <LinkedHashMap <String,String>>> getHardwareByLockList(@RequestBody Map allMap);
-
-    /**
-     * 查询识别器管理列表
-     */
-    @GetMapping("/hardware/list/start")
-    @ApiOperation(value = "查询识别器管理列表")
-    R<List<RemoteLabHardware>> listStart();
-
-    @PostMapping("/hardware/remote/list")
-    R<List<RemoteLabHardware>> remoteList(@RequestBody RemoteLabHardware remoteLabHardware);
-
-    /**
-     * 修改识别器状态
-     */
-    @ApiOperation(value = "修改识别器状态")
-    @PutMapping("/hardware/update")
-    R<Integer> update(@RequestParam("operate") HardwareOperate operate, @RequestParam("ipAddress") String ipAddress);
-}

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

@@ -1,68 +0,0 @@
-package com.zd.system.api.laboratory;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.system.api.factory.RemoteMessageContentFallbackFactory;
-import com.zd.system.api.laboratory.domain.LabMessageUser;
-import com.zd.system.api.laboratory.domain.vo.LabMessageUserListVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 消息内容feign调用服务
- *
- * @Author: zhoupan
- * @Date: 2021/09/06/11:28
- * @Description:
- */
-@FeignClient(contextId = "remoteMessageContentService", value = ServiceNameConstants.LABORATORY_SERVICE, fallbackFactory = RemoteMessageContentFallbackFactory.class)
-public interface RemoteMessageContentService {
-
-
-    /**
-     * 查询我的消息
-     */
-    @RequestMapping("/content/my/list")
-    public TableDataInfo<LabMessageUserListVO> mylist(@RequestParam("pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize);
-
-    /**
-     * 查询我的消息-发送人分组-(只查询管理员消息)
-     */
-    @RequestMapping("/content/my/group/list")
-    public TableDataInfo myGrouplist(@RequestParam("pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize);
-
-    /**
-     * 查询我的消息统计数量
-     */
-    @RequestMapping("/content/my/group/totalCount")
-    public R<Object> myGroupTotalCount();
-
-
-    /**
-     * 查询安全准入消息信息
-     */
-    @RequestMapping("/content/my/group/read/{messageId}")
-    public R<Object> myRead(@PathVariable("messageId") Long messageId);
-
-    /**
-     * 查询我的消息-发送人分组-分组内消息
-     */
-    @RequestMapping("/content/my/{id}/group/list")
-    public TableDataInfo myGrouplistById(@RequestParam("pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize,@PathVariable("id") Long id);
-
-    /**
-     * 查询消息内容
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/content/my/{id}")
-    public R<LabMessageUser> message(@PathVariable("id") Long id);
-
-    @PostMapping("/content/readByLoginUser")
-    public void readByLoginUser(@RequestBody LabMessageUser labMessageUser);
-
-    @PostMapping("/dynamic/addMessage")
-    public R addDynamicMessage( @RequestBody Object obj);
-}

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

@@ -1,66 +0,0 @@
-package com.zd.system.api.laboratory;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SubQueryConfig;
-import com.zd.system.api.factory.RemoteSubQueryFallbackFactory;
-import com.zd.system.api.laboratory.domain.CabinetLock;
-import com.zd.system.api.laboratory.domain.LabSubject;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 实验室feign调用服务
- */
-@FeignClient(contextId = "remoteSubQueryService", value = ServiceNameConstants.LABORATORY_SERVICE, fallbackFactory = RemoteSubQueryFallbackFactory.class)
-public interface RemoteSubQueryService {
-
-    /**
-     * 查询实验室详情
-     */
-    @ApiOperation(value = "查询实验室详情")
-    @PostMapping("/subject/manger/V2/diy/{id}/common")
-    R<Object> getSafeWarnCount(@PathVariable("id") Long id,@RequestBody SubQueryConfig subQueryConfig);
-
-
-
-    /**
-     * 查询实验室控制数据列表- 数据权限（包括负责人）
-     */
-    @ApiOperation("查询实验室控制数据列表- 数据权限（包括负责人）")
-    @PostMapping("/subject/manger/V2/list")
-    R<Object> querySubCListVO(@RequestBody Map<String,Object> appSubQuery);
-
-    /**
-     * 查询实验室控制数据列表- 数据权限（包括负责人）
-     */
-    @ApiOperation("查询实验室控制数据列表- 数据权限（包括负责人）")
-    @GetMapping("/subject/manger/V2/admin/subandwran/count")
-    R<Map<String,Object>> querySubCListVO();
-
-    @PostMapping("/subject/manger/V2/list/ids")
-    R<List<LabSubject>> listByIds(@RequestBody List<Long> ids);
-
-    @GetMapping("/subject/manger/V2/list/name")
-    R<List<LabSubject>> listByName(@RequestParam("name") String name);
-
-    @PostMapping("/device/remote/cabinetLock")
-    R cabinetLock(@RequestBody @Valid CabinetLock cabinetLock);
-
-    /**
-     * 柜锁开锁 V2
-     */
-    @PostMapping("/device/remote/V2/openLock")
-    R cabinetV2OpenLock(@RequestBody @Valid CabinetV2Lock cabinetV2Lock);
-
-    /**
-     * 柜锁关锁锁 V2
-     */
-    @PostMapping("/device/remote/V2/closeLock")
-    R cabinetV2CloseLock(@RequestBody @Valid CabinetV2Lock cabinetV2Lock);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/BasicFunctionStatus.java

@@ -1,95 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/09/27/15:36
- * @Description:
- */
-@ApiModel("功能基类")
-public class BasicFunctionStatus {
-    /**
-     * 硬件编码
-     */
-    @ApiModelProperty("硬件编码")
-    private String hardwareNum;
-
-    /**
-     * 功能编码
-     */
-    @ApiModelProperty("功能编码")
-    private String funNum;
-
-    /**
-     * 功能描述 现在实际值变成了 传感器名字 (￣▽￣)"
-     */
-    @ApiModelProperty("功能描述")
-    private String describe;
-
-
-    /**
-     * 功能名
-     */
-    @ApiModelProperty("功能名")
-    private String funcName;
-
-    public String getFuncName() {
-        return funcName;
-    }
-
-    public void setFuncName(String funcName) {
-        this.funcName = funcName;
-    }
-
-    /**
-     * 功能图标
-     */
-    @ApiModelProperty("功能图标")
-    private String icon;
-
-    @ApiModelProperty("排序")
-    private int order ;
-
-    public String getHardwareNum() {
-        return hardwareNum;
-    }
-
-    public void setHardwareNum(String hardwareNum) {
-        this.hardwareNum = hardwareNum;
-    }
-
-    public int getOrder() {
-        return order;
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public String getFunNum() {
-        return funNum;
-    }
-
-    public void setFunNum(String funNum) {
-        this.funNum = funNum;
-    }
-
-    public String getDescribe() {
-        return describe;
-    }
-
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/CabinetLock.java

@@ -1,56 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-public class CabinetLock {
-
-    @NotNull(message = "柜锁ID 不能为空！")
-    @ApiModelProperty("柜锁标记位0-253")
-    private String lockId;
-
-    @NotNull(message = "参数异常！")
-    @ApiModelProperty("转动角度 0-4095 开锁 940  关锁 2340")
-    private String position;
-
-    @NotNull(message = "参数异常！")
-    @ApiModelProperty("延时执行 》= 0")
-    private String time;
-
-    @NotNull(message = "参数异常！")
-    @ApiModelProperty("转动速度 0-3400")
-    private String speed;
-
-    public String getLockId() {
-        return lockId;
-    }
-
-    public void setLockId(String lockId) {
-        this.lockId = lockId;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public void setTime(String time) {
-        this.time = time;
-    }
-
-    public String getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(String speed) {
-        this.speed = speed;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/Control.java

@@ -1,79 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import cn.hutool.json.JSONString;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/09/27/16:09
- * @Description:
- */
-public class Control {
-
-    /**
-     * 命令
-     */
-    String command;
-
-    /**
-     * 设备编号
-     */
-    String num;
-
-    /**
-     * 参数
-     */
-    Object param;
-
-
-    public static enum SwitchEnums{
-        /**
-         * 不在线
-         */
-        NO_ONLINE,
-        ON,
-        OFF;
-
-        SwitchEnums() {
-        }
-    }
-
-    public static enum CommTypeEnums {
-        /**
-         * 继电器
-         */
-        Relay,
-        /**
-         * 自身
-         */
-        SELF,
-        /**
-         * 其他
-         */
-        OTHER,
-    }
-
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public Object getParam() {
-        return param;
-    }
-
-    public void setParam(Object param) {
-        this.param = param;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/FunctionStatus.java

@@ -1,81 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 设备功能
- * @Author: zhoupan
- * @Date: 2021/09/27/15:36
- * @Description:
- */
-@ApiModel("硬件设备功能")
-public class FunctionStatus extends BasicFunctionStatus {
-
-
-    /**
-     * 功能状态值
-     */
-    @ApiModelProperty("功能状态值")
-    private String code;
-
-    /**
-     * 命令
-     */
-    @ApiModelProperty("命令")
-    private String cmd;
-
-    /**
-     * 是否时默认状态
-     */
-    private Boolean defaultStatus = false;
-
-    @ApiModelProperty("命令类型")
-    private Control.CommTypeEnums commTypeEnums;
-
-//    @ApiModelProperty("继电器编码")
-//    private String relayCode;
-//
-//    public String getRelayCode() {
-//        return relayCode;
-//    }
-//
-//    public void setRelayCode(String relayCode) {
-//        this.relayCode = relayCode;
-//    }
-
-    public Control.CommTypeEnums getCommTypeEnums() {
-        return commTypeEnums;
-    }
-
-    public void setCommTypeEnums(Control.CommTypeEnums commTypeEnums) {
-        this.commTypeEnums = commTypeEnums;
-    }
-
-    @JsonIgnore
-    public Boolean getDefaultStatus() {
-        return defaultStatus;
-    }
-
-    public String getCmd() {
-        return cmd;
-    }
-
-    public void setCmd(String cmd) {
-        this.cmd = cmd;
-    }
-
-    public void setDefaultStatus(Boolean defaultStatus) {
-        this.defaultStatus = defaultStatus;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/LabGradeManageRecord.java

@@ -1,372 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import java.util.Date;
-
-/**
- * 管控执行记录对象 lab_grade_manage_record
- *
- * @author liubo
- * @date 2022-02-10
- */
-@ApiModel("管控执行记录")
-public class LabGradeManageRecord extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ApiModelProperty(value = "${comment}")
-    private Long id;
-    /**
-     * 规则ID
-     */
-    @Excel(name = "规则ID")
-    @ApiModelProperty(value = "规则ID")
-    private Long ruleId;
-    private Long ruleUserId;
-    /**
-     * 规则名称
-     */
-    @Excel(name = "规则名称")
-    @Length(message = "规则名称长度不能超过255")
-    @ApiModelProperty(value = "规则名称")
-    private String ruleName;
-    /**
-     * 实验室ID
-     */
-    @Excel(name = "实验室ID")
-    @ApiModelProperty(value = "实验室ID")
-    private Long subId;
-    /**
-     * 实验室名称
-     */
-    @ApiModelProperty(value = "实验室名称")
-    private String subName;
-    /**
-     * 执行用户ID
-     */
-    @Excel(name = "执行用户ID")
-    @ApiModelProperty(value = "执行用户ID")
-    private Long joinUserId;
-    /**
-     * 执行用户姓名
-     */
-    @ApiModelProperty(value = "执行用户姓名")
-    private String nickName;
-    /**
-     * 执行人身份
-     */
-    @Excel(name = "执行人身份")
-    @Length(message = "执行人身份长度不能超过255")
-    @ApiModelProperty(value = "执行人身份")
-    private String userPosition;
-    /**
-     * 执行状态（0 已过期，2 已执行）
-     */
-    @ApiModelProperty(value = "0 已过期，2 已执行")
-    private Integer status;
-    /**
-     * 执行时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty(value = "执行时间")
-    private Date carryTime;
-
-    private Date startTime;
-    private Date endTime;
-
-    private Long manageUserId;
-
-    @JsonFormat(pattern = "yyyy年MM月dd日")
-    private Date endDate;
-
-    @ApiModelProperty("规则类型：日管控，月管控..")
-    private String ruleType;
-
-    @ApiModelProperty("执行周期")
-    private String cycle;
-
-    @ApiModelProperty("是否多人执行")
-    private Integer isAll;
-
-    @ApiModelProperty("执行次数")
-    private Integer cycleCount;
-
-    private Long level;
-    @ApiModelProperty("分级名称")
-    private String levelName;
-
-    @ApiModelProperty("分级颜色")
-    private String fiedColor;
-
-    private Long typeId;
-    @ApiModelProperty("分类名称")
-    private String typeName;
-
-    private Long moldId;
-    @ApiModelProperty("实验室类型名称")
-    private String moldName;
-
-    @ApiModelProperty("规则描述")
-    private String ruleRemark;
-
-    private LabGradeManageRecordDetail detail;
-
-    /**
-     * 展示 分级管控指定的所有人名
-     */
-    private String allUserName;
-
-    /**
-     * 执行消息通知ID（用作处理消息已读功能）
-     */
-    private Long messageUserId;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleName(String ruleName) {
-        this.ruleName = ruleName;
-    }
-
-    public String getRuleName() {
-        return ruleName;
-    }
-
-    public void setSubId(Long subId) {
-        this.subId = subId;
-    }
-
-    public Long getSubId() {
-        return subId;
-    }
-
-    public void setJoinUserId(Long joinUserId) {
-        this.joinUserId = joinUserId;
-    }
-
-    public Long getJoinUserId() {
-        return joinUserId;
-    }
-
-    public void setUserPosition(String userPosition) {
-        this.userPosition = userPosition;
-    }
-
-    public String getUserPosition() {
-        return userPosition;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setCarryTime(Date carryTime) {
-        this.carryTime = carryTime;
-    }
-
-    public Date getCarryTime() {
-        return carryTime;
-    }
-
-    public LabGradeManageRecordDetail getDetail() {
-        return detail;
-    }
-
-    public void setDetail(LabGradeManageRecordDetail detail) {
-        this.detail = detail;
-    }
-
-    public Long getRuleUserId() {
-        return ruleUserId;
-    }
-
-    public void setRuleUserId(Long ruleUserId) {
-        this.ruleUserId = ruleUserId;
-    }
-
-    public String getSubName() {
-        return subName;
-    }
-
-    public void setSubName(String subName) {
-        this.subName = subName;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-
-    public Integer getCycleCount() {
-        return cycleCount;
-    }
-
-    public void setCycleCount(Integer cycleCount) {
-        this.cycleCount = cycleCount;
-    }
-
-    public String getRuleType() {
-        return ruleType;
-    }
-
-    public void setRuleType(String ruleType) {
-        this.ruleType = ruleType;
-    }
-
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public String getFiedColor() {
-        return fiedColor;
-    }
-
-    public void setFiedColor(String fiedColor) {
-        this.fiedColor = fiedColor;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-
-    public String getRuleRemark() {
-        return ruleRemark;
-    }
-
-    public void setRuleRemark(String ruleRemark) {
-        this.ruleRemark = ruleRemark;
-    }
-
-    public Long getLevel() {
-        return level;
-    }
-
-    public void setLevel(Long level) {
-        this.level = level;
-    }
-
-    public Long getTypeId() {
-        return typeId;
-    }
-
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
-    }
-
-    public Long getMoldId() {
-        return moldId;
-    }
-
-    public void setMoldId(Long moldId) {
-        this.moldId = moldId;
-    }
-
-    public String getMoldName() {
-        return moldName;
-    }
-
-    public void setMoldName(String moldName) {
-        this.moldName = moldName;
-    }
-
-    public Long getManageUserId() {
-        return manageUserId;
-    }
-
-    public void setManageUserId(Long manageUserId) {
-        this.manageUserId = manageUserId;
-    }
-
-    public String getCycle() {
-        return cycle;
-    }
-
-    public void setCycle(String cycle) {
-        this.cycle = cycle;
-    }
-
-    public String getAllUserName() {
-        return allUserName;
-    }
-
-    public void setAllUserName(String allUserName) {
-        this.allUserName = allUserName;
-    }
-
-    public Integer getIsAll() {
-        return isAll;
-    }
-
-    public void setIsAll(Integer isAll) {
-        this.isAll = isAll;
-    }
-
-    public Long getMessageUserId() {
-        return messageUserId;
-    }
-
-    public void setMessageUserId(Long messageUserId) {
-        this.messageUserId = messageUserId;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/LabGradeManageRecordDetail.java

@@ -1,81 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 管控执行记录详情对象 lab_grade_manage_record_detail
- *
- * @author liubo
- * @date 2022-02-10
- */
-@ApiModel("管控执行记录详情")
-public class LabGradeManageRecordDetail extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ApiModelProperty(value = "${comment}")
-    private Long id;
-    /**
-     * 执行记录ID
-     */
-    @Excel(name = "执行记录ID")
-    @ApiModelProperty(value = "执行记录ID")
-    private Long manageRecordId;
-    /**
-     * 执行上传材料（多个逗号分隔）
-     */
-    @Excel(name = "执行上传材料", readConverterExp = "多=个逗号分隔")
-    @ApiModelProperty(value = "执行上传材料")
-    private String imgUrl;
-
-    @ApiModelProperty(value = "材料名称")
-    private String imgName;
-
-    @ApiModelProperty(value = "材料类型")
-    private String imgType;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setManageRecordId(Long manageRecordId) {
-        this.manageRecordId = manageRecordId;
-    }
-
-    public Long getManageRecordId() {
-        return manageRecordId;
-    }
-
-    public void setImgUrl(String imgUrl) {
-        this.imgUrl = imgUrl;
-    }
-
-    public String getImgUrl() {
-        return imgUrl;
-    }
-
-    public String getImgName() {
-        return imgName;
-    }
-
-    public void setImgName(String imgName) {
-        this.imgName = imgName;
-    }
-
-    public String getImgType() {
-        return imgType;
-    }
-
-    public void setImgType(String imgType) {
-        this.imgType = imgType;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/LabMessageContent.java

@@ -1,230 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.enums.MessTypeEnum;
-import com.zd.common.core.enums.MessageSendRangeEnum;
-import com.zd.common.core.enums.UserMessageSendModeEnum;
-import com.zd.common.core.valid.ValidGroup;
-import com.zd.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * 消息发布对象 lab_message_content
- *
- * @author zd
- * @date 2021-09-02
- */
-@ApiModel("消息内容实体")
-public class LabMessageContent extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 消息类型（参考字典表 如：文字，富文本）
-     */
-    @ApiModelProperty("消息类型")
-    @Excel(name = "消息类型", readConverterExp = "参=考字典表,如=：文字，富文本")
-    private Integer messType;
-
-
-
-    /**
-     * 消息类别
-     */
-    @ApiModelProperty("消息类别，1：管理消息，2：预警")
-    private Integer messClass;
-
-
-
-    /**
-     * 发送方式（参考字典表）
-     */
-    @ApiModelProperty("发送方式")
-    @Excel(name = "发送方式", readConverterExp = "参=考字典表")
-    private Integer sendMode;
-
-    /**
-     * 发送范围（1是全校，2是院系，3是个人，参考MessageSendRangeEnum）
-     */
-    @ApiModelProperty("发送范围")
-    @Excel(name = "发送范围", readConverterExp = "1=是全校，2是院系，3是个人，参考字典表")
-    private Integer sendRange = 3;
-
-    /**
-     * 发送内容
-     */
-    @ApiModelProperty("发送内容")
-    @NotBlank(groups = ValidGroup.Crud.Create.class, message = "发送内容不能为空")
-    @Excel(name = "发送内容")
-    private String content;
-
-    /**
-     * 部门ids
-     */
-    @Excel(name = "部门ids")
-    @ApiModelProperty("部门ids")
-    private String deptIds;
-
-    @ApiModelProperty("实验室ids")
-    private String subIds;
-
-    @ApiModelProperty("实验室名称")
-    private String subName;
-
-    /**
-     * 待发送用户ids，关联用户表id(多个用户id)
-     */
-    @Excel(name = "待发送用户ids，关联用户表id(多个用户id)")
-    @ApiModelProperty("待发送用户ids")
-    private String userIds;
-
-    private String userNames;
-
-    @ApiModelProperty("职位ID")
-    private String postIds;
-
-    @ApiModelProperty("职位名称")
-    private String postName;
-
-    @ApiModelProperty("过期日期（实验室消息专用）")
-    private Date expirationDate;
-
-    public Integer getMessClass() {
-        return messClass;
-    }
-
-    public void setMessClass(Integer messClass) {
-        this.messClass = messClass;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setMessType(Integer messType) {
-        this.messType = messType;
-    }
-
-    @JsonIgnore
-    public Integer getMessType() {
-        return messType;
-    }
-
-    public MessTypeEnum getMessTypeEnum() {
-        return MessTypeEnum.getByCode(messType);
-    }
-
-    public void setSendMode(Integer sendMode) {
-        this.sendMode = sendMode;
-    }
-
-    @JsonIgnore
-    public Integer getSendMode() {
-        return sendMode;
-    }
-
-    public UserMessageSendModeEnum getSendModeEnum() {
-        return UserMessageSendModeEnum.getByCode(sendMode);
-    }
-
-    public void setSendRange(Integer sendRange) {
-        this.sendRange = sendRange;
-    }
-
-    @JsonIgnore
-    public Integer getSendRange() {
-        return sendRange;
-    }
-
-    public MessageSendRangeEnum getSendRangeEnum() {
-        return MessageSendRangeEnum.getByCode(sendRange);
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setDeptIds(String deptIds) {
-        this.deptIds = deptIds;
-    }
-
-    public String getDeptIds() {
-        return deptIds;
-    }
-
-    public void setUserIds(String userIds) {
-        this.userIds = userIds;
-    }
-
-    public String getUserIds() {
-        return userIds;
-    }
-
-    public String getPostName() {
-        return postName;
-    }
-
-    public void setPostName(String postName) {
-        this.postName = postName;
-    }
-
-    public String getUserNames() {
-        return userNames;
-    }
-
-    public void setUserNames(String userNames) {
-        this.userNames = userNames;
-    }
-
-    public String getSubIds() {
-        return subIds;
-    }
-
-    public void setSubIds(String subIds) {
-        this.subIds = subIds;
-    }
-
-    public Date getExpirationDate() {
-        return expirationDate;
-    }
-
-    public void setExpirationDate(Date expirationDate) {
-        this.expirationDate = expirationDate;
-    }
-
-    public String getPostIds() {
-        return postIds;
-    }
-
-    public void setPostIds(String postIds) {
-        this.postIds = postIds;
-    }
-
-    public String getSubName() {
-        return subName;
-    }
-
-    public void setSubName(String subName) {
-        this.subName = subName;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/LabMessageUser.java

@@ -1,202 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.zd.common.core.enums.UserMessageType;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
-
-import java.beans.Transient;
-
-/**
- * 用户消息对象 lab_message_user
- *
- * @author zhoupan
- * @date 2021-09-02
- */
-public class LabMessageUser extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 自增主键
-     */
-    private Long id;
-
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id")
-    private Long joinUserId;
-
-    /**
-     * 消息id
-     */
-    @Excel(name = "消息id")
-    @Deprecated
-    private Long messageId;
-    @Excel(name = "消息内容")
-    private String content;
-
-    /**
-     * 部门id
-     */
-    @Excel(name = "部门id")
-    private Long deptId;
-
-    /**
-     * 是否已读（0 未读，1 已读）
-     */
-    @Excel(name = "是否已读", readConverterExp = "0=,未=读，1,已=读")
-    private Boolean isRead;
-
-    /**
-     * 部门名称
-     */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /**
-     * 创建人（用于数据权限）
-     */
-    @Excel(name = "创建人", readConverterExp = "用=于数据权限")
-    private Long userId;
-
-    /**
-     * 用户消息类型
-     */
-    private UserMessageType messageType;
-
-    /**
-     * 消息内容
-     */
-    private String meaasgeContext;
-
-    public Boolean getRead() {
-        return isRead;
-    }
-
-    public void setRead(Boolean read) {
-        isRead = read;
-    }
-
-    public UserMessageType getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(UserMessageType messageType) {
-        this.messageType = messageType;
-    }
-
-    public String getMeaasgeContext() {
-        return meaasgeContext;
-    }
-
-    public void setMeaasgeContext(String meaasgeContext) {
-        this.meaasgeContext = meaasgeContext;
-    }
-
-    public LabMessageUser() {
-
-    }
-
-//    /**
-//     * 消息详细内容
-//     */
-//    private LabMessageContent messageContent;
-
-    public LabMessageUser(LabMessageContent labMessageContent, Long id) {
-
-        this.setMessageId(labMessageContent.getId());
-        this.setJoinUserId(id);
-        this.setIsRead(Boolean.FALSE);
-        this.setMessageType(UserMessageType.ADMIN);
-        this.setMeaasgeContext(labMessageContent.getContent());
-        this.setUserId(labMessageContent.getUserId());
-        this.setCreateBy(labMessageContent.getCreateBy());
-        this.setCreateTime(labMessageContent.getCreateTime());
-        this.setDeptId(labMessageContent.getDeptId());
-        this.setDeptName(labMessageContent.getDeptName());
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setJoinUserId(Long joinUserId) {
-        this.joinUserId = joinUserId;
-    }
-
-    public Long getJoinUserId() {
-        return joinUserId;
-    }
-
-    public void setMessageId(Long messageId) {
-        this.messageId = messageId;
-    }
-
-    public Long getMessageId() {
-        return messageId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setIsRead(Boolean isRead) {
-        this.isRead = isRead;
-    }
-
-    public Boolean getIsRead() {
-        return isRead;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-//    public LabMessageContent getMessageContent() {
-//        return messageContent;
-//    }
-//
-//    public void setMessageContent(LabMessageContent messageContent) {
-//        this.messageContent = messageContent;
-//    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("joinUserId", getJoinUserId())
-                .append("messageId", getMessageId())
-                .append("createTime", getCreateTime())
-                .append("deptId", getDeptId())
-                .append("isRead", getIsRead())
-                .append("deptName", getDeptName())
-                .append("userId", getUserId())
-                .append("createBy", getCreateBy())
-                .append("updateTime", getUpdateTime())
-                .append("updateBy", getUpdateBy())
-                .append("remark", getRemark())
-                .toString();
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/LabSubject.java

@@ -1,465 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
-import com.zd.system.api.laboratory.domain.vo.LabSubClassVO;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 实验室对象 lab_subject
- *
- * @author zd
- * @date 2021-08-30
- */
-public class LabSubject extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 实验室名称
-     */
-    @Excel(name = "实验室名称")
-    private String name;
-
-    /**
-     * 实验室楼层
-     */
-    @Excel(name = "实验室楼层")
-    private Long floorId;
-
-    /**
-     * 实验室房间号
-     */
-    @Excel(name = "实验室房间号")
-    private String room;
-
-    /**
-     * 部门id
-     */
-    @Excel(name = "部门id")
-    private Long deptId;
-
-    /**
-     * 部门名称
-     */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /**
-     * 管理员id
-     */
-    @Excel(name = "管理员id")
-    private Long adminId;
-
-    /**
-     * 是否删除（1是未删除，0是删除）
-     */
-    @Excel(name = "是否删除", readConverterExp = "1=是未删除，0是删除")
-    private Boolean isDel;
-
-    /**
-     * 创建人（用于数据权限）
-     */
-    @Excel(name = "创建人", readConverterExp = "用=于数据权限")
-    private Long userId;
-
-    /**
-     * 是否是实验室
-     */
-    private Long isSubject;
-
-    /**
-     * 实验室顺序
-     */
-    @ApiModelProperty("实验室顺序")
-    private Long subOrder;
-    /**
-     * 仅仅为了回显， 后面考虑移除
-     */
-    @ApiModelProperty("楼栋ID")
-    private Long buildId;
-
-    /**
-     * 安全分类
-     */
-    private Long typeId;
-
-    @ApiModelProperty("布局ID")
-    private Long layoutId;
-
-    @ApiModelProperty("检查项")
-    private String checkOut;
-
-    /**
-     * 在线人数
-     */
-    @JsonInclude
-    private Long online;
-
-
-    @ApiModelProperty("离开检查项")
-    private String checkIn;
-
-    @ApiModelProperty("安全负责人")
-    private String safeUserId;
-
-    @ApiModelProperty("安全警示标示--字典")
-    private String safeSigns;
-
-    @ApiModelProperty("主要危险类别--字典")
-    private String hazardCategory;
-
-    @ApiModelProperty("安全防控措施--字典")
-    private String riskMeasure;
-
-    @ApiModelProperty("灭火要点--字典")
-    private String outfire;
-
-    @ApiModelProperty("二维码")
-    private String qrCode;
-
-    @ApiModelProperty("安全负责人名称")
-    private String safeUserName;
-
-    @ApiModelProperty("安全负责人手机号")
-    private String safeUserPhone;
-
-    @ApiModelProperty("负责人手机号")
-    private String adminPhone;
-
-    @ApiModelProperty("详细地址")
-    private String address;
-
-    @ApiModelProperty("实验室危险等级信息")
-    private LabSubClassVO subClassVO;
-
-    @ApiModelProperty("级别")
-    private Long level;
-
-    /**
-     * 展示排序
-     */
-    @ApiModelProperty("展示排序")
-    private Integer diyOrder;
-
-    @ApiModelProperty(value = "二维码地址")
-    private String qrCodeUrl;
-
-    @ApiModelProperty("穿戴检查可跳过（0 否，1 是）")
-    private Integer skipped;
-
-    @ApiModelProperty("检测上限")
-    private Integer checkCount;
-
-    public Long getLevel() {
-        return level;
-    }
-
-    public void setLevel(Long level) {
-        this.level = level;
-    }
-
-    public String getCheckIn() {
-        return checkIn;
-    }
-
-    public void setCheckIn(String checkIn) {
-        this.checkIn = checkIn;
-    }
-
-    public Long getOnline() {
-        return online;
-    }
-
-    public void setOnline(Long online) {
-        this.online = online;
-    }
-
-    public Boolean getDel() {
-        return isDel;
-    }
-
-    public void setDel(Boolean del) {
-        isDel = del;
-    }
-
-    public Long getBuildId() {
-        return buildId;
-    }
-
-    public void setBuildId(Long buildId) {
-        this.buildId = buildId;
-    }
-
-    public Long getLayoutId() {
-        return layoutId;
-    }
-
-    public void setLayoutId(Long layoutId) {
-        this.layoutId = layoutId;
-    }
-
-    public String getCheckOut() {
-        return checkOut;
-    }
-
-    public void setCheckOut(String checkOut) {
-        this.checkOut = checkOut;
-    }
-
-    public String getSubDept() {
-        return subDept;
-    }
-
-    public void setSubDept(String subDept) {
-        this.subDept = subDept;
-    }
-
-    @ApiModelProperty("学科")
-    private String subDept;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getAdminPhone() {
-        return adminPhone;
-    }
-
-    public void setAdminPhone(String adminPhone) {
-        this.adminPhone = adminPhone;
-    }
-
-    public void setFloorId(Long floorId) {
-        this.floorId = floorId;
-    }
-
-    public Long getFloorId() {
-        return floorId;
-    }
-
-    public void setRoom(String room) {
-        this.room = room;
-    }
-
-    public String getRoom() {
-        return room;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setAdminId(Long adminId) {
-        this.adminId = adminId;
-    }
-
-    public Long getAdminId() {
-        return adminId;
-    }
-
-    public void setIsDel(Boolean isDel) {
-        this.isDel = isDel;
-    }
-
-    public Boolean getIsDel() {
-        return isDel;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public LabSubClassVO getSubClassVO() {
-        return subClassVO;
-    }
-
-    public void setSubClassVO(LabSubClassVO subClassVO) {
-        this.subClassVO = subClassVO;
-    }
-
-    public Long getIsSubject() {
-        return isSubject;
-    }
-
-    public void setIsSubject(Long isSubject) {
-        this.isSubject = isSubject;
-    }
-
-    public Long getSubOrder() {
-        return subOrder;
-    }
-
-    public void setSubOrder(Long subOrder) {
-        this.subOrder = subOrder;
-    }
-
-    public String getSafeUserId() {
-        return safeUserId;
-    }
-
-    public void setSafeUserId(String safeUserId) {
-        this.safeUserId = safeUserId;
-    }
-
-    public String getSafeSigns() {
-        return safeSigns;
-    }
-
-    public void setSafeSigns(String safeSigns) {
-        this.safeSigns = safeSigns;
-    }
-
-    public String getHazardCategory() {
-        return hazardCategory;
-    }
-
-    public void setHazardCategory(String hazardCategory) {
-        this.hazardCategory = hazardCategory;
-    }
-
-    public String getRiskMeasure() {
-        return riskMeasure;
-    }
-
-    public void setRiskMeasure(String riskMeasure) {
-        this.riskMeasure = riskMeasure;
-    }
-
-    public String getOutfire() {
-        return outfire;
-    }
-
-    public void setOutfire(String outfire) {
-        this.outfire = outfire;
-    }
-
-    public String getQrCode() {
-        return qrCode;
-    }
-
-    public void setQrCode(String qrCode) {
-        this.qrCode = qrCode;
-    }
-
-    public String getSafeUserName() {
-        return safeUserName;
-    }
-
-    public void setSafeUserName(String safeUserName) {
-        this.safeUserName = safeUserName;
-    }
-
-    public String getSafeUserPhone() {
-        return safeUserPhone;
-    }
-
-    public void setSafeUserPhone(String safeUserPhone) {
-        this.safeUserPhone = safeUserPhone;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("floor", getFloorId())
-                .append("room", getRoom())
-                .append("deptId", getDeptId())
-                .append("deptName", getDeptName())
-                .append("adminId", getAdminId())
-                .append("isDel", getIsDel())
-                .append("createTime", getCreateTime())
-                .append("userId", getUserId())
-                .append("createBy", getCreateBy())
-                .append("updateTime", getUpdateTime())
-                .append("updateBy", getUpdateBy())
-                .append("remark", getRemark())
-                .append("remark", getIsSubject())
-                .append("remark", getSubOrder())
-                .toString();
-    }
-
-    public Long getTypeId() {
-        return typeId;
-    }
-
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
-    }
-
-    public Integer getDiyOrder() {
-        return diyOrder;
-    }
-
-    public void setDiyOrder(Integer diyOrder) {
-        this.diyOrder = diyOrder;
-    }
-
-    public String getQrCodeUrl() {
-        return qrCodeUrl;
-    }
-
-    public void setQrCodeUrl(String qrCodeUrl) {
-        this.qrCodeUrl = qrCodeUrl;
-    }
-
-    public Integer getSkipped() {
-        return skipped;
-    }
-
-    public void setSkipped(Integer skipped) {
-        this.skipped = skipped;
-    }
-
-    public Integer getCheckCount() {
-        return checkCount;
-    }
-
-    public void setCheckCount(Integer checkCount) {
-        this.checkCount = checkCount;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/LabSubjectControllerVO.java

@@ -1,424 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.zd.common.core.enums.HazardTypeEnum;
-import com.zd.system.api.laboratory.domain.vo.HardwareCVO;
-import com.zd.system.api.laboratory.domain.vo.LabRiskPlanVO;
-import com.zd.system.api.laboratory.domain.vo.SenseValVO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 实验室VO
- *
- * @Author: zhoupan
- * @Date: 2021/09/07/15:17
- * @Description:
- */
-@ApiModel("实验室管理vo")
-public class LabSubjectControllerVO extends LabSubject {
-
-    @ApiModelProperty("所属部门名称")
-    private String subordinateDeptName;
-
-    @ApiModelProperty("危险级别名称")
-    private String dangerName;
-
-    @ApiModelProperty("负责人名称")
-    private String adminName;
-
-    @ApiModelProperty("所属传感器列表")
-    @Deprecated
-    private List<SenseValVO> senseVOList;
-
-    @ApiModelProperty("所属测点")
-    private List<SensorFunctionStatus> sensorFunctionStatusList;
-
-    @ApiModelProperty("所属设备列表")
-    private List<HardwareCVO> labHardwareVOList;
-
-    @ApiModelProperty("实验室地址对象")
-    private SubAddrr subAddrr;
-    @ApiModelProperty("是否拥有完全管理权限")
-    @JsonInclude(value = JsonInclude.Include.NON_NULL)
-    private Boolean admin;
-
-
-    @ApiModelProperty("安全分级名称")
-    private String levelName;
-
-    @ApiModelProperty("安全分级颜色编码")
-    private String fiedColor;
-
-    @ApiModelProperty("安全分类名称")
-    private String typeName;
-
-    @ApiModelProperty("信息牌数据")
-    private SafeInfo safeInfo;
-
-    @ApiModelProperty("危险源信息")
-    private List<LabHazardSubVO> hazardList;
-
-    @ApiModelProperty("预案数据")
-    private List<LabRiskPlanVO> riskPlanList;
-
-    /**
-     * 实验室类型ID
-     */
-    @ApiModelProperty(value = "实验室类型ID")
-    private Long moldId;
-
-    private String adminNameAndPhone;
-
-    private String safeUserNameAdminPhone;
-
-    @ApiModel("安全信息")
-    public static class SafeInfo {
-        @ApiModelProperty("安全警示标示--字典")
-        private List<String> safeSigns;
-
-        @ApiModelProperty("主要危险类别--字典")
-        private List<String> hazardCategory;
-
-        @ApiModelProperty("安全防控措施--字典")
-        private List<String> riskMeasure;
-
-        @ApiModelProperty("灭火要点--字典")
-        private List<String> outfire;
-
-        @ApiModelProperty("离开检测项")
-        private List<String> checkOutData;
-
-        @ApiModelProperty("进入检查项")
-        private List<String> checkInData;
-
-        public List<String> getSafeSigns() {
-            return safeSigns;
-        }
-
-        public void setSafeSigns(List<String> safeSigns) {
-            this.safeSigns = safeSigns;
-        }
-
-        public List<String> getHazardCategory() {
-            return hazardCategory;
-        }
-
-        public void setHazardCategory(List<String> hazardCategory) {
-            this.hazardCategory = hazardCategory;
-        }
-
-        public List<String> getRiskMeasure() {
-            return riskMeasure;
-        }
-
-        public void setRiskMeasure(List<String> riskMeasure) {
-            this.riskMeasure = riskMeasure;
-        }
-
-        public List<String> getOutfire() {
-            return outfire;
-        }
-
-        public void setOutfire(List<String> outfire) {
-            this.outfire = outfire;
-        }
-
-        public List<String> getCheckOutData() {
-            return checkOutData;
-        }
-
-        public void setCheckOutData(List<String> checkOutData) {
-            this.checkOutData = checkOutData;
-        }
-
-        public List<String> getCheckInData() {
-            return checkInData;
-        }
-
-        public void setCheckInData(List<String> checkInData) {
-            this.checkInData = checkInData;
-        }
-    }
-
-    @ApiModel("危险源信息")
-    public static class LabHazardSubVO {
-        /**
-         * 危险源ID
-         */
-        @ApiModelProperty(value = "危险源ID")
-        private Long id;
-
-        /**
-         * 危险源名称
-         */
-        @ApiModelProperty("危险源名称")
-        private String label;
-
-        /**
-         * 危险源类型
-         */
-        @ApiModelProperty("危险源类型")
-        private HazardTypeEnum hazardType;
-
-        /**
-         * 实验室id
-         */
-        @ApiModelProperty("实验室id")
-        private Long subjectId;
-
-
-        /**
-         * X坐标点
-         */
-        @ApiModelProperty("X坐标点")
-        private Long xPoint;
-
-        /**
-         * Y坐标点
-         */
-        @ApiModelProperty("Y坐标点")
-        private Long yPoint;
-        /**
-         * 坐标ID
-         */
-        @ApiModelProperty(value = "坐标ID")
-        private Long xyId;
-
-        /**
-         * 危险源别名
-         */
-        private String anotherName;
-
-        /**
-         * 编号别名
-         */
-        private String anotherCode;
-
-
-        public Long getXyId() {
-            return xyId;
-        }
-
-        public void setXyId(Long xyId) {
-            this.xyId = xyId;
-        }
-
-
-        public LabHazardSubVO() {
-
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getLabel() {
-            return label;
-        }
-
-        public void setLabel(String label) {
-            this.label = label;
-        }
-
-        public HazardTypeEnum getHazardType() {
-            return hazardType;
-        }
-
-        public void setHazardType(HazardTypeEnum hazardType) {
-            this.hazardType = hazardType;
-        }
-
-        public Long getSubjectId() {
-            return subjectId;
-        }
-
-        public void setSubjectId(Long subjectId) {
-            this.subjectId = subjectId;
-        }
-
-        public Long getxPoint() {
-            return xPoint;
-        }
-
-        public void setxPoint(Long xPoint) {
-            this.xPoint = xPoint;
-        }
-
-        public Long getyPoint() {
-            return yPoint;
-        }
-
-        public void setyPoint(Long yPoint) {
-            this.yPoint = yPoint;
-        }
-
-        public String getAnotherName() {
-            return anotherName;
-        }
-
-        public void setAnotherName(String anotherName) {
-            this.anotherName = anotherName;
-        }
-
-        public String getAnotherCode() {
-            return anotherCode;
-        }
-
-        public void setAnotherCode(String anotherCode) {
-            this.anotherCode = anotherCode;
-        }
-    }
-
-    @Override
-    public Long getAdminId() {
-        return super.getAdminId() == -1L ? null : super.getAdminId();
-    }
-
-    public List<SensorFunctionStatus> getSensorFunctionStatusList() {
-        return sensorFunctionStatusList;
-    }
-
-    public void setSensorFunctionStatusList(List<SensorFunctionStatus> sensorFunctionStatusList) {
-        this.sensorFunctionStatusList = sensorFunctionStatusList;
-    }
-
-    public Boolean getAdmin() {
-        return admin;
-    }
-
-    public void setAdmin(Boolean admin) {
-        this.admin = admin;
-    }
-
-    public String getDangerName() {
-        return dangerName;
-    }
-
-    public void setDangerName(String dangerName) {
-        this.dangerName = dangerName;
-    }
-
-    public String getAdminName() {
-        return adminName;
-    }
-
-    public void setAdminName(String adminName) {
-        this.adminName = adminName;
-    }
-
-    public String getSubordinateDeptName() {
-        return subordinateDeptName;
-    }
-
-    public void setSubordinateDeptName(String subordinateDeptName) {
-        this.subordinateDeptName = subordinateDeptName;
-    }
-
-    public SubAddrr getSubAddrr() {
-        return subAddrr;
-    }
-
-    public void setSubAddrr(SubAddrr subAddrr) {
-        this.subAddrr = subAddrr;
-    }
-
-
-    public List<SenseValVO> getSenseVOList() {
-        return senseVOList;
-    }
-
-    public void setSenseVOList(List<SenseValVO> senseVOList) {
-        this.senseVOList = senseVOList;
-    }
-
-    public List<HardwareCVO> getLabHardwareVOList() {
-        return labHardwareVOList;
-    }
-
-    public void setLabHardwareVOList(List<HardwareCVO> labHardwareVOList) {
-        this.labHardwareVOList = labHardwareVOList;
-    }
-
-
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-
-    public String getFiedColor() {
-        return fiedColor;
-    }
-
-    public void setFiedColor(String fiedColor) {
-        this.fiedColor = fiedColor;
-    }
-
-    public SafeInfo getSafeInfo() {
-        return safeInfo;
-    }
-
-    public void setSafeInfo(SafeInfo safeInfo) {
-        this.safeInfo = safeInfo;
-    }
-
-    public List<LabHazardSubVO> getHazardList() {
-        return hazardList;
-    }
-
-    public void setHazardList(List<LabHazardSubVO> hazardList) {
-        this.hazardList = hazardList;
-    }
-
-    public List<LabRiskPlanVO> getRiskPlanList() {
-        return riskPlanList;
-    }
-
-    public void setRiskPlanList(List<LabRiskPlanVO> riskPlanList) {
-        this.riskPlanList = riskPlanList;
-    }
-
-    public Long getMoldId() {
-        return moldId;
-    }
-
-    public void setMoldId(Long moldId) {
-        this.moldId = moldId;
-    }
-
-    public String getAdminNameAndPhone() {
-        return adminNameAndPhone;
-    }
-
-    public void setAdminNameAndPhone(String adminNameAndPhone) {
-        this.adminNameAndPhone = adminNameAndPhone;
-    }
-
-    public String getSafeUserNameAdminPhone() {
-        return safeUserNameAdminPhone;
-    }
-
-    public void setSafeUserNameAdminPhone(String safeUserNameAdminPhone) {
-        this.safeUserNameAdminPhone = safeUserNameAdminPhone;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/LabSubjectVO.java

@@ -1,71 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 实验室VO
- *
- * @Author: zhoupan
- * @Date: 2021/09/07/15:17
- * @Description:
- */
-@ApiModel("实验室管理类")
-public class LabSubjectVO extends LabSubject {
-
-    @ApiModelProperty("楼层名称")
-    private String buildName;
-
-    @ApiModelProperty("实验室科室")
-    private String subDept;
-
-    @ApiModelProperty("危险级别名称")
-    private String dangerName;
-
-    @ApiModelProperty("负责人名称")
-    private String adminName;
-
-    @ApiModelProperty("是否申请")
-    private Boolean isApply;
-
-
-    public String getAdminName() {
-        return adminName;
-    }
-
-    public void setAdminName(String adminName) {
-        this.adminName = adminName;
-    }
-
-    public String getBuildName() {
-        return buildName;
-    }
-
-    public void setBuildName(String buildName) {
-        this.buildName = buildName;
-    }
-
-    public String getSubDept() {
-        return subDept;
-    }
-
-    public void setSubDept(String subDept) {
-        this.subDept = subDept;
-    }
-
-    public String getDangerName() {
-        return dangerName;
-    }
-
-    public void setDangerName(String dangerName) {
-        this.dangerName = dangerName;
-    }
-
-    public Boolean getIsApply() {
-        return isApply;
-    }
-
-    public void setIsApply(Boolean isApply) {
-        this.isApply = isApply;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/SensorFunctionStatus.java

@@ -1,184 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.enums.SenseType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Optional;
-
-/**
- * 传感器功能
- * @Author: zhoupan
- * @Date: 2021/09/27/15:36
- * @Description:
- */
-@ApiModel("传感器功能")
-public class SensorFunctionStatus extends BasicFunctionStatus {
-    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-    private static final String format_val ="{}{}";
-    /**
-     * 传感器id,用于区分多个一样的设备。
-     */
-    @ApiModelProperty("传感器id")
-    private Long id;
-
-    /**
-     * 传感器功能值
-     */
-    @ApiModelProperty("传感器功能值")
-    private String val;
-    /**
-     * 传感器功能值
-     */
-    @ApiModelProperty("格式化值")
-    private String formatVal;
-
-
-    private String defaultVal="--";
-
-    /**
-     * 保留小数点位数
-     */
-    @JsonIgnore
-    private Integer numberDecimal;
-
-    /**
-     * 传感器功能值
-     */
-    @ApiModelProperty("功能值单位")
-    private String unit;
-
-    @ApiModelProperty("路由位数")
-    @JsonIgnore
-    private Integer routeNum;
-
-
-    @ApiModelProperty("是否存在预警")
-    private Boolean hasWarn = false;
-
-    private String sendDate;
-
-    private SenseType type;
-
-    private String  configName;
-
-    public SensorFunctionStatus() {
-        //获取当前时间
-        LocalDateTime newTime = LocalDateTime.now();
-        String format = formatter.format(newTime);
-        this.sendDate = format;
-    }
-
-    public Boolean getHasWarn() {
-        return hasWarn;
-    }
-
-    public void setHasWarn(Boolean hasWarn) {
-        this.hasWarn = hasWarn;
-    }
-
-    public Integer getRouteNum() {
-        return routeNum;
-    }
-
-    public void setRouteNum(Integer routeNum) {
-        this.routeNum = routeNum;
-    }
-
-    public String getRoundVlue() {
-        if(val==null) return defaultVal;
-
-        if(numberDecimal!=null&&!val.equals(defaultVal))
-        {
-            String s = NumberUtil.roundStr(val, numberDecimal);
-            return s;
-        }
-        return val;
-    }
-
-    public Integer getNumberDecimal() {
-        return numberDecimal;
-    }
-
-    public void setNumberDecimal(Integer numberDecimal) {
-        this.numberDecimal = numberDecimal;
-    }
-
-
-    /**
-     * 命令
-     */
-    @ApiModelProperty("命令")
-    private String cmd;
-
-    public String getFormatVal() {
-
-        return StrUtil.format(format_val,getRoundVlue(),Optional.ofNullable(unit).orElse(StrUtil.EMPTY));
-    }
-
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getCmd() {
-        return cmd;
-    }
-
-    public void setCmd(String cmd) {
-        this.cmd = cmd;
-    }
-
-
-    public String getVal() {
-        if(val==null) return defaultVal;
-        return val;
-    }
-
-    public void setVal(String val) {
-        this.val = val;
-    }
-
-    public String getSendDate() {
-        return sendDate;
-    }
-
-    public void setSendDate(String sendDate) {
-        this.sendDate = sendDate;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public SenseType getType() {
-        return type;
-    }
-
-    public void setType(SenseType type) {
-        this.type = type;
-    }
-
-    public String getConfigName() {
-        return configName;
-    }
-
-    public void setConfigName(String configName) {
-        this.configName = configName;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/SubAddrr.java

@@ -1,84 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import cn.hutool.core.util.StrUtil;
-
-import java.util.Optional;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/09/27/18:46
- * @Description:
- */
-public class SubAddrr {
-    /**
-     * 布局ID
-     */
-    Long id;
-
-    Long floorId;
-    /**
-     * 层
-     */
-    String floorName;
-    /**
-     * 楼
-     */
-    String buildName;
-    /**
-     * 房间号
-     */
-    String room;
-
-
-    private static String addrrFormat = "{} {} {}";
-
-    public static String addrrPlus(SubAddrr subAddrr) {
-
-        if (subAddrr == null) return StrUtil.EMPTY;
-
-        return StrUtil.format(addrrFormat,
-                Optional.ofNullable(subAddrr.getBuildName()).orElse(StrUtil.EMPTY),
-                Optional.ofNullable(subAddrr.getFloorName()).orElse(StrUtil.EMPTY),
-                Optional.ofNullable(subAddrr.getRoom()).orElse(StrUtil.EMPTY));
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getFloorName() {
-        return floorName;
-    }
-
-    public void setFloorName(String floorName) {
-        this.floorName = floorName;
-    }
-
-    public String getBuildName() {
-        return buildName;
-    }
-
-    public void setBuildName(String buildName) {
-        this.buildName = buildName;
-    }
-
-    public String getRoom() {
-        return room;
-    }
-
-    public void setRoom(String room) {
-        this.room = room;
-    }
-
-    public Long getFloorId() {
-        return floorId;
-    }
-
-    public void setFloorId(Long floorId) {
-        this.floorId = floorId;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/TotalByID.java

@@ -1,30 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/09/29/13:30
- * @Description:
- */
-public class TotalByID {
-
-    Long id;
-
-    Long total;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getTotal() {
-        return total;
-    }
-
-    public void setTotal(Long total) {
-        this.total = total;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/HardwareCVO.java

@@ -1,82 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zd.common.core.domain.hazard.BaseHardware;
-import com.zd.common.core.domain.hazard.HardwareType;
-import com.zd.common.core.enums.HardwareTypeEnum;
-import com.zd.system.api.laboratory.domain.Control;
-import com.zd.system.api.laboratory.domain.FunctionStatus;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * 硬件设备
- *
- * @Author: zhoupan
- * @Date: 2021/09/17/14:31
- * @Description:
- */
-public class HardwareCVO extends BaseHardware {
-
-    @ApiModelProperty("硬件类型")
-    HardwareTypeEnum hardwareTypeEnum;
-
-    @ApiModelProperty("开关状态")
-    Control.SwitchEnums switchEnums;
-
-    /**
-     * 设备功能状态-当前状态
-     */
-    @Deprecated
-    FunctionStatus functionStatus;
-
-    /**
-     * 设备功能状态-所有状态
-     */
-    @Deprecated
-    List<FunctionStatus> functionStatusList;
-
-    /**
-     * 设备类型
-     *
-     * @return
-     */
-    @Override
-    protected HardwareType hardwareType() {
-        return hardwareTypeEnum;
-    }
-
-
-    public Control.SwitchEnums getSwitchEnums() {
-        return switchEnums;
-    }
-
-    public void setSwitchEnums(Control.SwitchEnums switchEnums) {
-        this.switchEnums = switchEnums;
-    }
-
-    public List<FunctionStatus> getFunctionStatusList() {
-        return functionStatusList;
-    }
-
-    public void setFunctionStatusList(List<FunctionStatus> functionStatusList) {
-        this.functionStatusList = functionStatusList;
-    }
-
-    public FunctionStatus getFunctionStatus() {
-        return functionStatus;
-    }
-
-    public void setFunctionStatus(FunctionStatus functionStatus) {
-        this.functionStatus = functionStatus;
-    }
-
-    public HardwareTypeEnum getHardwareTypeEnum() {
-        return hardwareTypeEnum;
-    }
-
-    public void setHardwareTypeEnum(HardwareTypeEnum hardwareTypeEnum) {
-        this.hardwareTypeEnum = hardwareTypeEnum;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/LabGradeManageWorkDetailVO.java

@@ -1,203 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-@ApiModel("管控工作明细表")
-public class LabGradeManageWorkDetailVO {
-
-    /**
-     * 管控记录ID
-     */
-    @ApiModelProperty(value = "管控记录ID")
-    private Long recordId;
-    @ApiModelProperty(value = "是否过期，0 否，1 是")
-    private Integer isExpired = 0;
-
-    /**
-     * 实验室id
-     */
-    @ApiModelProperty(value = "实验室id")
-    private Long subId;
-    /**
-     * 规则ID
-     */
-    @ApiModelProperty("规则ID")
-    private Long ruleId;
-    /**
-     * 用户规则明细ID
-     */
-    @ApiModelProperty("用户规则明细ID")
-    private Long ruleUserId;
-    /**
-     * 规则名称
-     */
-    @ApiModelProperty("规则名称")
-    private String ruleName;
-    /**
-     * 规则描述
-     */
-    @ApiModelProperty("规则描述")
-    private String ruleRemark;
-
-    @ApiModelProperty("规则类型：日管控，月管控..")
-    private String ruleType;
-    @ApiModelProperty("执行周期")
-    private String cycle;
-    /**
-     * 截止执行时间- 通过创建时间 + cycle 周期计算
-     */
-    @JsonFormat(pattern = "yyyy年MM月dd日")
-    @ApiModelProperty("截止执行时间")
-    private Date endDate;
-    /**
-     * 执行状态（1 未执行，2 已执行）
-     */
-    @ApiModelProperty("执行状态（1 未执行，2 已执行）")
-    private Integer status;
-    /**
-     * 实际执行时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "执行时间")
-    private Date carryTime;
-    /**
-     * 需要上传材料（0 否，1 是）
-     */
-    @ApiModelProperty("需要上传材料（0 否，1 是）")
-    private Integer isUpload;
-    /**
-     * 是否全部执行（0 否，1 是）
-     */
-    @ApiModelProperty(value = "是否全部执行（0 否，1 是）")
-    private Integer isAll;
-
-    /**
-     * 1是文档，2是视频，3是图片
-     */
-    @ApiModelProperty(value = "1是文档，2是视频，3是图片")
-    private String fileFormat;
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public String getRuleName() {
-        return ruleName;
-    }
-
-    public void setRuleName(String ruleName) {
-        this.ruleName = ruleName;
-    }
-
-    public String getRuleRemark() {
-        return ruleRemark;
-    }
-
-    public void setRuleRemark(String ruleRemark) {
-        this.ruleRemark = ruleRemark;
-    }
-
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCarryTime() {
-        return carryTime;
-    }
-
-    public void setCarryTime(Date carryTime) {
-        this.carryTime = carryTime;
-    }
-
-    public Integer getIsUpload() {
-        return isUpload;
-    }
-
-    public void setIsUpload(Integer isUpload) {
-        this.isUpload = isUpload;
-    }
-
-    public Long getRuleUserId() {
-        return ruleUserId;
-    }
-
-    public void setRuleUserId(Long ruleUserId) {
-        this.ruleUserId = ruleUserId;
-    }
-
-    public Long getRecordId() {
-        return recordId;
-    }
-
-    public void setRecordId(Long recordId) {
-        this.recordId = recordId;
-    }
-
-    public Long getSubId() {
-        return subId;
-    }
-
-    public void setSubId(Long subId) {
-        this.subId = subId;
-    }
-
-    public String getRuleType() {
-        return ruleType;
-    }
-
-    public void setRuleType(String ruleType) {
-        this.ruleType = ruleType;
-    }
-
-    public Integer getIsExpired() {
-        return isExpired;
-    }
-
-    public void setIsExpired(Integer isExpired) {
-        this.isExpired = isExpired;
-    }
-
-    public Integer getIsAll() {
-        return isAll;
-    }
-
-    public void setIsAll(Integer isAll) {
-        this.isAll = isAll;
-    }
-
-    public String getCycle() {
-        return cycle;
-    }
-
-    public void setCycle(String cycle) {
-        this.cycle = cycle;
-    }
-
-    public String getFileFormat() {
-        return fileFormat;
-    }
-
-    public void setFileFormat(String fileFormat) {
-        this.fileFormat = fileFormat;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/LabGradeManageWorkVO.java

@@ -1,232 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import cn.hutool.core.collection.ListUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-import java.util.List;
-
-@ApiModel("管控工作表")
-public class LabGradeManageWorkVO {
-    /**
-     * 实验室id
-     */
-    @ApiModelProperty(value = "实验室id")
-    private Long subId;
-    /**
-     * 实验室名称
-     */
-    @ApiModelProperty("实验室名称")
-    private String subName;
-    /**
-     * 实验室分类ID
-     */
-    @ApiModelProperty("实验室分类ID")
-    private Long typeId;
-    /**
-     * 实验室分类名称
-     */
-    @ApiModelProperty("实验室分类名称")
-    private String typeName;
-    /**
-     * 实验室分级ID
-     */
-    @ApiModelProperty("实验室分级ID")
-    private Long level;
-    /**
-     * 实验室分级名称
-     */
-    @ApiModelProperty("实验室分级名称")
-    private String levelName;
-    /**
-     * 实验室分级名称颜色
-     */
-    @ApiModelProperty("实验室分级名称颜色")
-    private String levelColor;
-
-    /**
-     * 实验室类型ID
-     */
-    @ApiModelProperty(value = "实验室类型ID")
-    private Long moldId;
-    /**
-     * 实验室类型ID
-     */
-    @ApiModelProperty(value = "实验室类型名称")
-    private String moldName;
-
-    /**
-     * 实验室部门id
-     */
-    @ApiModelProperty(value = "实验室部门id")
-    private Long deptId;
-
-    /**
-     * 实验室部门名称
-     */
-    @ApiModelProperty(value = "实验室部门名称")
-    private String deptName;
-
-    private Long userId;
-
-    private List<ManageId> manageIds;
-
-    private String cycle;
-
-    /**
-     * 排序字段
-     */
-    private Date endDate;
-
-    @ApiModelProperty(value = "明细数据")
-    private List<LabGradeManageWorkDetailVO> detailList;
-
-    public static class ManageId{
-        public ManageId() {
-        }
-
-        private Long manageId;
-
-        public Long getManageId() {
-            return manageId;
-        }
-
-        public void setManageId(Long manageId) {
-            this.manageId = manageId;
-        }
-    }
-
-    public Long getSubId() {
-        return subId;
-    }
-
-    public void setSubId(Long subId) {
-        this.subId = subId;
-    }
-
-    public String getSubName() {
-        return subName;
-    }
-
-    public void setSubName(String subName) {
-        this.subName = subName;
-    }
-
-    public Long getTypeId() {
-        return typeId;
-    }
-
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
-    }
-
-    public Long getLevel() {
-        return level;
-    }
-
-    public void setLevel(Long level) {
-        this.level = level;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public List<LabGradeManageWorkDetailVO> getDetailList() {
-        return detailList;
-    }
-
-    public void setDetailList(List<LabGradeManageWorkDetailVO> detailList) {
-        if(detailList == null){
-            detailList = ListUtil.empty();
-        }
-        this.detailList = detailList;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public String getLevelColor() {
-        return levelColor;
-    }
-
-    public void setLevelColor(String levelColor) {
-        this.levelColor = levelColor;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getMoldId() {
-        return moldId;
-    }
-
-    public void setMoldId(Long moldId) {
-        this.moldId = moldId;
-    }
-
-    public String getMoldName() {
-        return moldName;
-    }
-
-    public void setMoldName(String moldName) {
-        this.moldName = moldName;
-    }
-
-    public String getCycle() {
-        return cycle;
-    }
-
-    public void setCycle(String cycle) {
-        this.cycle = cycle;
-    }
-
-    public List<ManageId> getManageIds() {
-        return manageIds;
-    }
-
-    public void setManageIds(List<ManageId> manageIds) {
-        this.manageIds = manageIds;
-    }
-
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/LabMessageUserListVO.java

@@ -1,28 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import com.zd.system.api.laboratory.domain.LabMessageUser;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 用户消息对象 lab_message_user
- *
- * @author zhoupan
- * @date 2021-09-02
- */
-@ApiModel("用户消息对象列表VO")
-public class LabMessageUserListVO extends LabMessageUser {
-
-    @ApiModelProperty("发送人名称")
-    public String sendName;
-
-
-    public String getSendName() {
-        return sendName;
-    }
-
-    public void setSendName(String sendName) {
-        this.sendName = sendName;
-    }
-
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/LabRiskPlanVO.java

@@ -1,45 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-public class LabRiskPlanVO {
-
-
-    @ApiModelProperty(value = "预案名称")
-    private String planName;
-
-    @ApiModelProperty(value = "预案执行次数")
-    private String planCount;
-
-    @ApiModelProperty(value = "最近执行时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastTime;
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getPlanCount() {
-        return planCount;
-    }
-
-    public void setPlanCount(String planCount) {
-        this.planCount = planCount;
-    }
-
-    public Date getLastTime() {
-        return lastTime;
-    }
-
-    public void setLastTime(Date lastTime) {
-        this.lastTime = lastTime;
-    }
-
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/LabSubClassVO.java

@@ -1,98 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 实验室危险等级
- *
- * @Author: zhoupan
- * @Date: 2021/09/23/14:52
- * @Description:
- */
-@ApiModel("实验室危险等级")
-public class LabSubClassVO {
-    private static final String ss= "{}级";
-    private static final Map<Long,String> temp= new HashMap<>();
-
-//    static {
-//        temp = new HashMap<>();
-//
-//        temp.put(Long.valueOf(1l),"一级");
-//        temp.put(Long.valueOf(2l),"二级");
-//        temp.put(Long.valueOf(3l),"三级");
-//        temp.put(Long.valueOf(4l),"四级");
-//        temp.put(Long.valueOf(5l),"五级");
-//        temp.put(null,"四级");
-//    }
-
-    @ApiModelProperty("实验室ID")
-    private Long subjectId;
-
-    @ApiModelProperty("危险等级ID")
-    private Long classtypeId;
-
-    @ApiModelProperty("危险等级名称")
-    private String typeName;
-
-    @ApiModelProperty("危险级别1高危险级,2较高危险级,3中危险级,4一般危险级")
-    private Long dangerLevel;
-
-    @ApiModelProperty("级别名称")
-    private String levelName;
-
-    @ApiModelProperty("级别颜色")
-    private String levelColor;
-
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public Long getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Long subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public Long getClasstypeId() {
-//        if(dangerLevel==null) return 4l;
-        return classtypeId;
-    }
-
-    public void setClasstypeId(Long classtypeId) {
-        this.classtypeId = classtypeId;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-
-    public Long getDangerLevel() {
-        return dangerLevel;
-    }
-
-    public void setDangerLevel(Long dangerLevel) {
-        this.dangerLevel = dangerLevel;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public String getLevelColor() {
-        return levelColor;
-    }
-
-    public void setLevelColor(String levelColor) {
-        this.levelColor = levelColor;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/SenseValVO.java

@@ -1,94 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import com.zd.common.core.enums.SenseType;
-import com.zd.common.core.domain.hazard.BaseHardware;
-import com.zd.common.core.domain.hazard.HardwareType;
-import com.zd.common.core.utils.SpringUtils;
-import com.zd.system.api.laboratory.domain.SensorFunctionStatus;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/09/16/14:51
- * @Description:
- */
-@ApiModel("传感器VO")
-public class SenseValVO extends BaseHardware {
-
-
-    @ApiModelProperty("传感器类型")
-    SenseType senseType;
-    @Deprecated
-    @ApiModelProperty("值")
-    String val;
-
-    /**
-     * 解决传感器多功能问题
-     */
-    @ApiModelProperty("传感器功能列表")
-    List<SensorFunctionStatus> sensorFunctionStatusesList;
-
-
-    /**
-     * 如果是单功能则有值
-     * @return
-     */
-    public SensorFunctionStatus getSensorFunctionStatuses() {
-
-        if(CollUtil.isNotEmpty(sensorFunctionStatusesList)&&sensorFunctionStatusesList.size()==1) return sensorFunctionStatusesList.get(0);
-        return null;
-    }
-
-
-    public List<SensorFunctionStatus> getSensorFunctionStatusesList() {
-        return sensorFunctionStatusesList;
-    }
-
-    public void setSensorFunctionStatusesList(List<SensorFunctionStatus> sensorFunctionStatusesList) {
-        this.sensorFunctionStatusesList = sensorFunctionStatusesList;
-    }
-
-    /**
-     * 单功能
-     */
-
-
-
-    public SenseType getSenseType() {
-        return senseType;
-    }
-
-    public void setSenseType(SenseType senseType) {
-        this.senseType = senseType;
-    }
-
-    public String getVal() {
-        if (SpringUtils.getActiveProfile().equals("dev")) {
-            return StrUtil.format("{}{}", RandomUtil.randomInt(10, 100),Optional.ofNullable(senseType).map(a->a.getUnit()).orElse("") );
-        }
-        return val;
-    }
-
-    public void setVal(String val) {
-        this.val = val;
-    }
-
-    /**
-     * 设备类型
-     *
-     * @return
-     */
-    @Override
-    protected HardwareType hardwareType() {
-
-        return senseType;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/vo/SubFunction.java

@@ -1,39 +0,0 @@
-package com.zd.system.api.laboratory.domain.vo;
-
-import com.zd.system.api.laboratory.domain.BasicFunctionStatus;
-import com.zd.system.api.laboratory.domain.FunctionStatus;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/10/09/10:21
- * @Description:
- */
-@ApiModel("实验室功能点")
-public class SubFunction<T extends BasicFunctionStatus> {
-    @ApiModelProperty("实验室ID")
-    private Long subId;
-
-    private List< T > functionStatuses;
-
-
-    public Long getSubId() {
-        return subId;
-    }
-
-    public SubFunction setSubId(Long subId) {
-        this.subId = subId;
-        return this;
-    }
-
-    public List<T> getFunctionStatuses() {
-        return functionStatuses;
-    }
-
-    public void setFunctionStatuses(List<T> functionStatuses) {
-        this.functionStatuses = functionStatuses;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/message/RemoteMessageService.java

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

zd-api/zd-api-system/src/main/java/com/zd/system/api/message/factory/RemoteMessageFallbackFactory.java

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

zd-api/zd-api-system/src/main/java/com/zd/system/api/model/LoginUser.java

@@ -1,199 +0,0 @@
-package com.zd.system.api.model;
-
-import java.io.Serializable;
-import java.util.Set;
-
-import com.zd.common.core.constant.UserConstants;
-import com.zd.system.api.domain.SysUser;
-
-/**
- * 用户信息
- *
- * @author zd
- */
-public class LoginUser implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户唯一标识
-     */
-    private String token;
-    /**
-     * 一体机编号
-     */
-    private String machineCode;
-
-    /**
-     * 用户名id
-     */
-    private Long userid;
-
-    /**
-     * 登录类型区分PC 小程序
-     */
-    private Integer loginType;
-
-    /**
-     * 用户名
-     */
-    private String username;
-    /**
-     * 用户名
-     */
-    private String nickName;
-
-    /**
-     * 登录时间
-     */
-    private Long loginTime;
-
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
-
-    /**
-     * 登录IP地址
-     */
-    private String ipaddr;
-
-    /**
-     * 权限列表
-     */
-    private Set<String> permissions;
-
-    /**
-     * 角色列表
-     */
-    private Set<String> roles;
-
-    /**
-     * 用户信息
-     */
-    private SysUser sysUser;
-
-    /**
-     * 是否设置柜锁
-     */
-    private boolean cabinetLock = false;
-
-    /**
-     * 是否设置气瓶
-     */
-    private boolean airBottle = false;
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public Long getUserid() {
-        return userid;
-    }
-
-    public void setUserid(Long userid) {
-        this.userid = userid;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public Long getLoginTime() {
-        return loginTime;
-    }
-
-    public void setLoginTime(Long loginTime) {
-        this.loginTime = loginTime;
-    }
-
-    public Long getExpireTime() {
-        return expireTime;
-    }
-
-    public void setExpireTime(Long expireTime) {
-        this.expireTime = expireTime;
-    }
-
-    public String getIpaddr() {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr) {
-        this.ipaddr = ipaddr;
-    }
-
-    public Set<String> getPermissions() {
-        return permissions;
-    }
-
-    public void setPermissions(Set<String> permissions) {
-        this.permissions = permissions;
-    }
-
-    public Set<String> getRoles() {
-        return roles;
-    }
-
-    public void setRoles(Set<String> roles) {
-        this.roles = roles;
-    }
-
-    public SysUser getSysUser() {
-        return sysUser;
-    }
-
-    public void setSysUser(SysUser sysUser) {
-        this.sysUser = sysUser;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public Integer getLoginType() {
-        if(this.loginType == null){
-            return UserConstants.USER_LOGIN_PC;
-        }
-        return loginType;
-    }
-
-    public void setLoginType(Integer loginType) {
-        this.loginType = loginType;
-    }
-
-    public String getMachineCode() {
-        return machineCode;
-    }
-
-    public void setMachineCode(String machineCode) {
-        this.machineCode = machineCode;
-    }
-
-    public boolean isCabinetLock() {
-        return cabinetLock;
-    }
-
-    public void setCabinetLock(boolean cabinetLock) {
-        this.cabinetLock = cabinetLock;
-    }
-
-    public boolean isAirBottle() {
-        return airBottle;
-    }
-
-    public void setAirBottle(boolean airBottle) {
-        this.airBottle = airBottle;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/model/SimpleUserVO.java

@@ -1,79 +0,0 @@
-package com.zd.system.api.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Map;
-
-/**
- * 简略用户信息
- */
-@ApiModel("简略用户信息")
-public class SimpleUserVO {
-
-    /**
-     * 用户姓名
-     */
-    @ApiModelProperty("用户姓名")
-    String userName;
-
-
-    /**
-     * 用户职称 学生时，返回学生 ，系统用户 返回系统用户
-     */
-    @ApiModelProperty("用户职称|说明")
-    String professional;
-
-
-    /**
-     * 部门名称
-     */
-    @ApiModelProperty("部门名称")
-    String deptName;
-
-
-    @ApiModelProperty("头像")
-    String avatar;
-
-    Map<String,Object> count;
-
-    public Map<String,Object> getCount() {
-        return count;
-    }
-
-    public void setCount(Map<String,Object> count) {
-        this.count = count;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getProfessional() {
-        return professional;
-    }
-
-    public void setProfessional(String professional) {
-        this.professional = professional;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/model/SysDeptListVO.java

@@ -1,134 +0,0 @@
-package com.zd.system.api.model;
-
-import io.swagger.annotations.ApiModel;
-
-/**
- * 部门列表树vo对象
- *
- * @Author: zhoupan
- * @Date: 2021/09/29/9:46
- * @Description:
- */
-@ApiModel("部门列表树VO")
-public class SysDeptListVO {
-
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 父部门ID
-     */
-    private Long parentId;
-
-    /**
-     * 部门名称
-     */
-    private String deptName;
-
-    /**
-     * 显示顺序
-     */
-    private String orderNum;
-
-    /**
-     * 部门状态:0正常,1停用
-     */
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 总人数
-     */
-    private Long totalPeople;
-
-    /**
-     * 总实验室
-     */
-    private Long totalSub;
-
-
-    /**
-     * 部门照片
-     */
-    private String deptImg;
-
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public Long getTotalPeople() {
-        return totalPeople;
-    }
-
-    public void setTotalPeople(Long totalPeople) {
-        this.totalPeople = totalPeople;
-    }
-
-    public Long getTotalSub() {
-        return totalSub;
-    }
-
-    public void setTotalSub(Long totalSub) {
-        this.totalSub = totalSub;
-    }
-
-    public String getDeptImg() {
-        return deptImg;
-    }
-
-    public void setDeptImg(String deptImg) {
-        this.deptImg = deptImg;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/students/RemoteStudentsService.java

@@ -1,36 +0,0 @@
-package com.zd.system.api.students;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.LabStudentsInfo;
-import com.zd.system.api.factory.RemoteFileFallbackFactory;
-import com.zd.system.api.students.factory.RemoteStudentsFallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 文件服务
- *
- * @author zd
- */
-@FeignClient(contextId = "remoteStudentsService", value = ServiceNameConstants.LABORATORY_SERVICE, fallbackFactory = RemoteStudentsFallbackFactory.class)
-public interface RemoteStudentsService {
-    /**
-     * 获取学生信息
-     * @param id 学生Id
-     * @return 结果
-     */
-    @GetMapping(value = "/studentinfo/{joinStudentsId}")
-    public R<LabStudentsInfo> getInfo(@PathVariable("joinStudentsId") Long id);
-
-    /**
-     * 提交学生卡
-     * @param file
-     * @return
-     */
-    @PostMapping (value = "/studentinfo/commit/crad",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R commitCard(@RequestPart("file") MultipartFile file);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/students/factory/RemoteStudentsFallbackFactory.java

@@ -1,36 +0,0 @@
-package com.zd.system.api.students.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.LabStudentsInfo;
-import com.zd.system.api.students.RemoteStudentsService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 文件服务降级处理
- *
- * @author zd
- */
-@Component
-public class RemoteStudentsFallbackFactory implements FallbackFactory<RemoteStudentsService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteStudentsFallbackFactory.class);
-
-    @Override
-    public RemoteStudentsService create(Throwable throwable) {
-        log.error("学生信息调用失败:{}", throwable.getMessage());
-        return new RemoteStudentsService() {
-            @Override
-            public R<LabStudentsInfo> getInfo(@PathVariable("joinStudentsId") Long id) {
-                return R.fail("学生信息调用失败:" + throwable.getMessage());
-            }
-            @Override
-            public R commitCard(MultipartFile file) {
-                return R.fail("学生卡上传调用失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/test.java

@@ -1,31 +0,0 @@
-package com.zd.system.api;
-
-import cn.hutool.core.util.NumberUtil;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class test {
-    public static void main(String[] args) {
-        String[] urlStr = new String[5];
-        urlStr[0] = "15-31-17.mp4";
-        urlStr[1] = "15-31-29.mp4";
-        urlStr[2] = "15-31-20.mp4";
-        urlStr[3] = "15-31-30.mp4";
-        urlStr[4] = "15-31-15.mp4";
-        List<Map<String,Object>> collect = Arrays.asList(urlStr).stream()
-                .map(a -> {
-                    Map<String,Object> urlMap = new HashMap<String,Object>();
-                    Integer value = Integer.parseInt(a.substring(0, a.lastIndexOf(".")).replaceAll("-", ""));
-                    urlMap.put("key",value);
-                    urlMap.put("value",a);
-                    return urlMap;
-                }).collect(Collectors.toList());
-        Map<String,Object> arrMap = Optional.ofNullable(collect).orElseGet(Collections::emptyList)
-                .stream()
-                .sorted((c, d) -> NumberUtil.compare(Integer.parseInt(d.get("key").toString()),Integer.parseInt(c.get("key").toString())))
-                .collect(Collectors.toList()).get(0);
-
-        System.out.println(arrMap.get("value"));
-    }
-}

zd-api/zd-api-system/src/main/resources/META-INF/spring.factories

@@ -1,24 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.zd.system.api.factory.RemoteUserFallbackFactory,\
-  com.zd.system.api.factory.RemoteLogFallbackFactory, \
-  com.zd.system.api.factory.RemoteFileFallbackFactory, \
-  com.zd.system.api.factory.RemoteDeptFallbackFactory, \
-  com.zd.system.api.factory.RemoteExamFallbackFactory, \
-  com.zd.system.api.face.factory.RemoteFaceFallbackFactory, \
-  com.zd.system.api.students.factory.RemoteStudentsFallbackFactory, \
-  com.zd.system.api.factory.RemoteMessageContentFallbackFactory,\
-  com.zd.system.api.factory.RemoteAlarmFallbackFactory,\
-  com.zd.system.api.forward.factory.RemoteForwardFallbackFactory,\
-  com.zd.system.api.factory.RemoteSubQueryFallbackFactory,\
-  com.zd.system.api.factory.RemoteLaboratoryFallbackFactory,\
-  com.zd.system.api.kkFile.factory.RemoteKkFileServiceFallbackFactory,\
-  com.zd.system.api.speak.factory.RemoteSpeakFallbackFactory,\
-  com.zd.system.api.airbottle.factory.RemoteAirBottleFallbackFactory,\
-  com.zd.system.api.netty.factory.RemoteNettyFallbackFactory,\
-  com.zd.system.api.chemical.factory.RemoteStockFallbackFactory,\
-  com.zd.system.api.chemical.factory.RemoteCabinetFallbackFactory,\
-  com.zd.system.api.camera.factory.RemoteCameraFallBackFactory,\
-  com.zd.system.api.netty.factory.RemoteNettyFallbackFactory,\
-  com.zd.system.api.message.factory.RemoteMessageFallbackFactory,\
-  com.zd.system.api.chemical.factory.RemoteChemicalAlarmFallbackFactory
-

zd-common/zd-common-core/pom.xml

@@ -1,134 +0,0 @@
-<?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-core</artifactId>
-    <packaging>jar</packaging>
-    <description>核心模块</description>
-
-    <dependencies>
-        <!-- SpringCloud Openfeign -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Loadbalancer -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-
-        <!-- Spring Context Support -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
-        <!-- Spring Web -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <!-- Apache Commons Pool2 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- Hibernate Validator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- Jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-
-        <!-- Alibaba Fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
-        <!-- Apache Lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <!-- Commons Io -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <!-- Commons Fileupload -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <!-- excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
-        <!-- Java Servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baidubce</groupId>
-            <artifactId>bce-java-sdk</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.belerweb</groupId>
-            <artifactId>pinyin4j</artifactId>
-        </dependency>
-
-        <!--   引入lombok组件 使用@Getter @Setter 注解，避免手写get、set方法，使代码更简洁、清亮     -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-    </dependencies>
-</project>

zd-common/zd-common-core/src/main/java/com/zd/common/core/annotation/DeviceID.java

@@ -1,19 +0,0 @@
-package com.zd.common.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @Author: zhoupan
- * @Date: 2021/10/08/8:32
- * @Description:
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface DeviceID {
-
-
-
-}

zd-common/zd-common-core/src/main/java/com/zd/common/core/annotation/Excel.java

@@ -1,160 +0,0 @@
-package com.zd.common.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.math.BigDecimal;
-
-/**
- * 自定义导出Excel数据注解
- *
- * @author zd
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface Excel {
-    /**
-     * 导出时在excel中排序
-     */
-    public int sort() default Integer.MAX_VALUE;
-
-    /**
-     * 导出到Excel中的名字.
-     */
-    public String name() default "";
-
-    /**
-     * 日期格式, 如: yyyy-MM-dd
-     */
-    public String dateFormat() default "";
-
-    /**
-     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
-     */
-    public String readConverterExp() default "";
-
-    /**
-     * 分隔符，读取字符串组内容
-     */
-    public String separator() default ",";
-
-    /**
-     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
-     */
-    public int scale() default -1;
-
-    /**
-     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
-     */
-    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
-
-    /**
-     * 导出类型（0数字 1字符串）
-     */
-    public ColumnType cellType() default ColumnType.STRING;
-
-    /**
-     * 导出时在excel中每个列的高度 单位为字符
-     */
-    public double height() default 14;
-
-    /**
-     * 导出时在excel中每个列的宽 单位为字符
-     */
-    public double width() default 16;
-
-    /**
-     * 文字后缀,如% 90 变成90%
-     */
-    public String suffix() default "";
-
-    /**
-     * 当值为空时,字段的默认值
-     */
-    public String defaultValue() default "";
-
-    /**
-     * 提示信息
-     */
-    public String prompt() default "";
-
-    /**
-     * 设置只能选择不能输入的列内容.
-     */
-    public String[] combo() default {};
-
-    /**
-     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
-     */
-    public boolean isExport() default true;
-
-    /**
-     * 另一个类中的属性名称,支持多级获取,以小数点隔开
-     */
-    public String targetAttr() default "";
-
-    /**
-     * 是否自动统计数据,在最后追加一行统计数据总和
-     */
-    public boolean isStatistics() default false;
-
-    /**
-     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
-     */
-    Align align() default Align.AUTO;
-
-    public enum Align {
-        AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
-        private final int value;
-
-        Align(int value) {
-            this.value = value;
-        }
-
-        public int value() {
-            return this.value;
-        }
-    }
-
-    /**
-     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
-     */
-    Type type() default Type.ALL;
-
-    public enum Type {
-        ALL(0), EXPORT(1), IMPORT(2);
-        private final int value;
-
-        Type(int value) {
-            this.value = value;
-        }
-
-        public int value() {
-            return this.value;
-        }
-    }
-
-    public enum ColumnType {
-        NUMERIC(0), STRING(1), IMAGE(2);
-        private final int value;
-
-        ColumnType(int value) {
-            this.value = value;
-        }
-
-        public int value() {
-            return this.value;
-        }
-    }
-
-    /**
-     * 字典标签
-     */
-    public String dictLable() default "";
-
-    /**
-     * 是否必填
-     */
-    public boolean isRequired() default false;
-}

zd-common/zd-common-core/src/main/java/com/zd/common/core/annotation/Excels.java

@@ -1,17 +0,0 @@
-package com.zd.common.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Excel注解集
- *
- * @author zd
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Excels {
-    Excel[] value();
-}

zd-common/zd-common-core/src/main/java/com/zd/common/core/annotation/FunctionMapper.java

@@ -1,42 +0,0 @@
-package com.zd.common.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 功能映射
- * @Author: zhoupan
- * @Date: 2021/10/06/8:37
- * @Description:
- */
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface FunctionMapper {
-
-
-    String funNum() default "";
-
-    /**
-     * 是否带单位
-     * @return
-     */
-    boolean isUnit() default true;
-
-    /**
-     * 单位分隔符
-     * @return
-     */
-    String unitSpit() default " ";
-
-    /**
-     * 单位 手动指定单位
-     * @return
-     */
-    String unit()  default "";
-
-
-    
-}