Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-common/common-core/src/main/java/com/zd/common/core/aspect/ResponseAdvice.java

@@ -2,6 +2,7 @@ package com.zd.common.core.aspect;
 
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.R;
+import com.zd.model.domain.WVPResult;
 import com.zd.model.domain.ResultData;
 import com.zd.model.page.TableDataInfo;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
@@ -12,6 +13,7 @@ import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 import java.util.Map;
@@ -43,7 +45,7 @@ public class ResponseAdvice implements ResponseBodyAdvice<Object> {
 
 
         if(o instanceof TableDataInfo || o instanceof AjaxResult || o instanceof ResultData
-                || o instanceof R || o instanceof String){
+                || o instanceof R || o instanceof String || o instanceof Map || o instanceof WVPResult){
             return o;
         }
 

zd-model/src/main/java/com/zd/model/domain/WVPResult.java

@@ -0,0 +1,32 @@
+package com.zd.model.domain;
+
+public class WVPResult<T> {
+
+    private int code;
+    private String msg;
+    private T data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}

zd-model/src/main/java/com/zd/model/enums/SenseType.java

@@ -37,6 +37,7 @@ public enum SenseType implements BaseEnum<Integer>, HardwareType {
     COCl2(15, "光气", "光气", "icon_22", "ppm"),
     Cl2(16, "氯气", "氯气", "icon_22", "ppm"),
     HCHO(17, "甲醛", "甲醛", "icon_22", "ppm"),
+    INFRA_RED(18, "红外测温仪", "红外测温仪", "icon_16", "℃"),
     ;
     private Integer code;
     private String name;

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

@@ -4,6 +4,7 @@ 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.alg.face.handle.FaceEngineFactory;
 import com.zd.alg.face.service.FaceService;
 import com.zd.alg.face.utils.FileUtil;
 import com.zd.algorithm.api.face.feign.FaceCompare;
@@ -14,6 +15,9 @@ import com.zd.model.domain.R;
 import com.zd.model.domain.ResultData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.flogger.Flogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,6 +37,8 @@ import java.util.List;
 @RequestMapping("/faceApi")
 public class FaceApi {
 
+    Logger logger = LoggerFactory.getLogger(FaceApi.class);
+
     @Autowired
     FaceService faceService;
 
@@ -66,14 +72,15 @@ public class FaceApi {
     @PostMapping("/compare")
     public ResultData faceDetection(@RequestBody FaceCompare faceCompare)
     {
-
+        logger.info("====人脸比较====");
         R<LabStudentsInfo> info = remoteStudentsService.getInfo(faceCompare.getUserId());
         if(info.getCode()==200&&info.getData()!=null)
         {
+            logger.info("====人脸data组装====");
             FaceFeature target = new FaceFeature(info.getData().getFaceFeature());
             FaceFeature source = new FaceFeature(faceCompare.getData());
             Boolean compore = faceService.compore(target, source);
-
+            logger.info("====compore===="+compore);
             return ResultData.result(compore,()->"人脸对比不符！");
         }else
         {

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

@@ -129,23 +129,23 @@ public class CheckService {
                 AlgorithmYml.CheckValid checkValid = algorithmYml.getCheckValid(Integer.valueOf(code));
                 MultiValueMap<String, Object> params = getStringObjectMultiValueMap(checkValid, String.valueOf(id));
                 HttpEntity<MultiValueMap<String, Object>> files = getHttpEntityMap(toFile, params);
-                //logger.info("===============4=================");
+                logger.info("===============4=================");
                 ImgPostResponse<AnalysisReturnData> send = HttpUtils.sendV5(restTemplateLocal, files, algorithmYml);
                 if (send == null || send.getStatus_code() != 1000) {
                     assert send != null;
-                    //logger.error("==================4.1==================="+send.getStatus_code()+"==========="+send.getMessage());
+                    logger.error("==================4.1==================="+send.getStatus_code()+"==========="+send.getMessage());
                     return R.fail("算法服务错误，请重试！");
                 }
-                //logger.info("===============5=================");
+                logger.info("===============5=================");
                 R algorithm = saveAlgorithmV5(send, checkValid);
                 if (algorithm.getCode() != 200) {
-                    //logger.error("==============="+algorithm.getCode()+"=================");
+                    logger.error("==============="+algorithm.getCode()+"=================");
                     return algorithm;
                 }
-                //logger.info("===============6=================");
+                logger.info("===============6=================");
                 AnalysisReturnData data = send.getData();
                 Map<String, Object> result = (Map<String, Object>) data.getResult();
-                //logger.info("=========================7==============="+result.toString());
+                logger.info("=========================7==============="+result.toString());
                 Map<String, Object> algorithmData = (Map<String, Object>) result.get("algorithm_data");
                 Map<String, Object> modelResult = (Map<String, Object>) result.get("model_data");
                 List<Map<String, Object>> objects = (List<Map<String, Object>>) modelResult.get("objects");

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/service/impl/PlayServiceImpl.java

@@ -12,7 +12,7 @@ import com.zd.alg.iot.vmp.service.bean.SSRCInfo;
 import com.zd.alg.iot.vmp.storager.IRedisCatchStorage;
 import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
 import com.zd.alg.iot.vmp.storager.dao.DeviceChannelMapper;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import com.zd.alg.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
 import com.zd.alg.iot.vmp.common.StreamInfo;
 import com.zd.alg.iot.vmp.gb28181.bean.Device;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/gb28181/alarm/AlarmInfoController.java

@@ -2,7 +2,7 @@ package com.zd.alg.iot.vmp.vmanager.gb28181.alarm;
 
 import com.zd.alg.iot.vmp.gb28181.bean.DeviceAlarm;
 import com.zd.alg.iot.vmp.service.IDeviceAlarmService;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

@@ -3,7 +3,7 @@ package com.zd.alg.iot.vmp.vmanager.gb28181.device;
 import com.zd.alg.iot.vmp.gb28181.bean.DeviceChannel;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.RequestMessage;
 import com.zd.alg.iot.vmp.storager.IRedisCatchStorage;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import com.github.pagehelper.PageInfo;
 import com.zd.alg.iot.vmp.gb28181.event.DeviceOffLineDetector;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/gb28181/media/MediaController.java

@@ -4,7 +4,7 @@ import com.zd.alg.iot.vmp.common.StreamInfo;
 import com.zd.alg.iot.vmp.service.IStreamPushService;
 import com.zd.alg.iot.vmp.service.IMediaService;
 import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -18,8 +18,8 @@ import com.zd.alg.iot.vmp.service.IPlayService;
 import com.zd.alg.iot.vmp.storager.IRedisCatchStorage;
 import com.zd.alg.iot.vmp.storager.IVideoManagerStorager;
 import com.zd.alg.iot.vmp.storager.dao.DeviceChannelMapper;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
 import com.zd.alg.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
+import com.zd.model.domain.WVPResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/log/LogController.java

@@ -3,7 +3,7 @@ package com.zd.alg.iot.vmp.vmanager.log;
 import com.zd.alg.iot.vmp.conf.UserSetup;
 import com.zd.alg.iot.vmp.service.ILogService;
 import com.zd.alg.iot.vmp.storager.dao.dto.LogDto;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/onvif/ONVIFController.java

@@ -7,7 +7,7 @@ import com.zd.alg.iot.vmp.gb28181.transmit.callback.RequestMessage;
 import com.zd.alg.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.zd.alg.iot.vmp.onvif.IONVIFServer;
 import com.zd.alg.iot.vmp.service.IMediaServerService;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import com.zd.model.constant.HttpStatus;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/server/ServerController.java

@@ -10,7 +10,7 @@ import com.zd.alg.iot.vmp.common.VersionPo;
 import com.zd.alg.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.zd.alg.iot.vmp.service.IMediaServerService;
 import com.zd.alg.iot.vmp.utils.SpringBeanFactory;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import gov.nist.javax.sip.SipStackImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/streamProxy/StreamProxyController.java

@@ -6,7 +6,7 @@ import com.zd.alg.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.zd.alg.iot.vmp.service.IMediaServerService;
 import com.zd.alg.iot.vmp.storager.IRedisCatchStorage;
 import com.zd.alg.iot.vmp.service.IStreamProxyService;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/web/ApiCompatibleController.java

@@ -2,7 +2,7 @@ package com.zd.alg.iot.vmp.web;
 
 import com.zd.alg.iot.vmp.common.StreamInfo;
 import com.zd.alg.iot.vmp.service.IMediaService;
-import com.zd.alg.iot.vmp.vmanager.bean.WVPResult;
+import com.zd.model.domain.WVPResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -51,7 +51,10 @@ public class LabRiskPlanLevelController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_PLAN + PerFun.REMOVE)
     @DeleteMapping("/delete")
     public ResultData delete(@RequestBody LabRiskPlanLevel labRiskPlanLevel) {
-        return ResultData.result(labRiskPlanLevelService.deleteById(labRiskPlanLevel));
+        if (labRiskPlanLevelService.deleteById(labRiskPlanLevel)>0) {
+            return ResultData.success(null,"删除预案规则成功");
+        }
+        return ResultData.fail("删除预案规则失败");
     }
 
     /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -352,6 +352,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                     //调用人脸验证
                     R r = faceCompare(user.getUserId(), face);
                     //验证失败刷新验证码时间
+                    logger.info("r.getCode():"+r.getCode());
                     if (r.getCode() != 200) {
                         return ResultData.fail(r.getMsg());
                     }
@@ -500,12 +501,12 @@ public class OneMachineService implements ValidationSignInPerInfo {
     }
 
     public R faceCompare(Long userId, byte[] face) {
-
+        logger.info("*********"+userId+"*********");
         FaceCompare faceCompare = new FaceCompare();
         faceCompare.setUserId(userId);
         faceCompare.setData(face);
         R compare = remoteFaceService.compare(faceCompare);
-
+        logger.info("***********compare.getCode()"+compare.getCode());
         return compare;
     }
 

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

@@ -77,7 +77,7 @@ public class LabRiskPlanLevelServiceImpl extends ServiceImpl<LabRiskPlanLevelMap
             }
             labRiskPlanHardwareRelationService.saveBatch(riskPlanHardwareList);
         }
-        return ResultData.success(labRiskPlanLevel.getId());
+        return ResultData.success(labRiskPlanLevel.getId(),"预案规则新增成功");
     }
 
     @Override

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

@@ -1292,10 +1292,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     }
 
 
-    public void insertPlanAbnormalLogByOver(LabRiskPlanAbnormalGroup groupVo, JSONArray allRiskPlanJson, SubFunction<SensorFunctionStatus> subFunction) {
+    public void insertPlanAbnormalLogByOver(LabRiskPlanAbnormalGroupVO groupVo, JSONArray allRiskPlanJson, SubFunction<SensorFunctionStatus> subFunction) {
         //将风险预案写入日志表
         LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = new LabRiskPlanAbnormalLog();
-        labRiskPlanAbnormalLog.setRiskPlanId(groupVo.getId());
+        labRiskPlanAbnormalLog.setRiskPlanId(groupVo.getRiskPlanId());
         labRiskPlanAbnormalLog.setRiskPlanName("风险解除");
         labRiskPlanAbnormalLog.setSubjectId(subFunction.getSubId());
         labRiskPlanAbnormalLog.setCreateTime(new Date());

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

@@ -191,7 +191,7 @@
         <where>
             <if test="groupId != null ">and pl.group_id = #{groupId}</if>
             <if test="riskPlanId != null ">and pl.risk_plan_id = #{riskPlanId}</if>
-            and pl.risk_status in(1,0,3)
+            and pl.risk_status in(1,0,3,2)
         </where>
         ORDER BY pl.`id` DESC,pl.create_time DESC
     </select>