依赖报错处理

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

@@ -1,24 +1,19 @@
 package com.zd.laboratory.controller;
 
-import com.zd.common.core.constant.HttpStatus;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.common.core.enums.HardwareTypeEnum;
+
+import com.zd.algorithm.api.netty.feign.RemoteNettyService;
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.redis.RedisService;
+import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.bean.TransferUtils;
-import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.utils.TransferUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.redis.service.RedisService;
-import com.zd.common.security.annotation.PreAuthorize;
-import com.zd.common.security.service.TokenService;
+import com.zd.laboratory.api.entity.FunctionStatus;
+import com.zd.laboratory.api.vo.HardwareCVO;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.domain.vo.HxpSmartTerminalByExcel;
 import com.zd.laboratory.domain.vo.LabHardwareVO;
@@ -28,10 +23,16 @@ import com.zd.laboratory.service.ILabSensorService;
 import com.zd.laboratory.service.ILabSubjectService;
 import com.zd.laboratory.service.impl.LabSubjectManagerService;
 import com.zd.laboratory.socket.command.Symbol;
-import com.zd.system.api.laboratory.domain.FunctionStatus;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
-import com.zd.system.api.laboratory.domain.vo.HardwareCVO;
-import com.zd.system.api.netty.RemoteNettyService;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.entity.RemoteLabHardware;
+import com.zd.model.enums.HardwareOperate;
+import com.zd.model.enums.HardwareTypeEnum;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -357,7 +358,7 @@ public class LabHardwareController extends BaseController {
      */
     @RequestMapping("/getHardwareByLockList")
     @ApiOperation(value = "查询化学品机柜管理信息列表")
-    public ResultData <List<LinkedHashMap<String,String>>> getCabinetList(@RequestBody LabHardware labHardware) {
+    public ResultData<List<LinkedHashMap<String,String>>> getCabinetList(@RequestBody LabHardware labHardware) {
         labHardware.setType(HardwareTypeEnum.AI_CABINETLOCK);
         List<LabHardwareVO> list = labHardwareService.selectLabHardwareByCabinetList(labHardware);
         List<LinkedHashMap<String,String>> cabinetList = Optional.ofNullable(list).orElseGet(Collections::emptyList).stream()

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabRiskPlanAbnormalLogMapper.java

@@ -1,5 +1,6 @@
 package com.zd.laboratory.mapper;
 
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
 import com.zd.laboratory.domain.LabRiskPlanAbnormalLog;
 import com.zd.laboratory.domain.vo.LabRiskPlanAbnormalLogVO;
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalLogMapper.xml

@@ -322,7 +322,7 @@
 
     </select>
 
-    <select id="selectNoBackAlarmLogList" resultType="com.zd.laboratory.domain.AlarmLog">
+    <select id="selectNoBackAlarmLogList" resultType="com.zd.algorithm.api.alarm.entity.AlarmLog">
         select * from alarm_log l
         <where>
             <if test="phone != null  and phone != ''"> and l.phone = #{phone}</if>