算发调用代码优化

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

@@ -12,7 +12,6 @@ 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.swagger.config.Knife4jConfiguration;
-import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.domain.R;
 import com.zd.model.entity.Algorithm;
 import io.swagger.annotations.Api;
@@ -25,8 +24,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -60,9 +57,6 @@ public class SignInCheckController {
     @Resource
     private FireImageService fireImageService;
 
-    @Autowired
-    private RemoteLaboratoryService laboratoryService;
-
     /**
      * 进入项验证
      *
@@ -73,7 +67,6 @@ public class SignInCheckController {
     @ApiOperation(value = "进入项验证")
     @PostMapping("/{code}/{id}")
     public R checkIn(@ApiParam("进出记录ID") @PathVariable("id") Long id, @ApiParam("验证类型编码") @PathVariable("code") String code, @RequestParam("file") MultipartFile file) {
-        logger.info("【算法服务】 进入项验证");
         return checkService.checkAndCommit(code, file, id);
     }
 
@@ -88,7 +81,6 @@ public class SignInCheckController {
     public R checkInAll(@ApiParam("进出记录ID") @RequestParam("id") Long id,
                         @ApiParam("图片文件") @RequestParam("file") MultipartFile file,
                         @ApiParam("实验室ID") @RequestParam("subId") Long subId) {
-        logger.info("【算法服务】 三合一验证");
         return checkService.checkAndCommit(id, file, subId);
     }
 
@@ -102,7 +94,6 @@ public class SignInCheckController {
     @ApiOperation(value = "进入项验证:mock方法")
     @PostMapping("/mock/{code}/{id}")
     public R checkInMock(@ApiParam("进出记录ID") @PathVariable("id") Long id, @ApiParam("验证类型编码") @PathVariable("code") String code, @RequestParam("file") MultipartFile file) {
-        logger.info("【算法服务】 进入项验证:mock方法");
         return checkService.mockTest(code, file, id);
     }
 
@@ -172,28 +163,4 @@ public class SignInCheckController {
     public R checkFire(@ApiParam("图片文件") @RequestParam("file") MultipartFile file) {
         return R.ok(fireImageService.catchImage(file));
     }
-    @GetMapping("/testXXF")
-    public R testXXF() {
-        //TODO 添加一条请求记录到数据库，
-        Algorithm algorithmFirst = new Algorithm();
-        R<Long> alg= laboratoryService.saveAlgorithmData(algorithmFirst);
-        System.out.println(alg.getData());
-        Map<String,String> map = new HashMap<>();
-        map.put("type", "image");
-        map.put("data1","data1");
-        map.put("XXf","XXF");
-        map.put("QQQW","12345");
-        algorithmFirst.setAlgorithmResult("/statics/2022/09/09/404dbcb6-6959-477a-9d1c-94fa136e81da.jpeg");
-        algorithmFirst.setSignId(1557192675937570818L);
-        algorithmFirst.setSubId(123L);
-        algorithmFirst.setAlgorithmName("实验服识别图片算法");
-        algorithmFirst.setIsAlarm(0);
-        algorithmFirst.setRespCode(2058L);
-        algorithmFirst.setOriginalImg("setOriginalImg");
-        algorithmFirst.setRespData(map.toString());
-        algorithmFirst.setId(Long.valueOf(alg.getData()+""));
-        algorithmFirst.setUpdateTime(new Date());
-        R f = laboratoryService.update(algorithmFirst);
-        return R.ok(f);
-    }
 }

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

@@ -97,7 +97,6 @@ public class CheckService {
             int alarmNum = 0;
             //========= 请求超时验证部分开始 ===========
             //600 则代表退出验证流程 需要重新刷卡
-            logger.info("【算法服务】 进入服务，检查开始.............");
             R<Long> fail = getObjectR(id);
             if (fail.getCode() != 200) {
                 return fail;
@@ -115,7 +114,7 @@ public class CheckService {
             //上传原始图片
             String orgImgUrl = "";
             R<SysFile> r = remoteFileService.upload(file);
-            logger.info("【算法服务】 原始文件上传结果："+JSONObject.toJSONString(r));
+            //logger.info("【调用算法服务】 原文件上传结果："+JSONObject.toJSONString(r));
             if (r.getCode() == 200) {
                 orgImgUrl = r.getData().getUrl();
             }
@@ -139,38 +138,30 @@ public class CheckService {
                 HttpEntity<MultiValueMap<String, Object>> files = getHttpEntityMap(toFile, params);
                 //添加一条算法请求记录
                 R alg = insertRequestRecordLog(orgImgUrl, subId, checkValid);
-                logger.info("【算法服务】 添加日志记录结果："+JSONObject.toJSONString(alg));
-                logger.info("==============>>>算法数据添加结果，alg="+ JSONObject.toJSONString(alg));
+                logger.info("【调用算法服务】 添加算法调用日志，添加结果："+JSONObject.toJSONString(alg));
                 ImgPostResponse<AnalysisReturnData> send = HttpUtils.sendV5(restTemplateLocal, files, algorithmYml);
                 //算法记录更新
                 if (alg.getCode() == 200) {
                     try {
                         updateRequestRecordLog(alg.getData() != null?Long.valueOf(alg.getData()+""):null, send);
+                        logger.info("【调用算法服务】 更新算法调用日志");
                     } catch (Exception e) {
-                        logger.error("【算法服务】 更新日志异常，异常信息",e);
+                        logger.error("【调用算法服务】 更新日志异常，异常信息",e);
                     }
                 }
                 //判断算法
                 if (send == null || send.getStatus_code() != 1000) {
                     assert send != null;
-                    logger.error("【算法服务】 请求为成功，响应信息:"+ JSONObject.toJSONString(send));
+                    logger.error("【调用算法服务】 算法服务调用失败，响应信息:"+ JSONObject.toJSONString(send));
                     return R.fail("算法服务错误，请重试！");
                 }
-                //logger.info("===============5=================");
-                /*R algorithm = saveAlgorithmV5(Long.valueOf(alg.getData().toString()),file,send, checkValid);
-                if (algorithm.getCode() != 200) {
-                    logger.error("==============="+algorithm.getCode()+"=================");
-                    return algorithm;
-                }*/
-                logger.info("===============6=================");
                 AnalysisReturnData data = send.getData();
                 Map<String, Object> result = (Map<String, Object>) data.getResult();
-                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");
-                logger.info("============算法请求日志打印：算法ID：{},请求结果：{}", code, algorithmData.getOrDefault("is_alert", ""));
-                //通过的
+                logger.info("【调用算法服务】 算法请求日志打印：算法ID：{},请求结果：{}", code, algorithmData.getOrDefault("is_alert", ""));
+                //通过
                 if (algorithmData.getOrDefault("is_alert", "").toString().equals("false") && !objects.isEmpty()) {
                     alarmNum++;
                 } else {
@@ -197,7 +188,6 @@ public class CheckService {
             }
         } catch (Exception e) {
             logger.error("【算法服务异常】异常信息",e);
-            //e.printStackTrace();
         }
         return R.fail();
     }
