依赖报错处理

zd-api/zd-exam-api/pom.xml

@@ -11,10 +11,8 @@
 
     <groupId>com.zd.exam</groupId>
     <artifactId>zd-exam-api</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
+    <version>${zd.version}</version>
+    <packaging>jar</packaging>
+    <description>exam接口依赖</description>
 
 </project>

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

@@ -1,15 +1,13 @@
 package com.zd.exam.api.feign;
 
-import com.zd.exam.api.entity.ElResources;
 import com.zd.exam.api.feign.fallback.RemoteExamFallback;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.R;
-import com.zd.model.domain.ResultData;
+import com.zd.exam.api.entity.ElResources;
 import com.zd.model.page.TableDataInfo;
 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;
 
@@ -35,21 +33,21 @@ public interface RemoteExamService {
      */
     @ApiOperation(value = "去考试自动创建试卷")
     @PostMapping(value = "/paper/create-paper")
-    public ResultData<Object> createPaper(@RequestBody Map elPaper);
+    public R<Object> createPaper(@RequestBody Map elPaper);
 
     /**
      * 交卷操作
      */
     @ApiOperation(value = "交卷操作")
     @PostMapping(value = "/paper/handPaper")
-    public ResultData<Object> handPaper(@RequestBody Map id);
+    public R<Object> handPaper(@RequestBody Map id);
 
     /**
      * 答题过程根据 paperId 和 quId 查询问题和选项
      */
     @ApiOperation(value = "查询问题和选项")
     @PostMapping(value = "/paper/paperDetail")
-    public ResultData<Object> queryQuDetail(@RequestBody Map paperQu);
+    public R<Object> queryQuDetail(@RequestBody Map paperQu);
 
     /**
      * 填充答案 下一题实时保存上题答案
@@ -58,53 +56,53 @@ public interface RemoteExamService {
      */
     @ApiOperation(value = "保存用户答案")
     @PostMapping(value = "/paper/fillAnswer")
-    public ResultData<Object> fillAnswer(@RequestBody Map<String,Object> paperQuMap);
+    public R<Object> fillAnswer(@RequestBody Map<String,Object> paperQuMap);
 
     /**
      * 获取试卷管理详细信息（答题卡信息）
      */
     @GetMapping(value = "/paper/{id}")
-    public ResultData<Object> getInfo(@PathVariable("id") Long id);
+    public R<Object> getInfo(@PathVariable("id") Long id);
 
 
     /**
      * 根据用户id，修改积分内容
      */
     @PostMapping(value = "/points/record/recoveryPoints")
-    public ResultData<Object> recoveryPoints(@RequestBody Map<String,Object> recovery);
+    public R<Object> recoveryPoints(@RequestBody Map<String,Object> recovery);
 
     /**
      * 根据积分类型，扣除积分相关内容
      */
     @PostMapping(value = "/points/record/deductionPoints")
-    public ResultData<Object> deductionPoints(@RequestBody Map<String,Object> deductionPoint);
+    public R<Object> deductionPoints(@RequestBody Map<String,Object> deductionPoint);
 
     /**
      * 获取积分配置表信息
      */
     @PostMapping(value = "/markconfig/getPointsConfig")
-    public ResultData<Object> getPointsConfig(@RequestBody Map<String,Object> markconfig);
+    public R<Object> getPointsConfig(@RequestBody Map<String,Object> markconfig);
 
 
     /**
      * 初始化奖励积分
      */
     @PostMapping(value = "/points/record/initCreditPoints")
-    public ResultData<Object> initCreditPoints(@RequestBody Map<String,Object> initMap);
+    public R<Object> initCreditPoints(@RequestBody Map<String,Object> initMap);
 
 
     /**
      * 获取奖励分接口
      */
     @PostMapping(value = "/points/record/obtainBonusPoints")
-    public ResultData<Object> obtainBonusPoints(@RequestBody Map<String,Object> obtainMap);
+    public R<Object> obtainBonusPoints(@RequestBody Map<String,Object> obtainMap);
 
 
     /**
      * 获取上月未违规记录接口
      */
     @PostMapping(value = "/points/record/getLastMonthViolation")
-    public ResultData<Object> getLastMonthViolation(@RequestBody Map<String,Object> obtainMap);
+    public R<Object> getLastMonthViolation(@RequestBody Map<String,Object> obtainMap);
 
 
     /**
@@ -112,7 +110,7 @@ public interface RemoteExamService {
      */
     @ApiOperation(value = "查询考试结果")
     @PostMapping(value = "/paper/paperResult")
-    public ResultData<Map> paperResult(Map elPaper);
+    public R<Map> paperResult(Map elPaper);
 
     /**
      * 查询当前用户考试记录列表
@@ -130,7 +128,7 @@ public interface RemoteExamService {
      * 考试过程 查询当前考题的正确和错误数量
      */
     @GetMapping(value = "/paper/paperStatistics/{id}")
-    public ResultData<Object> getPaperStatistics(@PathVariable("id") Long id);
+    public R<Object> getPaperStatistics(@PathVariable("id") Long id);
 
     /**
      * 超时弃考
@@ -150,10 +148,10 @@ public interface RemoteExamService {
      * 根据登录用户查询 我的积分统计
      */
     @PostMapping("/points/record/count/myApp")
-    public ResultData<Object> recordMyAppCount();
+    public R<Object> recordMyAppCount();
 
     @PostMapping("/points/record/exits")
-    public ResultData<Object> findByUserId(@RequestBody Map<String, Object> map);
+    public R<Object> findByUserId(@RequestBody Map<String, Object> map);
 
     /**
      * 进入/出加奖励分
@@ -169,13 +167,13 @@ public interface RemoteExamService {
      * @return
      */
     @PostMapping("/rewardconfig/getBonusPointsConfig")
-    public ResultData getBonusPointsConfig(@RequestBody Map map);
+    public R getBonusPointsConfig(@RequestBody Map map);
 
     /**
      * 获取所有的学习资源
      * @return
      */
     @RequestMapping("/el_resources/listAll")
-    public ResultData<List<ElResources>> listAll();
+    public R<List<ElResources>> listAll();
 
 }

