新算法项目 依赖管理

pom.xml

@@ -319,6 +319,13 @@
             </dependency>
 
             <dependency>
+                <groupId>com.zd.mqtt</groupId>
+                <artifactId>common-mqtt</artifactId>
+                <version>${zd.version}</version>
+            </dependency>
+
+
+            <dependency>
                 <groupId>com.zd.swagger</groupId>
                 <artifactId>common-swagger</artifactId>
                 <version>${zd.version}</version>

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/Control.java

@@ -5,7 +5,7 @@ package com.zd.laboratory.api.entity;
  * @Date: 2021/09/27/16:09
  * @Description:
  */
-public class Control {
+public class ControlEntity {
 
     /**
      * 命令

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/FunctionStatus.java

@@ -32,7 +32,7 @@ public class FunctionStatus extends BasicFunctionStatus {
     private Boolean defaultStatus = false;
 
     @ApiModelProperty("命令类型")
-    private Control.CommTypeEnums commTypeEnums;
+    private ControlEntity.CommTypeEnums commTypeEnums;
 
 //    @ApiModelProperty("继电器编码")
 //    private String relayCode;
@@ -45,11 +45,11 @@ public class FunctionStatus extends BasicFunctionStatus {
 //        this.relayCode = relayCode;
 //    }
 
-    public Control.CommTypeEnums getCommTypeEnums() {
+    public ControlEntity.CommTypeEnums getCommTypeEnums() {
         return commTypeEnums;
     }
 
-    public void setCommTypeEnums(Control.CommTypeEnums commTypeEnums) {
+    public void setCommTypeEnums(ControlEntity.CommTypeEnums commTypeEnums) {
         this.commTypeEnums = commTypeEnums;
     }
 

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/LabSubjectControllerVO.java

@@ -3,7 +3,7 @@ package com.zd.laboratory.api.entity;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.zd.laboratory.api.vo.HardwareCVO;
-import com.zd.laboratory.api.vo.LabRiskPlanVO;
+import com.zd.laboratory.api.vo.LabRiskVO;
 import com.zd.laboratory.api.vo.SenseValVO;
 import com.zd.model.enums.HazardTypeEnum;
 import io.swagger.annotations.ApiModel;
@@ -18,7 +18,7 @@ import java.util.List;
  * @Description:
  */
 @ApiModel("实验室管理vo")
-public class LabSubjectControllerVO extends LabSubject {
+public class LabSubjectControllerVO extends LabSubjectEntity {
 
     @ApiModelProperty("所属部门名称")
     private String subordinateDeptName;
@@ -62,7 +62,7 @@ public class LabSubjectControllerVO extends LabSubject {
     private List<LabHazardSubVO> hazardList;
 
     @ApiModelProperty("预案数据")
-    private List<LabRiskPlanVO> riskPlanList;
+    private List<LabRiskVO> riskPlanList;
 
     /**
      * 实验室类型ID
@@ -387,14 +387,6 @@ public class LabSubjectControllerVO extends LabSubject {
         this.hazardList = hazardList;
     }
 
-    public List<LabRiskPlanVO> getRiskPlanList() {
-        return riskPlanList;
-    }
-
-    public void setRiskPlanList(List<LabRiskPlanVO> riskPlanList) {
-        this.riskPlanList = riskPlanList;
-    }
-
     public Long getMoldId() {
         return moldId;
     }
@@ -418,4 +410,12 @@ public class LabSubjectControllerVO extends LabSubject {
     public void setSafeUserNameAdminPhone(String safeUserNameAdminPhone) {
         this.safeUserNameAdminPhone = safeUserNameAdminPhone;
     }
+
+    public List<LabRiskVO> getRiskPlanList() {
+        return riskPlanList;
+    }
+
+    public void setRiskPlanList(List<LabRiskVO> riskPlanList) {
+        this.riskPlanList = riskPlanList;
+    }
 }

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/LabSubject.java

@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author zd
  * @date 2021-08-30
  */
-public class LabSubject extends BaseEntity {
+public class LabSubjectEntity extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/LabSubjectVO.java

@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Description:
  */
 @ApiModel("实验室管理类")
-public class LabSubjectVO extends LabSubject {
+public class LabSubjectEntityVO extends LabSubjectEntity {
 
     @ApiModelProperty("楼层名称")
     private String buildName;

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

@@ -2,7 +2,7 @@ package com.zd.laboratory.api.feign;
 
 import com.zd.laboratory.api.entity.LabGradeManageRecord;
 import com.zd.laboratory.api.entity.LabMessageContent;
-import com.zd.laboratory.api.entity.LabSubjectVO;
+import com.zd.laboratory.api.entity.LabSubjectEntityVO;
 import com.zd.model.entity.RemoteLabHardware;
 import com.zd.laboratory.api.feign.fallback.RemoteLaboratoryFallbackFactory;
 import com.zd.laboratory.api.vo.LabGradeManageWorkVO;
@@ -36,7 +36,7 @@ public interface RemoteLaboratoryService {
 
     @ApiOperation(value = "批量获取管理实验室数量-根据用户IDS")
     @GetMapping(value = "/subject/count/{ids}")
-    public R<List<LabSubjectVO>> getInfoByUserIds(@PathVariable("ids") String ids);
+    public R<List<LabSubjectEntityVO>> getInfoByUserIds(@PathVariable("ids") String ids);
 
     @ApiOperation(value = "新增随手拍记录")
     @PostMapping("/photonote")

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

@@ -3,7 +3,7 @@ package com.zd.laboratory.api.feign;
 
 import com.zd.laboratory.api.entity.CabinetLock;
 import com.zd.laboratory.api.entity.CabinetV2Lock;
-import com.zd.laboratory.api.entity.LabSubject;
+import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.api.feign.fallback.RemoteSubQueryFallbackFactory;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.R;
@@ -46,10 +46,10 @@ public interface RemoteSubQueryService {
     R<Map<String,Object>> querySubCListVO();
 
     @PostMapping("/subject/manger/V2/list/ids")
-    R<List<LabSubject>> listByIds(@RequestBody List<Long> ids);
+    R<List<LabSubjectEntity>> listByIds(@RequestBody List<Long> ids);
 
     @GetMapping("/subject/manger/V2/list/name")
-    R<List<LabSubject>> listByName(@RequestParam("name") String name);
+    R<List<LabSubjectEntity>> listByName(@RequestParam("name") String name);
 
     @PostMapping("/device/remote/cabinetLock")
     R cabinetLock(@RequestBody @Valid CabinetLock cabinetLock);

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteLaboratoryFallbackFactory.java

@@ -2,7 +2,7 @@ package com.zd.laboratory.api.feign.fallback;
 
 import com.zd.laboratory.api.entity.LabGradeManageRecord;
 import com.zd.laboratory.api.entity.LabMessageContent;
-import com.zd.laboratory.api.entity.LabSubjectVO;
+import com.zd.laboratory.api.entity.LabSubjectEntityVO;
 import com.zd.model.entity.RemoteLabHardware;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.laboratory.api.vo.LabGradeManageWorkVO;
@@ -33,7 +33,7 @@ public class RemoteLaboratoryFallbackFactory implements FallbackFactory<RemoteLa
         log.error("实验室服务调用失败:{}", cause.getMessage());
         return new RemoteLaboratoryService() {
             @Override
-            public R<List<LabSubjectVO>> getInfoByUserIds(String ids) {
+            public R<List<LabSubjectEntityVO>> getInfoByUserIds(String ids) {
                 return R.fail("获取负责人实验室数据失败:" + cause.getMessage());
             }
 

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteSubQueryFallbackFactory.java

@@ -2,7 +2,7 @@ package com.zd.laboratory.api.feign.fallback;
 
 import com.zd.laboratory.api.entity.CabinetLock;
 import com.zd.laboratory.api.entity.CabinetV2Lock;
-import com.zd.laboratory.api.entity.LabSubject;
+import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.api.feign.RemoteSubQueryService;
 import com.zd.model.domain.R;
 import com.zd.model.entity.SubQueryConfig;
@@ -49,12 +49,12 @@ public class RemoteSubQueryFallbackFactory implements FallbackFactory<RemoteSubQ
             }
 
             @Override
-            public R<List<LabSubject>> listByIds(List<Long> ids) {
+            public R<List<LabSubjectEntity>> listByIds(List<Long> ids) {
                 return R.fail("查询管理实验室失败:" + cause.getMessage());
             }
 
             @Override
-            public R<List<LabSubject>> listByName(String name) {
+            public R<List<LabSubjectEntity>> listByName(String name) {
                 return R.fail("查询管理实验室失败:" + cause.getMessage());
             }
 

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

@@ -1,6 +1,6 @@
 package com.zd.laboratory.api.vo;
 
-import com.zd.laboratory.api.entity.Control;
+import com.zd.laboratory.api.entity.ControlEntity;
 import com.zd.laboratory.api.entity.FunctionStatus;
 import com.zd.model.entity.BaseHardware;
 import com.zd.model.entity.HardwareType;
@@ -21,7 +21,7 @@ public class HardwareCVO extends BaseHardware {
     HardwareTypeEnum hardwareTypeEnum;
 
     @ApiModelProperty("开关状态")
-    Control.SwitchEnums switchEnums;
+    ControlEntity.SwitchEnums switchEnums;
 
     /**
      * 设备功能状态-当前状态
@@ -46,11 +46,11 @@ public class HardwareCVO extends BaseHardware {
     }
 
 
-    public Control.SwitchEnums getSwitchEnums() {
+    public ControlEntity.SwitchEnums getSwitchEnums() {
         return switchEnums;
     }
 
-    public void setSwitchEnums(Control.SwitchEnums switchEnums) {
+    public void setSwitchEnums(ControlEntity.SwitchEnums switchEnums) {
         this.switchEnums = switchEnums;
     }
 

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
-public class LabRiskPlanVO {
+public class LabRiskVO {
 
 
     @ApiModelProperty(value = "预案名称")

zd-common/common-swagger/src/main/java/com/zd/common/swagger/annotation/EnableCustomSwagger2.java

@@ -1,21 +0,0 @@
-package com.zd.common.swagger.annotation;//package com.zd.common.swagger.annotation;
-//
-//import java.lang.annotation.Documented;
-//import java.lang.annotation.ElementType;
-//import java.lang.annotation.Inherited;
-//import java.lang.annotation.Retention;
-//import java.lang.annotation.RetentionPolicy;
-//import java.lang.annotation.Target;
-//
-//import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-//import springfox.documentation.swagger2.annotations.EnableSwagger2;
-//
-//@Target({ElementType.TYPE})
-//@Retention(RetentionPolicy.RUNTIME)
-//@Documented
-//@Inherited
-//@EnableKnife4j
-//@EnableSwagger2
-//public @interface EnableCustomSwagger2 {
-//
-//}

zd-modules/zd-algorithm/pom.xml

@@ -38,7 +38,7 @@
         </dependency>
 
         <!-- zd Common DataSource -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datasource</artifactId>
             <exclusions>
@@ -49,7 +49,7 @@
             </exclusions>
         </dependency>
 
-        <!-- zd Common Log -->
+        &lt;!&ndash; zd Common Log &ndash;&gt;
         <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-log</artifactId>
@@ -57,11 +57,11 @@
         <dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-datascope</artifactId>
-        </dependency>
-        <dependency>
+        </dependency>-->
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-mqtt</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!--mqtt客户端链接服务-->
         <dependency>
@@ -85,10 +85,10 @@
         </dependency>
 
         <!-- zd Common Swagger -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-common-swagger</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- 人脸对接  -->
         <dependency>
@@ -139,11 +139,11 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/libs/reader.jar</systemPath>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.zd</groupId>
             <artifactId>zd-bottle-api</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
 
         <!--反向代理-->
         <dependency>
@@ -175,6 +175,16 @@
             <groupId>com.zd.algorithm</groupId>
             <artifactId>zd-algorithm-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.zd.core</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zd.mqtt</groupId>
+            <artifactId>common-mqtt</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -195,15 +205,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 打包时跳过test插件，不运行test测试用例 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

zd-modules/zd-algorithm/src/main/java/com/zd/alg/AlgorithmApplication.java

@@ -3,21 +3,17 @@ package com.zd.alg;
 
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.properties.FireProperties;
-import com.zd.common.core.constant.Constants;
-import com.zd.common.security.annotation.EnableCustomConfig;
-import com.zd.common.security.annotation.EnableRyFeignClients;
-import com.zd.model.constant.ApplicationConstants;
+import com.zd.common.core.annotation.EnableCustomConfig;
+import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.mqtt.model.MqttProperties;
+import com.zd.model.constant.Constants;
 import lombok.extern.slf4j.Slf4j;
-import org.mybatis.spring.annotation.MapperScan;
-import org.mybatis.spring.annotation.MapperScans;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
-import zd.common.mqtt.config.MqttProperties;
 
 @ServletComponentScan("com.zd.alg.iot.vmp.conf")
 @EnableFeignClients(basePackages = Constants.BASE_PACKAGE)

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

@@ -3,16 +3,16 @@ package com.zd.alg.alarm.controller;
 
 import com.zd.alg.alarm.service.IAlarmLogService;
 import com.zd.alg.alarm.utils.AlarmUtil;
+import com.zd.algorithm.api.alarm.entity.AlarmEntrty;
 import com.zd.algorithm.api.alarm.entity.AlarmLog;
+import com.zd.algorithm.api.alarm.entity.SendTypes;
+import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.security.annotation.PreAuthorize;
+import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
-import com.zd.system.api.alarm.domain.AlarmEntrty;
-import com.zd.system.api.alarm.domain.SendTypes;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -5,11 +5,11 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.alg.alarm.service.IAlarmLogService;
+import com.zd.algorithm.api.alarm.entity.AlarmEntrty;
 import com.zd.algorithm.api.alarm.entity.AlarmLog;
+import com.zd.algorithm.api.alarm.entity.Routes;
+import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.common.core.utils.DateUtils;
-import com.zd.system.api.alarm.domain.AlarmEntrty;
-import com.zd.system.api.alarm.domain.Routes;
-import com.zd.system.api.alarm.domain.SendTypes;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +18,7 @@ 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/face/controller/FaceApi.java

@@ -3,20 +3,17 @@ package com.zd.alg.face.controller;
 import com.arcsoft.face.FaceFeature;
 import com.arcsoft.face.FaceInfo;
 import com.arcsoft.face.toolkit.ImageInfo;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.web.domain.ResultData;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.alg.face.service.FaceService;
 import com.zd.alg.face.utils.FileUtil;
-import com.zd.system.api.domain.LabStudentsInfo;
-import com.zd.system.api.face.FaceCompare;
-import com.zd.system.api.students.RemoteStudentsService;
+import com.zd.algorithm.api.face.feign.FaceCompare;
+import com.zd.model.domain.ResultData;
+import com.zd.system.api.entity.LabStudentsInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.*;
 import java.util.List;
 
@@ -63,7 +60,7 @@ public class FaceApi {
      */
     @ApiOperation("人脸比较")
     @PostMapping("/compare")
-    public ResultData faceDetection(@RequestBody  FaceCompare faceCompare)
+    public ResultData faceDetection(@RequestBody FaceCompare faceCompare)
     {
 
         R<LabStudentsInfo> info = remoteStudentsService.getInfo(faceCompare.getUserId());

zd-modules/zd-algorithm/src/main/java/com/zd/alg/face/controller/FaceManagerApi.java

@@ -2,13 +2,11 @@ package com.zd.alg.face.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.IdUtils;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.alg.face.config.FaceProperties;
 import com.zd.alg.face.handle.FaceEngineFactory;
+import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.utils.IdUtils;
+import com.zd.model.domain.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/controller/AlarmPhotoController.java

@@ -1,12 +1,10 @@
 package com.zd.alg.forward.controller;
 
 
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.alg.forward.serivce.ImageService;
-import com.zd.system.api.domain.SysFile;
+import com.zd.common.core.exception.ServiceException;
+import com.zd.model.domain.R;
+import com.zd.model.entity.SysFile;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/controller/SignInCheckController.java

@@ -1,20 +1,16 @@
 package com.zd.alg.forward.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.domain.VideoRequestData;
 import com.zd.alg.forward.serivce.CheckService;
 import com.zd.alg.forward.serivce.FireImageService;
 import com.zd.alg.forward.serivce.SendSginAccessLogService;
 import com.zd.alg.forward.serivce.VideoCheckResultValidImpl;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.domain.Result;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.Assert;
-import com.zd.common.redis.service.RedisService;
-import com.zd.common.swagger.config.Knife4jConfiguration;
-import com.zd.system.api.domain.Algorithm;
+import com.zd.model.domain.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/CheckResultValid.java

@@ -1,6 +1,7 @@
 package com.zd.alg.forward.serivce;
 
-import com.zd.common.core.domain.R;
+
+import com.zd.model.domain.R;
 
 import java.util.Map;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/CheckService.java

@@ -4,30 +4,23 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.zd.alg.forward.utils.Base64DecodedMultipartFile;
-import com.zd.alg.forward.utils.FileUploadUtils;
-import com.zd.alg.forward.utils.HttpUtils;
-import com.zd.common.core.constant.Constants;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.ServletUtils;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.redis.service.RedisService;
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.domain.AnalysisData;
 import com.zd.alg.forward.domain.DataPostAnalysisRespDto;
 import com.zd.alg.forward.domain.ImgPostResponse;
 import com.zd.alg.forward.domain.VideoRequestData;
 import com.zd.alg.forward.serivce.mqtt.CommonSend;
-import com.zd.system.api.RemoteFileService;
-import com.zd.system.api.alarm.RemoteAlarmService;
-import com.zd.system.api.alarm.domain.AlarmEntrty;
-import com.zd.system.api.alarm.domain.Routes;
-import com.zd.system.api.alarm.domain.SendTypes;
-import com.zd.system.api.domain.Algorithm;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.laboratory.RemoteLaboratoryService;
+import com.zd.alg.forward.utils.Base64DecodedMultipartFile;
+import com.zd.alg.forward.utils.FileUploadUtils;
+import com.zd.alg.forward.utils.HttpUtils;
+import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
+import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.redis.RedisService;
+import com.zd.common.core.utils.ServletUtils;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.common.mqtt.model.MessageBody;
+import com.zd.model.constant.Constants;
+import com.zd.model.domain.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +35,6 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
-import zd.common.mqtt.config.MessageBody;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -50,6 +42,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
+
 import static com.zd.alg.forward.utils.HttpUtils.*;
 
 @Service

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/ImageService.java

@@ -2,11 +2,9 @@ package com.zd.alg.forward.serivce;
 
 
 import com.zd.alg.forward.utils.VideoUtils;
-import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.domain.R;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.system.api.RemoteFileService;
-import com.zd.system.api.domain.SysFile;
+import com.zd.model.constant.HttpStatus;
+import com.zd.model.entity.SysFile;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;
 import org.bytedeco.javacv.FFmpegFrameGrabber;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/SendSginAccessLogService.java

@@ -3,15 +3,9 @@ package com.zd.alg.forward.serivce;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.alg.forward.properties.FireProperties;
 import com.zd.model.constant.HttpStatus;
-import com.zd.common.core.constant.SecurityConstants;
-import com.zd.common.core.domain.R;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.domain.VideoRequestData;
-import com.zd.system.api.domain.Algorithm;
-import com.zd.system.api.domain.PlayVo;
-import com.zd.system.api.speak.RemoteSpeakService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/VideoCheckResultValid.java

@@ -1,6 +1,7 @@
 package com.zd.alg.forward.serivce;
 
-import com.zd.common.core.domain.R;
+
+import com.zd.model.domain.R;
 
 import java.util.Map;
 
@@ -13,5 +14,5 @@ import java.util.Map;
 @FunctionalInterface
 public interface VideoCheckResultValid {
 
-    R apply(Map<String,Object>  map,Long subId);
+    R apply(Map<String,Object>  map, Long subId);
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/VideoCheckResultValidImpl.java

@@ -1,6 +1,6 @@
 package com.zd.alg.forward.serivce;
 
-import com.zd.common.core.domain.R;
+import com.zd.model.domain.R;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/mqtt/CommonSend.java

@@ -1,10 +1,10 @@
 package com.zd.alg.forward.serivce.mqtt;
 
 import com.alibaba.fastjson.JSON;
+import com.zd.common.mqtt.model.MessageBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
-import zd.common.mqtt.config.MessageBody;
 
 /**
  * 公用发送类

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

@@ -12,12 +12,12 @@ 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;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.datascope.annotation.DataScope;
-import com.zd.common.security.service.TokenService;
+import com.zd.model.entity.SysUser;
 import com.zd.system.api.RemoteUserService;
 import com.zd.system.api.chemical.RemoteStockService;
-import com.zd.system.api.domain.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/bigview/BigViewController.java

@@ -1,7 +1,7 @@
 package com.zd.laboratory.controller.bigview;
 
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.laboratory.api.entity.LabSubject;
+import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.api.entity.LabSubjectControllerVO;
 import com.zd.laboratory.domain.bigview.HardwareState;
 import com.zd.laboratory.domain.bigview.HazardTotal;
@@ -137,10 +137,10 @@ public class BigViewController extends BaseController {
         if(params.get("pageNum") != null && params.get("pageSize") != null){
             startPage();
         }
-        List<com.zd.laboratory.api.entity.LabSubject> list = bigViewService.querySubOnline(params);
+        List<LabSubjectEntity> list = bigViewService.querySubOnline(params);
 
         long allNum = 0;
-        for (LabSubject sub : list) {
+        for (LabSubjectEntity sub : list) {
             allNum += Optional.ofNullable(sub.getOnline()).orElse(0L);
         }
 

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

@@ -1,5 +1,6 @@
 package com.zd.laboratory.mapper;
 
+import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.bigview.HardwareState;
 import com.zd.laboratory.domain.bigview.HazardTotal;
@@ -52,7 +53,7 @@ public interface LabHardwareStateMapper {
      *
      * @return
      */
-    List<com.zd.laboratory.api.entity.LabSubject> querySubOnline(Map<String, Object> params);
+    List<LabSubjectEntity> querySubOnline(Map<String, Object> params);
 
 
     /**

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

@@ -69,5 +69,5 @@ public interface LabRiskPlanMapper {
      * 查询实验室详情预案统计
      * @param subId 实验室ID
      */
-    List<com.zd.laboratory.api.vo.LabRiskPlanVO> selectRiskPlanCountBySubId(Long subId);
+    List<com.zd.laboratory.api.vo.LabRiskVO> selectRiskPlanCountBySubId(Long subId);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ControlService.java

@@ -1,6 +1,6 @@
 package com.zd.laboratory.service;
 
-import com.zd.laboratory.api.entity.Control;
+import com.zd.laboratory.api.entity.ControlEntity;
 import com.zd.laboratory.api.entity.FunctionStatus;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.model.domain.ResultData;
@@ -15,5 +15,5 @@ public interface ControlService {
     ResultData execution(LabHardware labHardware, FunctionStatus functionStatus);
 
 
-    Control.CommTypeEnums comTypeEnums();
+    ControlEntity.CommTypeEnums comTypeEnums();
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/BigViewServiceImpl.java

@@ -3,6 +3,7 @@ package com.zd.laboratory.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.utils.DictUtils;
+import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.api.entity.LabSubjectControllerVO;
 import com.zd.laboratory.api.entity.SubAddrr;
 import com.zd.laboratory.domain.LabSubject;
@@ -107,13 +108,13 @@ public class BigViewServiceImpl {
      * 实验室在线人数
      * @return
      */
-    public List<com.zd.laboratory.api.entity.LabSubject> querySubOnline(Map<String, Object> params)
+    public List<LabSubjectEntity> querySubOnline(Map<String, Object> params)
     {
 
-        List<com.zd.laboratory.api.entity.LabSubject> labSubjects = hardwareStateMapper.querySubOnline(params);
+        List<LabSubjectEntity> labSubjectEntities = hardwareStateMapper.querySubOnline(params);
 
         //2.1.获取详细地址后面做(已完成)
-        Long[] layoutIds = labSubjects.stream().map(a -> a.getLayoutId()).filter(a -> a != null).toArray(Long[]::new);
+        Long[] layoutIds = labSubjectEntities.stream().map(a -> a.getLayoutId()).filter(a -> a != null).toArray(Long[]::new);
         List<SubAddrr> subAddrrs = subjectLayoutService.selectAddrrByLayoutIds(layoutIds);
 
         Map<Long, SubAddrr> subAddrrMap = Optional.ofNullable(subAddrrs)
@@ -132,7 +133,7 @@ public class BigViewServiceImpl {
                 })
                 .collect(Collectors.toList());*/
 
-        labSubjects.forEach(sub -> {
+        labSubjectEntities.forEach(sub -> {
             sub.setAddress(Optional.ofNullable(subAddrrMap.get(sub.getLayoutId())).map(SubAddrr::addrrPlus).orElse(StrUtil.EMPTY));
             // subDept 实验室分类
             sub.setSubDept(DictUtils.getDictCacheLable("subject_class",sub.getSubDept()));
@@ -142,7 +143,7 @@ public class BigViewServiceImpl {
         });
 
 
-        return labSubjects;
+        return labSubjectEntities;
 
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabHardwareServiceImpl.java

@@ -8,7 +8,7 @@ import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.StringUtils;
-import com.zd.laboratory.api.entity.Control;
+import com.zd.laboratory.api.entity.ControlEntity;
 import com.zd.laboratory.api.entity.FunctionStatus;
 import com.zd.laboratory.config.HardwareFunctionStatusConfig;
 import com.zd.laboratory.domain.LabHardware;
@@ -204,12 +204,12 @@ public class LabHardwareServiceImpl implements ILabHardwareService {
             //初始化开关状态 (开关类型)
             if((HardwareTypeEnum.SWITCH.equals(labHardware.getType()) || (HardwareTypeEnum.AI_VENTILATION.equals(labHardware.getType()))&&StrUtil.isNotBlank(labHardware.getRelayCode())&&!labHardware.getBit().equals(Integer.parseInt("-1"))))
             {
-                Map<Integer, Control.SwitchEnums> switchEnums = socketService.getSwitchEnums(labHardware.getRelayCode());
+                Map<Integer, ControlEntity.SwitchEnums> switchEnums = socketService.getSwitchEnums(labHardware.getRelayCode());
                 if(switchEnums!=null)
                 {
-                    Control.SwitchEnums switchEnums1 = switchEnums.get(labHardware.getBit());
+                    ControlEntity.SwitchEnums switchEnums1 = switchEnums.get(labHardware.getBit());
                     //这里直接更新状态，因为抛出去如果当前事务没结束，就查询不到该数据进行修改
-                    HardwareOperate hardwareOperate = Control.SwitchEnums.ON.equals(switchEnums1)?HardwareOperate.OPEN:HardwareOperate.CLOSE;
+                    HardwareOperate hardwareOperate = ControlEntity.SwitchEnums.ON.equals(switchEnums1)?HardwareOperate.OPEN:HardwareOperate.CLOSE;
                     labHardware.setOperate(hardwareOperate);
                 }
             }
@@ -285,12 +285,12 @@ public class LabHardwareServiceImpl implements ILabHardwareService {
                 //否则如果和之前配置不一样,一样则不管
                 if(!labHardware.getRelayCode().equals(old.getRelayCode())||!labHardware.getBit().equals(old.getBit()))
                 {
-                    Map<Integer, Control.SwitchEnums> switchEnums = socketService.getSwitchEnums(labHardware.getRelayCode());
+                    Map<Integer, ControlEntity.SwitchEnums> switchEnums = socketService.getSwitchEnums(labHardware.getRelayCode());
                     if(switchEnums!=null)
                     {
-                        Control.SwitchEnums switchEnums1 = switchEnums.get(labHardware.getBit());
+                        ControlEntity.SwitchEnums switchEnums1 = switchEnums.get(labHardware.getBit());
                         //这里直接更新状态，因为抛出去如果当前事务没结束，就查询不到该数据进行修改
-                        HardwareOperate hardwareOperate = Control.SwitchEnums.ON.equals(switchEnums1)?HardwareOperate.OPEN:HardwareOperate.CLOSE;
+                        HardwareOperate hardwareOperate = ControlEntity.SwitchEnums.ON.equals(switchEnums1)?HardwareOperate.OPEN:HardwareOperate.CLOSE;
                         labHardware.setOperate(hardwareOperate);
                     }else
                     {
@@ -378,12 +378,12 @@ public class LabHardwareServiceImpl implements ILabHardwareService {
                 //否则如果和之前配置不一样,一样则不管
                 if(!labHardware.getRelayCode().equals(old.getRelayCode())||!labHardware.getBit().equals(old.getBit()))
                 {
-                    Map<Integer, Control.SwitchEnums> switchEnums = socketService.getSwitchEnums(labHardware.getRelayCode());
+                    Map<Integer, ControlEntity.SwitchEnums> switchEnums = socketService.getSwitchEnums(labHardware.getRelayCode());
                     if(switchEnums!=null)
                     {
-                        Control.SwitchEnums switchEnums1 = switchEnums.get(labHardware.getBit());
+                        ControlEntity.SwitchEnums switchEnums1 = switchEnums.get(labHardware.getBit());
                         //这里直接更新状态，因为抛出去如果当前事务没结束，就查询不到该数据进行修改
-                        HardwareOperate hardwareOperate = Control.SwitchEnums.ON.equals(switchEnums1)?HardwareOperate.OPEN:HardwareOperate.CLOSE;
+                        HardwareOperate hardwareOperate = ControlEntity.SwitchEnums.ON.equals(switchEnums1)?HardwareOperate.OPEN:HardwareOperate.CLOSE;
                         labHardware.setOperate(hardwareOperate);
                     }else
                     {
@@ -512,11 +512,11 @@ public class LabHardwareServiceImpl implements ILabHardwareService {
             //如果是上线
             LabHardware labHardware = new LabHardware();
             labHardware.setRelayCode(equipmentStatus.getNum());
-            Map<Integer, Control.SwitchEnums> switchEnums = socketService.getSwitchEnums(equipmentStatus.getNum());
+            Map<Integer, ControlEntity.SwitchEnums> switchEnums = socketService.getSwitchEnums(equipmentStatus.getNum());
             if(switchEnums!=null)
             {
                 switchEnums.forEach((k,v)->{
-                    labHardware.setOperate(v==Control.SwitchEnums.ON?HardwareOperate.OPEN:HardwareOperate.CLOSE);
+                    labHardware.setOperate(v== ControlEntity.SwitchEnums.ON?HardwareOperate.OPEN:HardwareOperate.CLOSE);
                     labHardware.setBit(k);
                     if(labHardwareMapper.updateLabHardwareRelayCodeStatus(labHardware) == 0){
                         // 疏散指示灯状态更新

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -104,7 +104,7 @@ public class LabSubjectManagerService {
     @Autowired
     private RemoteChemicalService remoteChemicalService;
 
-    private Map<Control.CommTypeEnums, ControlService> controlServiceMap = new HashMap<>();
+    private Map<ControlEntity.CommTypeEnums, ControlService> controlServiceMap = new HashMap<>();
 
     /**
      * 最低危险等级
@@ -1340,33 +1340,33 @@ public class LabSubjectManagerService {
         hardware.setState(a.getOperate() == null ? HardwareOperate.OFFLINE : a.getOperate());
         hardware.setHardwareNUM(a.getHardwareNum());
         //默认不在线
-        hardware.setSwitchEnums(Control.SwitchEnums.NO_ONLINE);
+        hardware.setSwitchEnums(ControlEntity.SwitchEnums.NO_ONLINE);
         //初始化开关状态 (开关类型)
         if (a.getHardwareType() == 2) {
             Integer code=redisService.getCacheObject(CacheConstants.RELAY_STATUS_KEY+a.getId());
             if(null==code){
                 if(null!=a.getOperate() && a.getOperate().getCode()==3){
-                    hardware.setSwitchEnums(Control.SwitchEnums.ON);
+                    hardware.setSwitchEnums(ControlEntity.SwitchEnums.ON);
                 }
                 if(null!=a.getOperate() &&  a.getOperate().getCode()==4){
-                    hardware.setSwitchEnums(Control.SwitchEnums.OFF);
+                    hardware.setSwitchEnums(ControlEntity.SwitchEnums.OFF);
                 }
             }else{
                 //开
                 if(code==3){
-                    hardware.setSwitchEnums(Control.SwitchEnums.ON);
+                    hardware.setSwitchEnums(ControlEntity.SwitchEnums.ON);
                     hardware.setState(HardwareOperate.OPEN);
                 }
                 if(code==4){
-                    hardware.setSwitchEnums(Control.SwitchEnums.OFF);
+                    hardware.setSwitchEnums(ControlEntity.SwitchEnums.OFF);
                     hardware.setState(HardwareOperate.CLOSE);
                 }
             }
         } else {
             if (StrUtil.isNotBlank(a.getRelayCode()) && a.getBit() != null) {
-                Map<Integer, Control.SwitchEnums> switchEnums = socketService.getSwitchEnums(a.getRelayCode());
+                Map<Integer, ControlEntity.SwitchEnums> switchEnums = socketService.getSwitchEnums(a.getRelayCode());
                 if (switchEnums != null) {
-                    Control.SwitchEnums switchEnums1 = switchEnums.get(a.getBit());
+                    ControlEntity.SwitchEnums switchEnums1 = switchEnums.get(a.getBit());
                     hardware.setSwitchEnums(switchEnums1);
                 }
             }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/RelayControlService.java

@@ -1,7 +1,7 @@
 package com.zd.laboratory.service.impl;
 
 
-import com.zd.laboratory.api.entity.Control;
+import com.zd.laboratory.api.entity.ControlEntity;
 import com.zd.laboratory.api.entity.FunctionStatus;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.service.ControlService;
@@ -37,7 +37,7 @@ public class RelayControlService implements ControlService {
     }
 
     @Override
-    public Control.CommTypeEnums comTypeEnums() {
-        return Control.CommTypeEnums.Relay;
+    public ControlEntity.CommTypeEnums comTypeEnums() {
+        return ControlEntity.CommTypeEnums.Relay;
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/SocketService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.zd.common.core.annotation.FunctionMapper;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.SpringUtils;
+import com.zd.laboratory.api.entity.ControlEntity;
 import com.zd.laboratory.domain.LabRelay;
 import com.zd.laboratory.domain.SensorConfig;
 import com.zd.laboratory.event.SensorStatusEvent;
@@ -424,7 +425,7 @@ public class SocketService {
      * @param relayCode
      * @return
      */
-    public  Map<Integer, com.zd.laboratory.api.entity.Control.SwitchEnums> getSwitchEnums(String relayCode)
+    public  Map<Integer, ControlEntity.SwitchEnums> getSwitchEnums(String relayCode)
     {
         try {
             Map<String, Object> relayData = getRelayData(relayCode);
@@ -437,9 +438,9 @@ public class SocketService {
             }
             char[] chars = reverseBit.toCharArray();
             char a= '0';
-            Map<Integer, com.zd.laboratory.api.entity.Control.SwitchEnums> map = new HashMap<>(chars.length);
+            Map<Integer, ControlEntity.SwitchEnums> map = new HashMap<>(chars.length);
             for (int i = 0; i < chars.length; i++) {
-                map.put(i+1,chars[i]==a? com.zd.laboratory.api.entity.Control.SwitchEnums.OFF: com.zd.laboratory.api.entity.Control.SwitchEnums.ON);
+                map.put(i+1,chars[i]==a? ControlEntity.SwitchEnums.OFF: ControlEntity.SwitchEnums.ON);
             }
             return map;
         } catch (Exception e) {

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

@@ -53,7 +53,7 @@
     </select>
 
 
-    <select id="querySubOnline" resultType="com.zd.laboratory.api.entity.LabSubject" parameterType="map">
+    <select id="querySubOnline" resultType="com.zd.laboratory.api.entity.LabSubjectEntity" parameterType="map">
         select * from
             (
                 SELECT a.*,count(DISTINCT sar.join_user_id) as online from lab_subject a left join lab_subject_access_record sar on sar.subject_id = a.id

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

@@ -195,7 +195,7 @@
         <!--</where>-->
     </select>
     <select id="selectRiskPlanCountBySubId"
-            resultType="com.zd.laboratory.api.vo.LabRiskPlanVO">
+            resultType="com.zd.laboratory.api.vo.LabRiskVO">
         select
             p.name as planName,
             (select count(1) from lab_risk_plan_abnormal_log pl where pl.risk_plan_id = p.id and pl.subject_id = pj.subject_id and pl.risk_status = 1) as planCount,

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/TeacherServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zd.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import com.zd.laboratory.api.entity.LabSubjectVO;
+import com.zd.laboratory.api.entity.LabSubjectEntityVO;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.domain.R;
 import com.zd.model.entity.SysUser;
@@ -34,14 +34,14 @@ public class TeacherServiceImpl {
      */
     public void queryTeacherSuBCount(List<SysUser> list) {
         if (CollUtil.isEmpty(list)) return ;
-        final Map<Long, List<LabSubjectVO>> collect = new HashMap<>();
+        final Map<Long, List<LabSubjectEntityVO>> collect = new HashMap<>();
         if (CollUtil.isNotEmpty(list)) {
             //得到ids
             String ids = list.stream().map(a -> a.getUserId().toString()).collect(Collectors.joining(","));
             //远程获取实验室信息
-            R<List<LabSubjectVO>> infoByUserIds = laboratoryService.getInfoByUserIds(ids);
+            R<List<LabSubjectEntityVO>> infoByUserIds = laboratoryService.getInfoByUserIds(ids);
             if (CollUtil.isNotEmpty(infoByUserIds.getData())) {
-                collect.putAll(infoByUserIds.getData().stream().collect(Collectors.groupingBy(LabSubjectVO::getAdminId)));
+                collect.putAll(infoByUserIds.getData().stream().collect(Collectors.groupingBy(LabSubjectEntityVO::getAdminId)));
             }
         }
         /*list.stream().forEach(a -> {