@@ -215,7 +205,7 @@ public class CheckService {
         algorithm.setSubId(subId);
         algorithm.setAlgorithmType("image");
         algorithm.setAlgorithmName(checkValid.getAlgorithmName());
-        logger.info("【算法服务】 添加日志记录实体："+JSONObject.toJSONString(algorithm));
+        //logger.info("【算法服务】 添加日志记录实体："+JSONObject.toJSONString(algorithm));
         return laboratoryService.saveAlgorithmData(algorithm);
     }
 
@@ -267,7 +257,7 @@ public class CheckService {
             algorithm.setRespCode(send.getStatus_code());
         }
         algorithm.setUpdateTime(new Date());
-        logger.info("【算法服务】 更新日志实体信息："+JSONObject.toJSONString(algorithm));
+        //logger.info("【算法服务】 更新日志实体信息："+JSONObject.toJSONString(algorithm));
         laboratoryService.update(algorithm);
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/device/DeviceRemoteController.java

@@ -53,15 +53,6 @@ public class DeviceRemoteController {
 
     @PostMapping("/V2/openLock")
     public ResultData cabinetV2OpenLock(@RequestBody CabinetV2Lock cabinetV2Lock){
-
-        /*try {
-            Thread.sleep(lockTimer * 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return ResultData.success("开锁成功");*/
-
-        // socket 方式发送
         String instruct = CRCCHECK.getOpenLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
         String relayCode = cabinetV2Lock.getRelayCode();
         OutputStream ops = TCPServer.cacheMap.get(relayCode);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/controller/OneMachineController.java

@@ -24,7 +24,6 @@ import com.zd.model.constant.HttpStatus;
 import com.zd.model.constant.SecurityConstants;
 import com.zd.model.domain.R;
 import com.zd.model.domain.ResultData;
-import com.zd.model.entity.LoginUser;
 import com.zd.model.entity.SysUser;
 import com.zd.model.enums.HardwareTypeEnum;
 import com.zd.model.enums.SignEnum;
@@ -325,7 +324,6 @@ public class OneMachineController extends BaseController {
 
         // 查询用户信息
         R<SysUser> userResult = userService.getUserInfoByCardNum(username, SecurityConstants.INNER);
-
         if (HttpStatus.ERROR == userResult.getCode()) {
             throw new ServiceException(userResult.getMsg());
         }

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

@@ -73,10 +73,6 @@ public class SocketService {
     @Autowired
     private CommonSend commonSend;
 
-    public String getSteerSubscriptPrefix() {
-        return steerSubscriptPrefix;
-    }
-
     @PostConstruct
     private void queryRelays(){
         relays = labRelayMapper.selectLabRelayList(new LabRelay());