zd-api/zd-exam-api/src/main/java/com/zd/exam/api/feign/fallback/RemoteExamFallback.java

@@ -1,16 +1,13 @@
 package com.zd.exam.api.feign.fallback;
 
-import com.zd.exam.api.entity.ElResources;
 import com.zd.exam.api.feign.RemoteExamService;
-import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.R;
-import com.zd.model.domain.ResultData;
+import com.zd.exam.api.entity.ElResources;
 import com.zd.model.page.TableDataInfo;
 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;
 
@@ -30,73 +27,73 @@ public class RemoteExamFallback implements FallbackFactory<RemoteExamService> {
             @Override
             public TableDataInfo list(Map exam) {
                 TableDataInfo dataInfo = new TableDataInfo<>();
-                dataInfo.setCode(HttpStatus.ERROR);
+                dataInfo.setCode(R.FAIL);
                 return dataInfo;
             }
 
             @Override
-            public ResultData<Object> createPaper(Map elPaper) {
-                return ResultData.fail("开始考试失败:" + throwable.getMessage());
+            public R<Object> createPaper(Map elPaper) {
+                return R.fail("开始考试失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> handPaper(Map elPaper) {
-                return ResultData.fail("交卷失败:" + throwable.getMessage());
+            public R<Object> handPaper(Map elPaper) {
+                return R.fail("交卷失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> queryQuDetail(Map paperQu) {
-                return ResultData.fail("调用答题过程失败:" + throwable.getMessage());
+            public R<Object> queryQuDetail(Map paperQu) {
+                return R.fail("调用答题过程失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> fillAnswer(Map<String,Object> paperQuMap) {
-                return ResultData.fail("提交答案失败:" + throwable.getMessage());
+            public R<Object> fillAnswer(Map<String,Object> paperQuMap) {
+                return R.fail("提交答案失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> getInfo(Long id) {
-                return ResultData.fail("获取试卷管理详细信息失败:" + throwable.getMessage());
+            public R<Object> getInfo(Long id) {
+                return R.fail("获取试卷管理详细信息失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> recoveryPoints(Map<String,Object> recovery) {
+            public R<Object> recoveryPoints(Map<String,Object> recovery) {
                 if(recovery.get("pointsType")!=null && recovery.get("pointsType").equals("2")){
-                    return ResultData.fail("移除黑名单失败:" + throwable.getMessage());
+                    return R.fail("移除黑名单失败:" + throwable.getMessage());
                 }else if(recovery.get("pointsType")!=null && recovery.get("pointsType").equals("1")){
-                    return ResultData.fail("移除负面清单失败:" + throwable.getMessage());
+                    return R.fail("移除负面清单失败:" + throwable.getMessage());
                 }
-                return ResultData.fail("移除失败:" + throwable.getMessage());
+                return R.fail("移除失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> deductionPoints(Map<String,Object> deductionPoint) {
-                return ResultData.fail("扣除积分失败:" + throwable.getMessage());
+            public R<Object> deductionPoints(Map<String,Object> deductionPoint) {
+                return R.fail("扣除积分失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> getPointsConfig(Map<String,Object> markconfig) {
-                return ResultData.fail("获取积分列表失败:" + throwable.getMessage());
+            public R<Object> getPointsConfig(Map<String,Object> markconfig) {
+                return R.fail("获取积分列表失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> initCreditPoints(Map<String,Object> initMap) {
-                return ResultData.fail("初始化积分失败:" + throwable.getMessage());
+            public R<Object> initCreditPoints(Map<String,Object> initMap) {
+                return R.fail("初始化积分失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> obtainBonusPoints(Map<String,Object> obtainMap) {
-                return ResultData.fail("获取奖励积分失败:" + throwable.getMessage());
+            public R<Object> obtainBonusPoints(Map<String,Object> obtainMap) {
+                return R.fail("获取奖励积分失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> getLastMonthViolation(Map<String,Object> obtainMap) {
-                return ResultData.fail("获取上月的违规记录列表失败:" + throwable.getMessage());
+            public R<Object> getLastMonthViolation(Map<String,Object> obtainMap) {
+                return R.fail("获取上月的违规记录列表失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Map> paperResult(Map elPaper) {
-                return ResultData.fail("查询考试结果失败:" + throwable.getMessage());
+            public R<Map> paperResult(Map elPaper) {
+                return R.fail("查询考试结果失败:" + throwable.getMessage());
             }
 
             @Override
@@ -110,14 +107,13 @@ public class RemoteExamFallback implements FallbackFactory<RemoteExamService> {
             @Override
             public TableDataInfo queryMyCert(Map<String, Object> userCert) {
                 TableDataInfo dataInfo = new TableDataInfo<>();
-                dataInfo.setCode(HttpStatus.ERROR);
-
+                dataInfo.setCode(R.FAIL);
                 return dataInfo;
             }
 
             @Override
-            public ResultData<Object> getPaperStatistics(Long id) {
-                return ResultData.fail("查询当前考题的正确和错误数量失败:" + throwable.getMessage());
+            public R<Object> getPaperStatistics(Long id) {
+                return R.fail("查询当前考题的正确和错误数量失败:" + throwable.getMessage());
             }
 
             @Override
@@ -128,18 +124,18 @@ public class RemoteExamFallback implements FallbackFactory<RemoteExamService> {
             @Override
             public TableDataInfo recordMyApp(Map<String, Object> myApp) {
                 TableDataInfo dataInfo = new TableDataInfo<>();
-                dataInfo.setCode(HttpStatus.ERROR);
+                dataInfo.setCode(R.FAIL);
                 return dataInfo;
             }
 
             @Override
-            public ResultData<Object> recordMyAppCount() {
-                return ResultData.fail("查询我的积分统计失败:" + throwable.getMessage());
+            public R<Object> recordMyAppCount() {
+                return R.fail("查询我的积分统计失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> findByUserId(Map<String, Object> map) {
-               return ResultData.fail("查询用户是否存在积分表失败:" + throwable.getMessage());
+            public R<Object> findByUserId(Map<String, Object> map) {
+               return R.fail("查询用户是否存在积分表失败:" + throwable.getMessage());
             }
 
             /**
@@ -160,13 +156,13 @@ public class RemoteExamFallback implements FallbackFactory<RemoteExamService> {
              * @return
              */
             @Override
-            public ResultData getBonusPointsConfig(Map map) {
-                return ResultData.fail("获取奖励分配置失败:" + throwable.getMessage());
+            public R getBonusPointsConfig(Map map) {
+                return R.fail("获取奖励分配置失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<List<ElResources>> listAll() {
-                return ResultData.fail("获取学习资源列表失败:" + throwable.getMessage());
+            public R<List<ElResources>> listAll() {
+                return R.fail("获取学习资源列表失败:" + throwable.getMessage());
             }
         };
     }

zd-auth/pom.xml

@@ -30,12 +30,6 @@
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <!-- SpringBoot Actuator -->
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>-->
-
         <!-- zd Common Security-->
         <dependency>
             <groupId>com.zd.core</groupId>

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/controller/AlarmController.java

@@ -1,8 +1,9 @@
 package com.zd.alg.alarm.controller;
 
-import com.zd.alg.alarm.domain.AlarmLog;
+
 import com.zd.alg.alarm.service.IAlarmLogService;
 import com.zd.alg.alarm.utils.AlarmUtil;
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.system.api.alarm.domain.AlarmEntrty;
@@ -12,7 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.Map;
 
 @RestController

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/mapper/AlarmLogMapper.java

@@ -1,6 +1,8 @@
 package com.zd.alg.alarm.mapper;
 
-import com.zd.alg.alarm.domain.AlarmLog;
+
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
+
 import java.util.List;
 import java.util.Map;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/service/IAlarmLogService.java

@@ -1,6 +1,7 @@
 package com.zd.alg.alarm.service;
 
-import com.zd.alg.alarm.domain.AlarmLog;
+
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
 import java.util.List;
 import java.util.Map;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/service/impl/AlarmLogServiceImpl.java

@@ -1,11 +1,11 @@
 package com.zd.alg.alarm.service.impl;
 
-import com.zd.alg.alarm.domain.AlarmLog;
+
 import com.zd.alg.alarm.mapper.AlarmLogMapper;
 import com.zd.alg.alarm.service.IAlarmLogService;
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 import java.util.Map;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/utils/AlarmUtil.java

@@ -4,8 +4,8 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.zd.alg.alarm.domain.AlarmLog;
 import com.zd.alg.alarm.service.IAlarmLogService;
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.system.api.alarm.domain.AlarmEntrty;
 import com.zd.system.api.alarm.domain.Routes;
@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
 import javax.annotation.PostConstruct;
 import javax.validation.constraints.NotNull;
 import java.util.*;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlApplyApprovalController.java

@@ -1,7 +1,7 @@
 package com.zd.alg.smartlock.controller;
 
-import com.zd.alg.smartlock.domain.SlApplyApproval;
 import com.zd.alg.smartlock.service.ISlApplyApprovalService;
+import com.zd.algorithm.api.smartlock.entity.SlApplyApproval;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlOpendoorApplyController.java

@@ -1,9 +1,10 @@
 package com.zd.alg.smartlock.controller;
 
-import com.zd.alg.smartlock.domain.SlOpendoorApply;
-import com.zd.alg.smartlock.domain.vo.SlOpendoorApplyVo;
+
 import com.zd.alg.smartlock.service.ISlOpendoorApplyService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
+import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
+import com.zd.algorithm.api.smartlock.entity.vo.SlOpendoorApplyVo;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.poi.ExcelUtil;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlSubjectRelationController.java

@@ -1,11 +1,12 @@
 package com.zd.alg.smartlock.controller;
 
-import com.zd.alg.smartlock.domain.SlSubjectRelation;
-import com.zd.alg.smartlock.domain.api.SlLockOnline;
-import com.zd.alg.smartlock.domain.api.SlRoom;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
+
 import com.zd.alg.smartlock.service.ISlSubjectRelationService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
+import com.zd.algorithm.api.smartlock.entity.SlSubjectRelation;
+import com.zd.algorithm.api.smartlock.entity.api.SlLockOnline;
+import com.zd.algorithm.api.smartlock.entity.api.SlRoom;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.ResultData;
@@ -17,7 +18,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlUserRelationController.java

@@ -1,12 +1,11 @@
 package com.zd.alg.smartlock.controller;
 
-import com.zd.alg.smartlock.domain.SlUserRelation;
-import com.zd.alg.smartlock.domain.api.SlLockOnline;
-import com.zd.alg.smartlock.domain.api.SlUser;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
+
 import com.zd.alg.smartlock.service.ISlSubjectRelationService;
 import com.zd.alg.smartlock.service.ISlUserRelationService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
+import com.zd.algorithm.api.smartlock.entity.api.SlLockOnline;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 import com.zd.common.core.constant.SecurityConstants;
 import com.zd.common.core.domain.R;
 import com.zd.common.core.utils.poi.ExcelUtil;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SmartlockController.java

@@ -1,9 +1,10 @@
 package com.zd.alg.smartlock.controller;
 
-import com.zd.alg.smartlock.domain.api.SlLockOnline;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
+
 import com.zd.alg.smartlock.service.ISlSubjectRelationService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
+import com.zd.algorithm.api.smartlock.entity.api.SlLockOnline;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 import com.zd.common.core.constant.SecurityConstants;
 import com.zd.common.core.domain.R;
 import com.zd.common.core.web.controller.BaseController;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/mapper/SlApplyApprovalMapper.java

@@ -1,6 +1,6 @@
 package com.zd.alg.smartlock.mapper;
 
-import com.zd.alg.smartlock.domain.SlApplyApproval;
+import com.zd.algorithm.api.smartlock.entity.SlApplyApproval;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/mapper/SlOpendoorApplyMapper.java

@@ -1,7 +1,8 @@
 package com.zd.alg.smartlock.mapper;
 
-import com.zd.alg.smartlock.domain.SlOpendoorApply;
-import com.zd.alg.smartlock.domain.vo.SlOpendoorApplyVo;
+
+import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
+import com.zd.algorithm.api.smartlock.entity.vo.SlOpendoorApplyVo;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/mapper/SlSubjectRelationMapper.java

@@ -1,7 +1,8 @@
 package com.zd.alg.smartlock.mapper;
 
-import com.zd.alg.smartlock.domain.SlSubjectRelation;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
+
+import com.zd.algorithm.api.smartlock.entity.SlSubjectRelation;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/mapper/SlUserRelationMapper.java

@@ -1,6 +1,7 @@
 package com.zd.alg.smartlock.mapper;
 
-import com.zd.alg.smartlock.domain.SlUserRelation;
+
+import com.zd.algorithm.api.smartlock.entity.SlUserRelation;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/ISlApplyApprovalService.java

@@ -1,6 +1,7 @@
 package com.zd.alg.smartlock.service;
 
-import com.zd.alg.smartlock.domain.SlApplyApproval;
+
+import com.zd.algorithm.api.smartlock.entity.SlApplyApproval;
 
 import java.util.List;
 import java.util.Map;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/ISlOpendoorApplyService.java

@@ -1,7 +1,8 @@
 package com.zd.alg.smartlock.service;
 
-import com.zd.alg.smartlock.domain.SlOpendoorApply;
-import com.zd.alg.smartlock.domain.vo.SlOpendoorApplyVo;
+
+import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
+import com.zd.algorithm.api.smartlock.entity.vo.SlOpendoorApplyVo;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/ISlSubjectRelationService.java

@@ -1,7 +1,8 @@
 package com.zd.alg.smartlock.service;
 
-import com.zd.alg.smartlock.domain.SlSubjectRelation;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
+
+import com.zd.algorithm.api.smartlock.entity.SlSubjectRelation;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlApplyApprovalServiceImpl.java

@@ -1,14 +1,14 @@
 package com.zd.alg.smartlock.service.impl;
 
-import com.zd.alg.smartlock.domain.SlApplyApproval;
-import com.zd.alg.smartlock.domain.SlOpendoorApply;
-import com.zd.alg.smartlock.domain.api.SlUser;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
 import com.zd.alg.smartlock.mapper.SlApplyApprovalMapper;
 import com.zd.alg.smartlock.mapper.SlOpendoorApplyMapper;
 import com.zd.alg.smartlock.mapper.SlSubjectRelationMapper;
 import com.zd.alg.smartlock.service.ISlApplyApprovalService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
+import com.zd.algorithm.api.smartlock.entity.SlApplyApproval;
+import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
+import com.zd.algorithm.api.smartlock.entity.api.SlUser;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 import com.zd.common.core.domain.R;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.security.service.TokenService;
@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.*;
 
 /**

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlOpendoorApplyServiceImpl.java

@@ -1,13 +1,14 @@
 package com.zd.alg.smartlock.service.impl;
 
-import com.zd.alg.smartlock.domain.SlOpendoorApply;
-import com.zd.alg.smartlock.domain.api.SlUser;
-import com.zd.alg.smartlock.domain.vo.SlOpendoorApplyVo;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
+
 import com.zd.alg.smartlock.mapper.SlOpendoorApplyMapper;
 import com.zd.alg.smartlock.mapper.SlSubjectRelationMapper;
 import com.zd.alg.smartlock.service.ISlOpendoorApplyService;
 import com.zd.alg.smartlock.utils.SmartlockUtil;
+import com.zd.algorithm.api.smartlock.entity.SlOpendoorApply;
+import com.zd.algorithm.api.smartlock.entity.api.SlUser;
+import com.zd.algorithm.api.smartlock.entity.vo.SlOpendoorApplyVo;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 import com.zd.common.core.domain.R;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlSubjectRelationServiceImpl.java

@@ -1,9 +1,10 @@
 package com.zd.alg.smartlock.service.impl;
 
-import com.zd.alg.smartlock.domain.SlSubjectRelation;
-import com.zd.alg.smartlock.domain.vo.SlSubjectRelationVo;
+
 import com.zd.alg.smartlock.mapper.SlSubjectRelationMapper;
 import com.zd.alg.smartlock.service.ISlSubjectRelationService;
+import com.zd.algorithm.api.smartlock.entity.SlSubjectRelation;
+import com.zd.algorithm.api.smartlock.entity.vo.SlSubjectRelationVo;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
@@ -12,7 +13,6 @@ import com.zd.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/utils/SmartlockUtil.java

@@ -5,13 +5,13 @@ import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.zd.alg.smartlock.domain.api.*;
+import com.zd.algorithm.api.*;
+import com.zd.algorithm.api.smartlock.entity.api.*;
 import com.zd.common.core.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-
 import java.text.SimpleDateFormat;
 import java.util.*;
 

zd-modules/zd-algorithm/src/main/resources/mapper/alarm/AlarmLogMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.alg.alarm.mapper.AlarmLogMapper">
 
-    <resultMap type="com.zd.alg.alarm.domain.AlarmLog" id="AlarmLogResult">
+    <resultMap type="com.zd.algorithm.api.alarm.entity.AlarmLog" id="AlarmLogResult">
         <result property="id" column="id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -37,7 +37,7 @@
                t.is_back
         from alarm_log as t
     </sql>
-    <select id="selectAlarmLogList" parameterType="com.zd.alg.alarm.domain.AlarmLog" resultMap="AlarmLogResult">
+    <select id="selectAlarmLogList" parameterType="com.zd.algorithm.api.alarm.entity.AlarmLog" resultMap="AlarmLogResult">
         <include refid="selectAlarmLogVo"/>
         <where>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
@@ -54,13 +54,13 @@
     </select>
 
 
-    <select id="selectNoBackAlarmLogList" resultType="com.zd.alg.alarm.domain.AlarmLog">
+    <select id="selectNoBackAlarmLogList" resultType="com.zd.algorithm.api.alarm.entity.AlarmLog">
         <include refid="selectAlarmLogVo"/>
         where is_back &lt; #{retryCount} and status = "失败"
         having TIMESTAMPDIFF(minute,create_time,#{date}) &lt; 30
     </select>
 
-    <insert id="insertAlarmLog" parameterType="com.zd.alg.alarm.domain.AlarmLog" useGeneratedKeys="true"
+    <insert id="insertAlarmLog" parameterType="com.zd.algorithm.api.alarm.entity.AlarmLog" useGeneratedKeys="true"
             keyProperty="id">
         insert into alarm_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -90,7 +90,7 @@
         </trim>
     </insert>
 
-    <update id="updateAlarmLog" parameterType="com.zd.alg.alarm.domain.AlarmLog">
+    <update id="updateAlarmLog" parameterType="com.zd.algorithm.api.alarm.entity.AlarmLog">
         update alarm_log
         <trim prefix="SET" suffixOverrides=",">
             <if test="createTime != null">create_time = #{createTime},</if>

zd-modules/zd-algorithm/src/main/resources/mapper/smartlock/SlUserRelationMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.alg.smartlock.mapper.SlUserRelationMapper">
 
-    <resultMap type="com.zd.alg.smartlock.domain.SlUserRelation" id="SlUserRelationResult">
+    <resultMap type="com.zd.algorithm.api.smartlock.entity.SlUserRelation" id="SlUserRelationResult">
         <result property="id" column="id"/>
         <result property="userId" column="user_id"/>
         <result property="userName" column="user_name"/>
@@ -40,7 +40,7 @@
                t.creat_time
         from sl_user_relation as t
     </sql>
-    <select id="selectSlUserRelationList" parameterType="com.zd.alg.smartlock.domain.SlUserRelation"
+    <select id="selectSlUserRelationList" parameterType="com.zd.algorithm.api.smartlock.entity.SlUserRelation"
             resultMap="SlUserRelationResult">
         <include refid="selectSlUserRelationVo"/>
         <where>
@@ -66,7 +66,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertSlUserRelation" parameterType="com.zd.alg.smartlock.domain.SlUserRelation" useGeneratedKeys="true"
+    <insert id="insertSlUserRelation" parameterType="com.zd.algorithm.api.smartlock.entity.SlUserRelation" useGeneratedKeys="true"
             keyProperty="id">
         insert into sl_user_relation
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -99,7 +99,7 @@
         </trim>
     </insert>
 
-    <update id="updateSlUserRelation" parameterType="com.zd.alg.smartlock.domain.SlUserRelation">
+    <update id="updateSlUserRelation" parameterType="com.zd.algorithm.api.smartlock.entity.SlUserRelation">
         update sl_user_relation
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>

zd-modules/zd-base/pom.xml

@@ -56,6 +56,11 @@
             <artifactId>zd-exam-api</artifactId>
             <version>3.1.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.zd.chemical</groupId>
+            <artifactId>zd-chemical-api</artifactId>
+        </dependency>
         <!-- zd Common DataSource -->
         <!--<dependency>
             <groupId>com.zd</groupId>

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

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

zd-modules/zd-base/src/main/java/com/zd/base/job/task/ChemicalTask.java

@@ -1,5 +1,6 @@
 package com.zd.base.job.task;
 
+import com.zd.chemical.api.fegin.RemoteStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

zd-modules/zd-base/src/main/java/com/zd/base/job/task/ExamTask.java

@@ -2,7 +2,7 @@ package com.zd.base.job.task;
 
 
 import com.zd.exam.api.feign.RemoteExamService;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.HashMap;

zd-modules/zd-base/src/main/java/com/zd/base/job/task/FileViewTask.java

@@ -5,7 +5,7 @@ import com.zd.base.api.feign.RemoteKkFileService;
 import com.zd.common.core.redis.RedisService;
 import com.zd.exam.api.entity.ElResources;
 import com.zd.exam.api.feign.RemoteExamService;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -8,7 +8,7 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import com.zd.model.domain.ResultData;
 import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;

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

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