diff --git a/pom.xml b/pom.xml index e1089b9..73a9543 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inspect - inspect-infrared + inspect-nvr v-1.0 - inspect-infrared - inspect-infrared + inspect-nvr + inspect-nvr 1.8 2021.0.1 @@ -16,73 +16,19 @@ UTF-8 UTF-8 2.3.4.RELEASE - com.inspect.simulator.InspectSimulatorApplication + com.inspect.nvr.InspectNvrApplication - - - - - - - - + + org.springframework.boot + spring-boot-starter-web + - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-bootstrap - ${spring.cloud.bootstrap.version} - - - com.alibaba.nacos - nacos-client - ${nacos.client.version} - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - ${spring.cloud.alibaba.version} - - - com.alibaba.nacos - nacos-api - - - com.alibaba.nacos - nacos-client - - - com.alibaba.nacos - nacos-common - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - ${spring.cloud.alibaba.version} - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - ${spring.cloud.alibaba.version} - - - com.alibaba.cloud - spring-cloud-alibaba-sentinel-gateway - ${spring.cloud.alibaba.version} - + + org.springframework.boot + spring-boot-starter-test + test + org.springframework.boot @@ -293,7 +239,7 @@ - inspect-infrared + inspect-nvr org.apache.maven.plugins @@ -310,7 +256,7 @@ spring-boot-maven-plugin ${spring-boot.version} - com.inspect.simulator.InspectSimulatorApplication + com.inspect.nvr.InspectNvrApplication diff --git a/sdkLog/SdkLog_1_W.log b/sdkLog/SdkLog_1_W.log index fbc22d3..a2f1896 100644 --- a/sdkLog/SdkLog_1_W.log +++ b/sdkLog/SdkLog_1_W.log @@ -1,31 +1,4 @@ -[2025-07-03 15:40:54.545][ERR] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Failed, Path[E:/PersonalProject/inspect-infrared/lib/zlib1.dll] syserror[126] -[2025-07-03 15:40:54.545][ERR] Load zlib failed[syserr: 126] -[2025-07-03 15:40:54.545][INF] The COM:HCCoreBase ver is 6.1.4.15, 2020_03_05. Async:1. -[2025-07-03 15:40:54.545][INF] The COM:Core ver is 6.1.9.47, 2022_11_11. Async:1. -[2025-07-03 15:40:54.545][INF] This HCNetSDK ver is 6.1.9.47 Ver 2022_11_11. -[2025-07-03 15:41:19.099][INF] Login dev 192.168.1.250:8000. -[2025-07-03 15:41:19.099][INF] dwTotalNum[2048] -[2025-07-03 15:41:19.100][INF] Private connect 192.168.1.250:8000 sock=5552 this=0x1283b114 cmd=0x10000 port=57665 -[2025-07-03 15:41:19.100][INF] LogonDev1 in[192.168.1.250:8000] -[2025-07-03 15:41:19.101][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[E:/PersonalProject/inspect-infrared/lib/libcrypto-1_1-x64.dll], hHandleRet[-1425145856] -[2025-07-03 15:41:19.101][DBG] Load [libcrypto-1_1-x64.dll] SUCC, Real Path[E:\PersonalProject\inspect-infrared\lib\libcrypto-1_1-x64.dll] -[2025-07-03 15:41:19.102][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[E:/PersonalProject/inspect-infrared/lib/libssl-1_1-x64.dll], hHandleRet[-1247739904] -[2025-07-03 15:41:19.102][DBG] Load [libssl-1_1-x64.dll] SUCC, Real Path[E:\PersonalProject\inspect-infrared\lib\libssl-1_1-x64.dll] -[2025-07-03 15:41:19.102][INF] SSLTRANSAPI::IsAllAPILoaded, SSL_library_init Unload -[2025-07-03 15:41:19.102][INF] OpenSSL, Not All Function Loaded! -[2025-07-03 15:41:19.102][INF] SSLTRANSAPI::PrintVersion, OpenSSL version info [OpenSSL 1.1.1l 24 Aug 2021] -[2025-07-03 15:41:19.102][INF] CSSLTrans::SSLCtxInit, dwSSLVersion[6], m_fnTLSServerMethod -[2025-07-03 15:41:19.103][ERR] CSSLTrans::SSLTrans_CTX_Load_CA, invalid path[E:/PersonalProject/inspect-infrared/lib/cert/\] -[2025-07-03 15:41:20.053][DBG] CComBase::Load, Load szDllPath[E:/PersonalProject/inspect-infrared/lib/HCNetSDKCom/HCPreview.dll] SUCC -[2025-07-03 15:41:20.053][INF] AbilityAnalyze---Init-- start -[2025-07-03 15:41:20.053][ERR] AbilityAnalyze---open zip package error, package path E:/PersonalProject/inspect-infrared/lib/LocalXml.zip -[2025-07-03 15:41:20.053][INF] The COM:Preview ver is 6.1.9.47, 2022_11_11. -[2025-07-03 15:41:20.059][INF] Private connect 192.168.1.250:8000 sock=5388 this=0x1283b880 cmd=0x30200 port=57667 -[2025-07-03 15:41:20.074][INF] Private connect 192.168.1.250:8000 sock=5672 this=0x1283b114 cmd=0x30001 port=57666 -[2025-07-03 15:41:20.085][INF] Private connect 192.168.1.250:8262 sock=5392 this=0x1283b880 cmd=0x30001 port=63103 -[2025-07-03 15:41:51.921][INF] Login dev 192.168.1.250:8000. -[2025-07-03 15:41:51.921][INF] Private connect 192.168.1.250:8000 sock=1728 this=0x1283bfec cmd=0x10000 port=57679 -[2025-07-03 15:41:51.921][INF] LogonDev1 in[192.168.1.250:8000] -[2025-07-03 15:41:52.014][INF] Private connect 192.168.1.250:8000 sock=5452 this=0x1283bfec cmd=0x30200 port=57680 -[2025-07-03 15:41:52.014][INF] Private connect 192.168.1.250:8000 sock=5696 this=0x1283c758 cmd=0x30001 port=57681 -[2025-07-03 15:41:52.020][INF] Private connect 192.168.1.250:8264 sock=5692 this=0x1283bfec cmd=0x30001 port=52977 +[2025-07-11 15:04:10.150][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[E:/qinyl/intellij/src/inspect-nvr/lib/zlib1.dll], hHandleRet[1493237760] +[2025-07-11 15:04:10.150][INF] The COM:HCCoreBase ver is 6.1.4.15, 2020_03_05. Async:1. +[2025-07-11 15:04:10.150][INF] The COM:Core ver is 6.1.9.47, 2022_11_11. Async:1. +[2025-07-11 15:04:10.150][INF] This HCNetSDK ver is 6.1.9.47 Ver 2022_11_11. diff --git a/src/main/java/com/inspect/nvr/InspectNvrApplication.java b/src/main/java/com/inspect/nvr/InspectNvrApplication.java new file mode 100644 index 0000000..c25a933 --- /dev/null +++ b/src/main/java/com/inspect/nvr/InspectNvrApplication.java @@ -0,0 +1,31 @@ +package com.inspect.nvr; + +import okhttp3.Interceptor; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.scheduling.annotation.EnableScheduling; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + +import java.util.Date; + +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@EnableScheduling +public class InspectNvrApplication { + private final static Logger log = LoggerFactory.getLogger(InspectNvrApplication.class); + + public static void main(String[] args) { + SpringApplication.run(InspectNvrApplication.class, args); + log.info("\n<=====☆ NVR MODULE ☆ =====> \n .-------. ____ __ \n | _ _ \\ \\ \\ / / \n | ( ' ) | \\ _. / ' \n |(_ o _) / _( )_ .' \n | (_,_).' __ ___(_ o _)' \n | |\\ \\ | || |(_,_)' \n | | \\ `' /| `-' / \n | | \\ / \\ / \n ''-' `'-' `-..-' "); + + } + +} diff --git a/src/main/java/com/inspect/simulator/config/HikLibConfig.java b/src/main/java/com/inspect/nvr/config/HikLibConfig.java similarity index 93% rename from src/main/java/com/inspect/simulator/config/HikLibConfig.java rename to src/main/java/com/inspect/nvr/config/HikLibConfig.java index 9ba84e1..b6bc837 100644 --- a/src/main/java/com/inspect/simulator/config/HikLibConfig.java +++ b/src/main/java/com/inspect/nvr/config/HikLibConfig.java @@ -1,11 +1,11 @@ -package com.inspect.simulator.config; +package com.inspect.nvr.config; -import com.inspect.simulator.hikVision.utils.jna.HCNetSDK; -import com.inspect.simulator.hikVision.utils.jna.osSelect; -import com.inspect.simulator.service.impl.HikFExceptionCallBack_Imp; -import com.inspect.simulator.service.impl.HikLoginResultCallBack; +import com.inspect.nvr.hikVision.utils.jna.HCNetSDK; +import com.inspect.nvr.hikVision.utils.jna.osSelect; +import com.inspect.nvr.service.impl.HikFExceptionCallBack_Imp; +import com.inspect.nvr.service.impl.HikLoginResultCallBack; import com.sun.jna.Native; import com.sun.jna.Pointer; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/inspect/simulator/constant/AlgConstants.java b/src/main/java/com/inspect/nvr/constant/AlgConstants.java similarity index 91% rename from src/main/java/com/inspect/simulator/constant/AlgConstants.java rename to src/main/java/com/inspect/nvr/constant/AlgConstants.java index 9a1c170..6efbfd4 100644 --- a/src/main/java/com/inspect/simulator/constant/AlgConstants.java +++ b/src/main/java/com/inspect/nvr/constant/AlgConstants.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.constant; +package com.inspect.nvr.constant; public class AlgConstants { public static final String METER = "meter"; diff --git a/src/main/java/com/inspect/simulator/constant/Color.java b/src/main/java/com/inspect/nvr/constant/Color.java similarity index 90% rename from src/main/java/com/inspect/simulator/constant/Color.java rename to src/main/java/com/inspect/nvr/constant/Color.java index 6af11cb..a519221 100644 --- a/src/main/java/com/inspect/simulator/constant/Color.java +++ b/src/main/java/com/inspect/nvr/constant/Color.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.constant; +package com.inspect.nvr.constant; public class Color { public static final String END = "\033[0m"; diff --git a/src/main/java/com/inspect/simulator/controller/FileController.java b/src/main/java/com/inspect/nvr/controller/FileController.java similarity index 82% rename from src/main/java/com/inspect/simulator/controller/FileController.java rename to src/main/java/com/inspect/nvr/controller/FileController.java index 193f544..dd42e61 100644 --- a/src/main/java/com/inspect/simulator/controller/FileController.java +++ b/src/main/java/com/inspect/nvr/controller/FileController.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.controller; +package com.inspect.nvr.controller; -import com.inspect.simulator.domain.file.FileReturn; -import com.inspect.simulator.service.FileService; +import com.inspect.nvr.domain.file.FileReturn; +import com.inspect.nvr.service.FileService; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/inspect/simulator/controller/InfraredController.java b/src/main/java/com/inspect/nvr/controller/InfraredController.java similarity index 81% rename from src/main/java/com/inspect/simulator/controller/InfraredController.java rename to src/main/java/com/inspect/nvr/controller/InfraredController.java index a7cfc00..fb2a698 100644 --- a/src/main/java/com/inspect/simulator/controller/InfraredController.java +++ b/src/main/java/com/inspect/nvr/controller/InfraredController.java @@ -1,12 +1,9 @@ -package com.inspect.simulator.controller; +package com.inspect.nvr.controller; import com.alibaba.fastjson.JSONObject; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; -import com.inspect.simulator.domain.Infrared.*; -import com.inspect.simulator.hikVision.utils.StringUtils; -import com.inspect.simulator.service.HikVisionService; -import com.inspect.simulator.hikVision.utils.AjaxResult; -import com.inspect.simulator.service.ResultAnalysisService; +import com.inspect.nvr.domain.Infrared.*; +import com.inspect.nvr.service.HikVisionService; +import com.inspect.nvr.hikVision.utils.AjaxResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,9 +27,6 @@ public class InfraredController { @Autowired private HikVisionService hikVisionService; - @Resource - private ResultAnalysisService resultAnnalysisService; - /** * ----登录---- * nvrIp nvrIp @@ -145,8 +139,8 @@ public class InfraredController { @PostMapping("/ir/addBoxData") @ResponseBody public AjaxResult addBoxData(@RequestBody InfraPictureInfo infraPictureInfo) { - int i = hikVisionService.insertInfraredBoxList(infraPictureInfo); - return AjaxResult.success().put("data", i); + + return AjaxResult.success().put("data", 0); } //删除选择图片的全部框 @@ -154,9 +148,7 @@ public class InfraredController { @ResponseBody public AjaxResult deleteBoxData(@RequestBody InfraredBox infraredBox) { int i = -1; - if (StringUtils.isNotEmpty(infraredBox.getImgName())) { - i=hikVisionService.deleteInfraredBoxListByImgName(infraredBox.getImgName()); - } + return AjaxResult.success().put("data", i); } @@ -165,9 +157,6 @@ public class InfraredController { @ResponseBody public AjaxResult selectBoxData(@RequestBody InfraredBox infraredBox) { List list=new ArrayList<>(); - if (StringUtils.isNotEmpty(infraredBox.getImgName())) { - list = hikVisionService.selectInfraredBoxListByImgName(infraredBox.getImgName()); - } return AjaxResult.success().put("data", list); } @@ -179,11 +168,4 @@ public class InfraredController { response.put("close", 1); return response; } - @PostMapping("/ir/channelImg") - @ResponseBody - public AjaxResult getChannelImg(@RequestBody InfraPictureInfo infraPictureInfo) { - String string = resultAnnalysisService.selectChannelImgByPatrolPointId(String.valueOf(infraPictureInfo.getPatrolPointId())); - return AjaxResult.success().put("data", string); - } - } diff --git a/src/main/java/com/inspect/nvr/controller/IvsCameraController.java b/src/main/java/com/inspect/nvr/controller/IvsCameraController.java new file mode 100644 index 0000000..c8db476 --- /dev/null +++ b/src/main/java/com/inspect/nvr/controller/IvsCameraController.java @@ -0,0 +1,56 @@ +package com.inspect.nvr.controller; + +import com.inspect.nvr.domain.device.*; +import com.inspect.nvr.service.IvsCameraService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.*; + +@RestController +public class IvsCameraController implements Serializable { + private final Logger log = LoggerFactory.getLogger(this.getClass()); + + @Resource + private IvsCameraService ivsCameraService; + + @PostMapping({"/device/ptzcontrol"}) + public ResponseEntity ptzControl(@RequestBody PtzControlParam param) { + log.info("Ptz control request param: {}", param); + return ResponseEntity + .ok() + .body(ivsCameraService.ptzControl(param)); + } + + @GetMapping({"/platform/platformSnapshot/{cameraCode}/{domainCode}"}) + public ResponseEntity platformSnapshot( + @PathVariable("cameraCode") String cameraCode, + @PathVariable("domainCode") String domainCode, + SnapshotCommandParam param) { + log.info("Platform Snapshot cameraCode: {}, domainCode: {}, param: {}", cameraCode, domainCode, param); + return ResponseEntity + .ok() + .body(ivsCameraService.platformSnapshot(cameraCode, domainCode, param)); + } + + @PostMapping({"/platform/snapshotList"}) + public ResponseEntity retrieveSnapshotList(@RequestBody SnapshotInfoListParam param) { + log.info("Snapshot list request param: {}", param); + return ResponseEntity + .ok() + .body(ivsCameraService.getSnapshotList(param)); + } + + @GetMapping("/downloadfile") + public ResponseEntity downloadFile(@RequestParam("filesessionid") String fileSessionId) { + log.info("[GAB] get stream, fileSessionId: {}", fileSessionId); + return ResponseEntity + .ok() + .body(new InputStreamResource(ivsCameraService.downloadFile(fileSessionId))); + } + +} diff --git a/src/main/java/com/inspect/simulator/controller/IvsServerController.java b/src/main/java/com/inspect/nvr/controller/IvsServerController.java similarity index 77% rename from src/main/java/com/inspect/simulator/controller/IvsServerController.java rename to src/main/java/com/inspect/nvr/controller/IvsServerController.java index 57dd9c8..9acf0ff 100644 --- a/src/main/java/com/inspect/simulator/controller/IvsServerController.java +++ b/src/main/java/com/inspect/nvr/controller/IvsServerController.java @@ -1,15 +1,10 @@ -package com.inspect.simulator.controller; +package com.inspect.nvr.controller; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.inspect.simulator.domain.analysis.vi.AnalysisRequest; -import com.inspect.simulator.domain.analysis.vo.AnalysisResult; -import com.inspect.simulator.domain.analysis.vo.AnalysisResultEntity; -import com.inspect.simulator.domain.analysis.vo.AnalysisResultList; -import com.inspect.simulator.domain.ivs.*; +import com.inspect.nvr.domain.ivs.*; -import com.inspect.simulator.service.remote.AnalysisRemoteService; -import com.inspect.simulator.view.IvsPlatformSnapshotView; +import com.inspect.nvr.view.IvsPlatformSnapshotView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,18 +34,13 @@ public class IvsServerController { private final String TASK_CODE = "1234567890"; private final String PIC_URL = "https://image.baidu.com/search/detail?ct=503316480&z=0&ipn=d&word=songbird&step_word=&hs=0&pn=15&spn=0&di=7360350738658099201&pi=0&rn=1&tn=baiduimagedetail&is=0%2C0&istype=2&ie=utf-8&oe=utf-8&in=&cl=2&lm=&st=-1&cs=1060316073%2C1951231255&os=2156611125%2C946097664&simid=60689125%2C716595069&adpicid=0&lpn=0&ln=1080&fr=&fmq=1718353459191_R&fm=result&ic=0&s=undefined&hd=&latest=©right=&se=&sme=&tab=0&width=&height=&face=undefined&ist=&jit=&cg=&bdtype=0&oriquery=&objurl=https%3A%2F%2Fup.sc.enterdesk.com%2Fedpic%2Ff4%2F4a%2Fee%2Ff44aeeb12debd4e56faf34d72890d76d.jpg&fromurl=ippr_z2C%24qAzdH3FAzdH3F4_z%26e3Bfv_z%26e3Bjgpj61jfh_z%26e3Bv54AzdH3F_jgAzdH3Ff7vwtAzdH3Fnbn8lb_z%26e3Bip4s&gsm=1e&rpstart=0&rpnum=0&islist=&querylist=&nojc=undefined&lid=6977254189663851692"; - private final AnalysisRemoteService analysisRemoteService; - @Value("${platform.url}") + @Value("${platform.url:http://localhost}") private String platFormUrl; @Value("${rtsp.testUrl:rtsp://admin:Zenap_qweasdzxc@192.168.1.217:554/h264/ch3/main/av_stream}") private String rtspTestUrl; - public IvsServerController(AnalysisRemoteService analysisRemoteService) { - this.analysisRemoteService = analysisRemoteService; - } - @GetMapping("/common/keepAlive") public ResponseEntity keepAlive() { log.info("[GAB] keep alive"); @@ -276,67 +266,4 @@ public class IvsServerController { } } - - @PostMapping({"/picAnalyse"}) - public ResponseEntity picAnalyse(@RequestBody AnalysisRequest analysisRequest) { - log.info("[GAB] analysisRequest!!!!!!: {}", analysisRequest.toString()); - -// OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder(); -// Interceptor interceptor = chain -> { -// Request request = chain.request().newBuilder().addHeader("Authorization", "token 012345678").build(); -// return chain.proceed(request); -// }; -// -// clientBuilder.interceptors().add(interceptor); -// Retrofit retrofit = new Retrofit.Builder() -// .baseUrl(analysisRequest.getRequestHostIp() + ":" + analysisRequest.getRequestHostPort()) -// .client(clientBuilder.build()) -// .addConverterFactory(JacksonConverterFactory.create()) -// .build(); - - AnalysisResult analysisResult = AnalysisResult.builder() - .code("2000") - .resImageUrl(analysisRequest.getObjectList().get(0).getImageUrlList().get(0)) - .pos(Arrays.asList("")) - .conf(0.99) - .value("30") - .type("meter") - .desc("blablabla") - .build(); - List results = new ArrayList<>(); - results.add(analysisResult); - AnalysisResultList analysisResultList = AnalysisResultList.builder() - .algFactory("yd") - .objectId(analysisRequest.getObjectList().get(0).getObjectId()) - .results(results) - .build(); - List resultList = new ArrayList<>(); - resultList.add(analysisResultList); - AnalysisResultEntity analysisResultEntity = AnalysisResultEntity.builder() - .requestId(analysisRequest.getRequestId()) - .resultList(resultList) - .build(); - - final String analysisResultJson = new Gson().toJson(analysisResultEntity); - System.out.println("res entity: \n" + analysisResultJson); - - try { - JSONObject parseObject = JSONObject.parseObject(analysisResultJson); - System.out.println("parseObject: \n" + parseObject); - } catch (Exception e) { - e.printStackTrace(); - } - - - try { - Call call = analysisRemoteService.analysisResultNotify(analysisResultEntity); - Response response = call.execute(); - Object result = response.body(); - System.out.println("result: " + result); - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseEntity.ok().body("This is the test result!"); - } - } diff --git a/src/main/java/com/inspect/simulator/domain/BaseEntity.java b/src/main/java/com/inspect/nvr/domain/BaseEntity.java similarity index 97% rename from src/main/java/com/inspect/simulator/domain/BaseEntity.java rename to src/main/java/com/inspect/nvr/domain/BaseEntity.java index 51853f5..0f68ec3 100644 --- a/src/main/java/com/inspect/simulator/domain/BaseEntity.java +++ b/src/main/java/com/inspect/nvr/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain; +package com.inspect.nvr.domain; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Setter; diff --git a/src/main/java/com/inspect/simulator/domain/Infrared/Camera.java b/src/main/java/com/inspect/nvr/domain/Infrared/Camera.java similarity index 77% rename from src/main/java/com/inspect/simulator/domain/Infrared/Camera.java rename to src/main/java/com/inspect/nvr/domain/Infrared/Camera.java index a69a343..a4fedf4 100644 --- a/src/main/java/com/inspect/simulator/domain/Infrared/Camera.java +++ b/src/main/java/com/inspect/nvr/domain/Infrared/Camera.java @@ -1,10 +1,7 @@ -package com.inspect.simulator.domain.Infrared; +package com.inspect.nvr.domain.Infrared; import lombok.*; -import java.util.Date; -import java.util.List; - /** * 摄像头表 t_camera * diff --git a/src/main/java/com/inspect/simulator/domain/Infrared/Coordinate.java b/src/main/java/com/inspect/nvr/domain/Infrared/Coordinate.java similarity index 93% rename from src/main/java/com/inspect/simulator/domain/Infrared/Coordinate.java rename to src/main/java/com/inspect/nvr/domain/Infrared/Coordinate.java index 278ede9..47253e6 100644 --- a/src/main/java/com/inspect/simulator/domain/Infrared/Coordinate.java +++ b/src/main/java/com/inspect/nvr/domain/Infrared/Coordinate.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.Infrared; +package com.inspect.nvr.domain.Infrared; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/domain/Infrared/InfraPictureInfo.java b/src/main/java/com/inspect/nvr/domain/Infrared/InfraPictureInfo.java similarity index 94% rename from src/main/java/com/inspect/simulator/domain/Infrared/InfraPictureInfo.java rename to src/main/java/com/inspect/nvr/domain/Infrared/InfraPictureInfo.java index 3db64de..7c58100 100644 --- a/src/main/java/com/inspect/simulator/domain/Infrared/InfraPictureInfo.java +++ b/src/main/java/com/inspect/nvr/domain/Infrared/InfraPictureInfo.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.Infrared; +package com.inspect.nvr.domain.Infrared; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/domain/Infrared/InfraredBox.java b/src/main/java/com/inspect/nvr/domain/Infrared/InfraredBox.java similarity index 91% rename from src/main/java/com/inspect/simulator/domain/Infrared/InfraredBox.java rename to src/main/java/com/inspect/nvr/domain/Infrared/InfraredBox.java index 379f2f5..d6b4ab0 100644 --- a/src/main/java/com/inspect/simulator/domain/Infrared/InfraredBox.java +++ b/src/main/java/com/inspect/nvr/domain/Infrared/InfraredBox.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.Infrared; +package com.inspect.nvr.domain.Infrared; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/domain/Infrared/InfraredInfo.java b/src/main/java/com/inspect/nvr/domain/Infrared/InfraredInfo.java similarity index 96% rename from src/main/java/com/inspect/simulator/domain/Infrared/InfraredInfo.java rename to src/main/java/com/inspect/nvr/domain/Infrared/InfraredInfo.java index 95896b4..fe12c1b 100644 --- a/src/main/java/com/inspect/simulator/domain/Infrared/InfraredInfo.java +++ b/src/main/java/com/inspect/nvr/domain/Infrared/InfraredInfo.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.Infrared; +package com.inspect.nvr.domain.Infrared; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/inspect/simulator/domain/Infrared/NvrInfo.java b/src/main/java/com/inspect/nvr/domain/Infrared/NvrInfo.java similarity index 95% rename from src/main/java/com/inspect/simulator/domain/Infrared/NvrInfo.java rename to src/main/java/com/inspect/nvr/domain/Infrared/NvrInfo.java index 82f063f..8169633 100644 --- a/src/main/java/com/inspect/simulator/domain/Infrared/NvrInfo.java +++ b/src/main/java/com/inspect/nvr/domain/Infrared/NvrInfo.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.Infrared; +package com.inspect.nvr.domain.Infrared; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/inspect/simulator/domain/Infrared/TemperatureData.java b/src/main/java/com/inspect/nvr/domain/Infrared/TemperatureData.java similarity index 90% rename from src/main/java/com/inspect/simulator/domain/Infrared/TemperatureData.java rename to src/main/java/com/inspect/nvr/domain/Infrared/TemperatureData.java index 4338b3c..ce3de14 100644 --- a/src/main/java/com/inspect/simulator/domain/Infrared/TemperatureData.java +++ b/src/main/java/com/inspect/nvr/domain/Infrared/TemperatureData.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.Infrared; +package com.inspect.nvr.domain.Infrared; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseConstants.java b/src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseConstants.java similarity index 97% rename from src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseConstants.java rename to src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseConstants.java index e495678..580912a 100644 --- a/src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseConstants.java +++ b/src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseConstants.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.algorithm.in; +package com.inspect.nvr.domain.algorithm.in; public class AnalyseConstants { public static final String ANALYSE_FILTER_REQUEST = "ANALYSE_FILTER_REQUEST:"; diff --git a/src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseReqItem.java b/src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseReqItem.java similarity index 96% rename from src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseReqItem.java rename to src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseReqItem.java index 82d983a..6737a37 100644 --- a/src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseReqItem.java +++ b/src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseReqItem.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.algorithm.in; +package com.inspect.nvr.domain.algorithm.in; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseRequest.java b/src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseRequest.java similarity index 91% rename from src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseRequest.java rename to src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseRequest.java index 3b3bd17..2a33a1d 100644 --- a/src/main/java/com/inspect/simulator/domain/algorithm/in/AnalyseRequest.java +++ b/src/main/java/com/inspect/nvr/domain/algorithm/in/AnalyseRequest.java @@ -1,9 +1,9 @@ -package com.inspect.simulator.domain.algorithm.in; +package com.inspect.nvr.domain.algorithm.in; import com.alibaba.fastjson.JSONObject; -import com.inspect.simulator.domain.algorithm.out.AnalyseResItem; -import com.inspect.simulator.domain.algorithm.out.AnalyseResPoint; -import com.inspect.simulator.domain.algorithm.out.AnalyseResult; +import com.inspect.nvr.domain.algorithm.out.AnalyseResItem; +import com.inspect.nvr.domain.algorithm.out.AnalyseResPoint; +import com.inspect.nvr.domain.algorithm.out.AnalyseResult; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResItem.java b/src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResItem.java similarity index 95% rename from src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResItem.java rename to src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResItem.java index e38099f..c51c552 100644 --- a/src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResItem.java +++ b/src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResItem.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.algorithm.out; +package com.inspect.nvr.domain.algorithm.out; import com.alibaba.fastjson.JSONObject; import lombok.Getter; diff --git a/src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResPoint.java b/src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResPoint.java similarity index 96% rename from src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResPoint.java rename to src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResPoint.java index d177c5a..8151afd 100644 --- a/src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResPoint.java +++ b/src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResPoint.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.domain.algorithm.out; +package com.inspect.nvr.domain.algorithm.out; import com.alibaba.fastjson.JSONObject; -import com.inspect.simulator.domain.algorithm.in.AnalyseConstants; +import com.inspect.nvr.domain.algorithm.in.AnalyseConstants; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResult.java b/src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResult.java similarity index 94% rename from src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResult.java rename to src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResult.java index 515bc91..eb4dad2 100644 --- a/src/main/java/com/inspect/simulator/domain/algorithm/out/AnalyseResult.java +++ b/src/main/java/com/inspect/nvr/domain/algorithm/out/AnalyseResult.java @@ -1,8 +1,8 @@ -package com.inspect.simulator.domain.algorithm.out; +package com.inspect.nvr.domain.algorithm.out; -import com.inspect.simulator.domain.algorithm.in.AnalyseReqItem; -import com.inspect.simulator.domain.algorithm.in.AnalyseRequest; +import com.inspect.nvr.domain.algorithm.in.AnalyseReqItem; +import com.inspect.nvr.domain.algorithm.in.AnalyseRequest; import lombok.Getter; import java.io.Serializable; diff --git a/src/main/java/com/inspect/simulator/domain/algorithm/out/Pos.java b/src/main/java/com/inspect/nvr/domain/algorithm/out/Pos.java similarity index 68% rename from src/main/java/com/inspect/simulator/domain/algorithm/out/Pos.java rename to src/main/java/com/inspect/nvr/domain/algorithm/out/Pos.java index c83ce06..294b45b 100644 --- a/src/main/java/com/inspect/simulator/domain/algorithm/out/Pos.java +++ b/src/main/java/com/inspect/nvr/domain/algorithm/out/Pos.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.algorithm.out; +package com.inspect.nvr.domain.algorithm.out; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/inspect/nvr/domain/device/IndexRange.java b/src/main/java/com/inspect/nvr/domain/device/IndexRange.java new file mode 100644 index 0000000..e14b33f --- /dev/null +++ b/src/main/java/com/inspect/nvr/domain/device/IndexRange.java @@ -0,0 +1,13 @@ +package com.inspect.nvr.domain.device; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Builder +public class IndexRange { + private int fromIndex; + private int toIndex; +} diff --git a/src/main/java/com/inspect/nvr/domain/device/PtzControlParam.java b/src/main/java/com/inspect/nvr/domain/device/PtzControlParam.java new file mode 100644 index 0000000..96e143a --- /dev/null +++ b/src/main/java/com/inspect/nvr/domain/device/PtzControlParam.java @@ -0,0 +1,23 @@ +package com.inspect.nvr.domain.device; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class PtzControlParam { + private String cameraCode; + private String controlCode; + private String controlPara1; + private String controlPara2; + + @Override + public String toString() { + return "PtzControlParam{" + + "cameraCode='" + cameraCode + '\'' + + ", controlCode='" + controlCode + '\'' + + ", controlPara1='" + controlPara1 + '\'' + + ", controlPara2='" + controlPara2 + '\'' + + '}'; + } +} diff --git a/src/main/java/com/inspect/nvr/domain/device/PtzControlResult.java b/src/main/java/com/inspect/nvr/domain/device/PtzControlResult.java new file mode 100644 index 0000000..257427c --- /dev/null +++ b/src/main/java/com/inspect/nvr/domain/device/PtzControlResult.java @@ -0,0 +1,15 @@ +package com.inspect.nvr.domain.device; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +@Builder +public class PtzControlResult implements Serializable { + private static final long serialVersionUID = -3783773379518253182L; + private String resultCode; +} diff --git a/src/main/java/com/inspect/nvr/domain/device/SnapshotCommandParam.java b/src/main/java/com/inspect/nvr/domain/device/SnapshotCommandParam.java new file mode 100644 index 0000000..caa0c21 --- /dev/null +++ b/src/main/java/com/inspect/nvr/domain/device/SnapshotCommandParam.java @@ -0,0 +1,35 @@ +package com.inspect.nvr.domain.device; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +@Builder +public class SnapshotCommandParam implements Serializable { + private String code; + private String cameraCode; + private String domainCode; + private String serial; + private String channel; + private boolean realtime; + private boolean checkOutputs; + private boolean timeout; + + @Override + public String toString() { + return "SnapshotCommandParam{" + + "code='" + code + '\'' + + ", cameraCode='" + cameraCode + '\'' + + ", domainCode='" + domainCode + '\'' + + ", serial='" + serial + '\'' + + ", channel='" + channel + '\'' + + ", realtime=" + realtime + + ", checkOutputs=" + checkOutputs + + ", timeout=" + timeout + + '}'; + } +} diff --git a/src/main/java/com/inspect/nvr/domain/device/SnapshotCommandResult.java b/src/main/java/com/inspect/nvr/domain/device/SnapshotCommandResult.java new file mode 100644 index 0000000..9bda4d9 --- /dev/null +++ b/src/main/java/com/inspect/nvr/domain/device/SnapshotCommandResult.java @@ -0,0 +1,14 @@ +package com.inspect.nvr.domain.device; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +@Builder +public class SnapshotCommandResult implements Serializable { + private String taskID; +} diff --git a/src/main/java/com/inspect/nvr/domain/device/SnapshotInfoListParam.java b/src/main/java/com/inspect/nvr/domain/device/SnapshotInfoListParam.java new file mode 100644 index 0000000..bf9c3c7 --- /dev/null +++ b/src/main/java/com/inspect/nvr/domain/device/SnapshotInfoListParam.java @@ -0,0 +1,27 @@ +package com.inspect.nvr.domain.device; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +@Builder +public class SnapshotInfoListParam implements Serializable { + private String taskID; + private String code; + private String cameraCode; + private String domainCode; + + @Override + public String toString() { + return "SnapshotInfoListParam{" + + "taskID='" + taskID + '\'' + + ", code='" + code + '\'' + + ", cameraCode='" + cameraCode + '\'' + + ", domainCode='" + domainCode + '\'' + + '}'; + } +} diff --git a/src/main/java/com/inspect/nvr/domain/device/SnapshotInfoListResult.java b/src/main/java/com/inspect/nvr/domain/device/SnapshotInfoListResult.java new file mode 100644 index 0000000..8af2fc4 --- /dev/null +++ b/src/main/java/com/inspect/nvr/domain/device/SnapshotInfoListResult.java @@ -0,0 +1,39 @@ +package com.inspect.nvr.domain.device; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.List; + +@Getter +@Setter +@Builder +public class SnapshotInfoListResult implements Serializable { + private SnapshotInfoList snapshotInfoList; + + @Setter + @Getter + @Builder + public static class SnapshotInfo { + private String cameraCode; + private String snapTime; + private String snapType; + private String pictureName; + private String pictureSize; + private String previewUrl; + private String pictureUrl; + private String reserve; + + } + + @Setter + @Getter + public static class SnapshotInfoList { + private int total; + private IndexRange indexRange; + private List snapshotInfos; + + } +} diff --git a/src/main/java/com/inspect/simulator/domain/file/FileReturn.java b/src/main/java/com/inspect/nvr/domain/file/FileReturn.java similarity index 96% rename from src/main/java/com/inspect/simulator/domain/file/FileReturn.java rename to src/main/java/com/inspect/nvr/domain/file/FileReturn.java index 7805da7..ae56e3a 100644 --- a/src/main/java/com/inspect/simulator/domain/file/FileReturn.java +++ b/src/main/java/com/inspect/nvr/domain/file/FileReturn.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.file; +package com.inspect.nvr.domain.file; import java.io.Serializable; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IndexRange.java b/src/main/java/com/inspect/nvr/domain/ivs/IndexRange.java similarity index 85% rename from src/main/java/com/inspect/simulator/domain/ivs/IndexRange.java rename to src/main/java/com/inspect/nvr/domain/ivs/IndexRange.java index f7a1ddb..d64c4db 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IndexRange.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IndexRange.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsChanSnapVo.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsChanSnapVo.java similarity index 88% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsChanSnapVo.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsChanSnapVo.java index cac548e..4e120a3 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsChanSnapVo.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsChanSnapVo.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsDevChanListVo.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsDevChanListVo.java similarity index 93% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsDevChanListVo.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsDevChanListVo.java index 4ebeec6..48dbc79 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsDevChanListVo.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsDevChanListVo.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsDevChanSnapVo.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsDevChanSnapVo.java similarity index 91% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsDevChanSnapVo.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsDevChanSnapVo.java index d524cb3..7c992c7 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsDevChanSnapVo.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsDevChanSnapVo.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsPresetListView.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsPresetListView.java similarity index 95% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsPresetListView.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsPresetListView.java index b839c7b..bc2d995 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsPresetListView.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsPresetListView.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsResult.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsResult.java similarity index 94% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsResult.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsResult.java index eb1440e..0632c5a 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsResult.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsResult.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsSnapshotView.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsSnapshotView.java similarity index 87% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsSnapshotView.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsSnapshotView.java index 89bd98c..aae4d57 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsSnapshotView.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsSnapshotView.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsVideoRtspView.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsVideoRtspView.java similarity index 91% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsVideoRtspView.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsVideoRtspView.java index bebf970..80392ff 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsVideoRtspView.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsVideoRtspView.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsVideoRtspVo.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsVideoRtspVo.java similarity index 94% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsVideoRtspVo.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsVideoRtspVo.java index c8d10ab..14fa207 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsVideoRtspVo.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsVideoRtspVo.java @@ -1,6 +1,6 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; -import com.inspect.simulator.view.IvsRecordListView; +import com.inspect.nvr.view.IvsRecordListView; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/IvsVo.java b/src/main/java/com/inspect/nvr/domain/ivs/IvsVo.java similarity index 82% rename from src/main/java/com/inspect/simulator/domain/ivs/IvsVo.java rename to src/main/java/com/inspect/nvr/domain/ivs/IvsVo.java index 86e603b..521e549 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/IvsVo.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/IvsVo.java @@ -1,10 +1,9 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.StringUtils; import java.io.Serializable; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/Login.java b/src/main/java/com/inspect/nvr/domain/ivs/Login.java similarity index 88% rename from src/main/java/com/inspect/simulator/domain/ivs/Login.java rename to src/main/java/com/inspect/nvr/domain/ivs/Login.java index b107067..53958ac 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/Login.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/Login.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/RealMediaURLParam.java b/src/main/java/com/inspect/nvr/domain/ivs/RealMediaURLParam.java similarity index 92% rename from src/main/java/com/inspect/simulator/domain/ivs/RealMediaURLParam.java rename to src/main/java/com/inspect/nvr/domain/ivs/RealMediaURLParam.java index 82d0504..5dbe09e 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/RealMediaURLParam.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/RealMediaURLParam.java @@ -1,9 +1,4 @@ -package com.inspect.simulator.domain.ivs; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +package com.inspect.nvr.domain.ivs; import java.io.Serializable; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/RecordMediaURLParam.java b/src/main/java/com/inspect/nvr/domain/ivs/RecordMediaURLParam.java similarity index 89% rename from src/main/java/com/inspect/simulator/domain/ivs/RecordMediaURLParam.java rename to src/main/java/com/inspect/nvr/domain/ivs/RecordMediaURLParam.java index 454655f..b3f7d55 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/RecordMediaURLParam.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/RecordMediaURLParam.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/ResultEntity.java b/src/main/java/com/inspect/nvr/domain/ivs/ResultEntity.java similarity index 85% rename from src/main/java/com/inspect/simulator/domain/ivs/ResultEntity.java rename to src/main/java/com/inspect/nvr/domain/ivs/ResultEntity.java index 9a032e5..400a3dc 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/ResultEntity.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/ResultEntity.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/SipbAndIvsConvert.java b/src/main/java/com/inspect/nvr/domain/ivs/SipbAndIvsConvert.java similarity index 97% rename from src/main/java/com/inspect/simulator/domain/ivs/SipbAndIvsConvert.java rename to src/main/java/com/inspect/nvr/domain/ivs/SipbAndIvsConvert.java index dee8e1b..5730441 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/SipbAndIvsConvert.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/SipbAndIvsConvert.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import java.io.Serializable; import java.util.HashMap; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/SipbPtzVo.java b/src/main/java/com/inspect/nvr/domain/ivs/SipbPtzVo.java similarity index 92% rename from src/main/java/com/inspect/simulator/domain/ivs/SipbPtzVo.java rename to src/main/java/com/inspect/nvr/domain/ivs/SipbPtzVo.java index 02809fb..30a6a17 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/SipbPtzVo.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/SipbPtzVo.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/SipbStartRecordVo.java b/src/main/java/com/inspect/nvr/domain/ivs/SipbStartRecordVo.java similarity index 97% rename from src/main/java/com/inspect/simulator/domain/ivs/SipbStartRecordVo.java rename to src/main/java/com/inspect/nvr/domain/ivs/SipbStartRecordVo.java index e178d10..017f808 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/SipbStartRecordVo.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/SipbStartRecordVo.java @@ -1,6 +1,6 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; -import com.inspect.simulator.utils.TimeUtils; +import com.inspect.nvr.utils.TimeUtils; import java.io.Serializable; diff --git a/src/main/java/com/inspect/simulator/domain/ivs/TimeSpan.java b/src/main/java/com/inspect/nvr/domain/ivs/TimeSpan.java similarity index 87% rename from src/main/java/com/inspect/simulator/domain/ivs/TimeSpan.java rename to src/main/java/com/inspect/nvr/domain/ivs/TimeSpan.java index 28361fb..b028c01 100644 --- a/src/main/java/com/inspect/simulator/domain/ivs/TimeSpan.java +++ b/src/main/java/com/inspect/nvr/domain/ivs/TimeSpan.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.domain.ivs; +package com.inspect.nvr.domain.ivs; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/inspect/simulator/exception/ServiceException.java b/src/main/java/com/inspect/nvr/exception/ServiceException.java similarity index 95% rename from src/main/java/com/inspect/simulator/exception/ServiceException.java rename to src/main/java/com/inspect/nvr/exception/ServiceException.java index 281cb01..ff99a52 100644 --- a/src/main/java/com/inspect/simulator/exception/ServiceException.java +++ b/src/main/java/com/inspect/nvr/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.exception; +package com.inspect.nvr.exception; public final class ServiceException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/AjaxResult.java b/src/main/java/com/inspect/nvr/hikVision/utils/AjaxResult.java similarity index 98% rename from src/main/java/com/inspect/simulator/hikVision/utils/AjaxResult.java rename to src/main/java/com/inspect/nvr/hikVision/utils/AjaxResult.java index 32b9633..e8f3d1f 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/AjaxResult.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/AjaxResult.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils; +package com.inspect.nvr.hikVision.utils; import java.util.HashMap; diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/CharsetKit.java b/src/main/java/com/inspect/nvr/hikVision/utils/CharsetKit.java similarity index 97% rename from src/main/java/com/inspect/simulator/hikVision/utils/CharsetKit.java rename to src/main/java/com/inspect/nvr/hikVision/utils/CharsetKit.java index d63475c..9e26871 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/CharsetKit.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/CharsetKit.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils; +package com.inspect.nvr.hikVision.utils; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/Convert.java b/src/main/java/com/inspect/nvr/hikVision/utils/Convert.java similarity index 99% rename from src/main/java/com/inspect/simulator/hikVision/utils/Convert.java rename to src/main/java/com/inspect/nvr/hikVision/utils/Convert.java index f0a5d41..8f24771 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/Convert.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/Convert.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils; +package com.inspect.nvr.hikVision.utils; import org.apache.commons.lang3.ArrayUtils; diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/HttpStatus.java b/src/main/java/com/inspect/nvr/hikVision/utils/HttpStatus.java similarity index 97% rename from src/main/java/com/inspect/simulator/hikVision/utils/HttpStatus.java rename to src/main/java/com/inspect/nvr/hikVision/utils/HttpStatus.java index c59752e..88c3f61 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/HttpStatus.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/HttpStatus.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils; +package com.inspect.nvr.hikVision.utils; /** * 返回状态码 diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/LibraryLoad.java b/src/main/java/com/inspect/nvr/hikVision/utils/LibraryLoad.java similarity index 99% rename from src/main/java/com/inspect/simulator/hikVision/utils/LibraryLoad.java rename to src/main/java/com/inspect/nvr/hikVision/utils/LibraryLoad.java index 1bd92c3..32e71d4 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/LibraryLoad.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/LibraryLoad.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils; +package com.inspect.nvr.hikVision.utils; import java.io.*; diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/StrFormatter.java b/src/main/java/com/inspect/nvr/hikVision/utils/StrFormatter.java similarity index 98% rename from src/main/java/com/inspect/simulator/hikVision/utils/StrFormatter.java rename to src/main/java/com/inspect/nvr/hikVision/utils/StrFormatter.java index c138345..9a63890 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/StrFormatter.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/StrFormatter.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils; +package com.inspect.nvr.hikVision.utils; /** * 字符串格式化 diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/StringUtils.java b/src/main/java/com/inspect/nvr/hikVision/utils/StringUtils.java similarity index 99% rename from src/main/java/com/inspect/simulator/hikVision/utils/StringUtils.java rename to src/main/java/com/inspect/nvr/hikVision/utils/StringUtils.java index 6477819..68c65a0 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/StringUtils.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils; +package com.inspect.nvr.hikVision.utils; diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/jna/HCNetSDK.java b/src/main/java/com/inspect/nvr/hikVision/utils/jna/HCNetSDK.java similarity index 99% rename from src/main/java/com/inspect/simulator/hikVision/utils/jna/HCNetSDK.java rename to src/main/java/com/inspect/nvr/hikVision/utils/jna/HCNetSDK.java index 1aa0653..a8cb1db 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/jna/HCNetSDK.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/jna/HCNetSDK.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils.jna; +package com.inspect.nvr.hikVision.utils.jna; import com.sun.jna.*; import com.sun.jna.examples.win32.W32API; diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/jna/HikLibConfig.java b/src/main/java/com/inspect/nvr/hikVision/utils/jna/HikLibConfig.java similarity index 94% rename from src/main/java/com/inspect/simulator/hikVision/utils/jna/HikLibConfig.java rename to src/main/java/com/inspect/nvr/hikVision/utils/jna/HikLibConfig.java index 8942db8..a90b9b7 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/jna/HikLibConfig.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/jna/HikLibConfig.java @@ -1,14 +1,12 @@ -package com.inspect.simulator.hikVision.utils.jna; +package com.inspect.nvr.hikVision.utils.jna; -import com.inspect.simulator.service.impl.HikFExceptionCallBack_Imp; -import com.inspect.simulator.service.impl.HikLoginResultCallBack; +import com.inspect.nvr.service.impl.HikFExceptionCallBack_Imp; +import com.inspect.nvr.service.impl.HikLoginResultCallBack; import com.sun.jna.Native; import com.sun.jna.Pointer; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; // SDK接口说明,HCNetSDK.dll diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/jna/HikVisionUtils.java b/src/main/java/com/inspect/nvr/hikVision/utils/jna/HikVisionUtils.java similarity index 99% rename from src/main/java/com/inspect/simulator/hikVision/utils/jna/HikVisionUtils.java rename to src/main/java/com/inspect/nvr/hikVision/utils/jna/HikVisionUtils.java index 32c7591..5161a20 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/jna/HikVisionUtils.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/jna/HikVisionUtils.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils.jna; +package com.inspect.nvr.hikVision.utils.jna; /** * 海康威视工具处理类 diff --git a/src/main/java/com/inspect/simulator/hikVision/utils/jna/osSelect.java b/src/main/java/com/inspect/nvr/hikVision/utils/jna/osSelect.java similarity index 84% rename from src/main/java/com/inspect/simulator/hikVision/utils/jna/osSelect.java rename to src/main/java/com/inspect/nvr/hikVision/utils/jna/osSelect.java index ded15f0..00658e6 100644 --- a/src/main/java/com/inspect/simulator/hikVision/utils/jna/osSelect.java +++ b/src/main/java/com/inspect/nvr/hikVision/utils/jna/osSelect.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.hikVision.utils.jna; +package com.inspect.nvr.hikVision.utils.jna; public class osSelect { diff --git a/src/main/java/com/inspect/simulator/service/FileService.java b/src/main/java/com/inspect/nvr/service/FileService.java similarity index 65% rename from src/main/java/com/inspect/simulator/service/FileService.java rename to src/main/java/com/inspect/nvr/service/FileService.java index 0c93c37..3c86ce8 100644 --- a/src/main/java/com/inspect/simulator/service/FileService.java +++ b/src/main/java/com/inspect/nvr/service/FileService.java @@ -1,6 +1,6 @@ -package com.inspect.simulator.service; +package com.inspect.nvr.service; -import com.inspect.simulator.domain.file.FileReturn; +import com.inspect.nvr.domain.file.FileReturn; import org.springframework.web.multipart.MultipartFile; public interface FileService { diff --git a/src/main/java/com/inspect/simulator/service/HikFRemoteConfigCallBack_imp.java b/src/main/java/com/inspect/nvr/service/HikFRemoteConfigCallBack_imp.java similarity index 94% rename from src/main/java/com/inspect/simulator/service/HikFRemoteConfigCallBack_imp.java rename to src/main/java/com/inspect/nvr/service/HikFRemoteConfigCallBack_imp.java index 78bc7c2..e8558da 100644 --- a/src/main/java/com/inspect/simulator/service/HikFRemoteConfigCallBack_imp.java +++ b/src/main/java/com/inspect/nvr/service/HikFRemoteConfigCallBack_imp.java @@ -1,8 +1,8 @@ -package com.inspect.simulator.service; +package com.inspect.nvr.service; -import com.inspect.simulator.hikVision.utils.jna.HCNetSDK; +import com.inspect.nvr.hikVision.utils.jna.HCNetSDK; import com.sun.jna.Pointer; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/inspect/simulator/service/HikVisionService.java b/src/main/java/com/inspect/nvr/service/HikVisionService.java similarity index 73% rename from src/main/java/com/inspect/simulator/service/HikVisionService.java rename to src/main/java/com/inspect/nvr/service/HikVisionService.java index cf76de2..d6bd3c1 100644 --- a/src/main/java/com/inspect/simulator/service/HikVisionService.java +++ b/src/main/java/com/inspect/nvr/service/HikVisionService.java @@ -1,9 +1,8 @@ -package com.inspect.simulator.service; +package com.inspect.nvr.service; -import com.inspect.simulator.domain.Infrared.*; -import com.inspect.simulator.hikVision.utils.AjaxResult; +import com.inspect.nvr.domain.Infrared.*; +import com.inspect.nvr.hikVision.utils.AjaxResult; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; import java.io.InputStream; import java.util.List; @@ -45,9 +44,5 @@ public interface HikVisionService { InputStream downloadCsv(String filePath); - int insertInfraredBoxList(InfraPictureInfo infraPictureInfo); - int deleteInfraredBoxListByImgName(String imgName); - - List selectInfraredBoxListByImgName(String imgName); } diff --git a/src/main/java/com/inspect/nvr/service/IvsCameraService.java b/src/main/java/com/inspect/nvr/service/IvsCameraService.java new file mode 100644 index 0000000..a463f6d --- /dev/null +++ b/src/main/java/com/inspect/nvr/service/IvsCameraService.java @@ -0,0 +1,18 @@ +package com.inspect.nvr.service; + +import com.inspect.nvr.domain.device.*; + +import java.io.ByteArrayInputStream; + +public interface IvsCameraService { + PtzControlResult ptzControl(final PtzControlParam param); + + SnapshotCommandResult platformSnapshot( + String cameraCode, + String domainCode, + SnapshotCommandParam param); + + SnapshotInfoListResult getSnapshotList(SnapshotInfoListParam param); + + ByteArrayInputStream downloadFile(String fileSessionId); +} diff --git a/src/main/java/com/inspect/simulator/service/impl/FileServiceImpl.java b/src/main/java/com/inspect/nvr/service/impl/FileServiceImpl.java similarity index 92% rename from src/main/java/com/inspect/simulator/service/impl/FileServiceImpl.java rename to src/main/java/com/inspect/nvr/service/impl/FileServiceImpl.java index 905e4f0..af1d47c 100644 --- a/src/main/java/com/inspect/simulator/service/impl/FileServiceImpl.java +++ b/src/main/java/com/inspect/nvr/service/impl/FileServiceImpl.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.service.impl; +package com.inspect.nvr.service.impl; -import com.inspect.simulator.domain.file.FileReturn; -import com.inspect.simulator.service.FileService; +import com.inspect.nvr.domain.file.FileReturn; +import com.inspect.nvr.service.FileService; import org.apache.tomcat.util.http.fileupload.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/inspect/simulator/service/impl/HikFExceptionCallBack_Imp.java b/src/main/java/com/inspect/nvr/service/impl/HikFExceptionCallBack_Imp.java similarity index 76% rename from src/main/java/com/inspect/simulator/service/impl/HikFExceptionCallBack_Imp.java rename to src/main/java/com/inspect/nvr/service/impl/HikFExceptionCallBack_Imp.java index 2b895d1..cada331 100644 --- a/src/main/java/com/inspect/simulator/service/impl/HikFExceptionCallBack_Imp.java +++ b/src/main/java/com/inspect/nvr/service/impl/HikFExceptionCallBack_Imp.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.service.impl; +package com.inspect.nvr.service.impl; -import com.inspect.simulator.hikVision.utils.jna.HCNetSDK; +import com.inspect.nvr.hikVision.utils.jna.HCNetSDK; import com.sun.jna.Pointer; /** diff --git a/src/main/java/com/inspect/simulator/service/impl/HikLoginResultCallBack.java b/src/main/java/com/inspect/nvr/service/impl/HikLoginResultCallBack.java similarity index 81% rename from src/main/java/com/inspect/simulator/service/impl/HikLoginResultCallBack.java rename to src/main/java/com/inspect/nvr/service/impl/HikLoginResultCallBack.java index 5775953..a57f3ad 100644 --- a/src/main/java/com/inspect/simulator/service/impl/HikLoginResultCallBack.java +++ b/src/main/java/com/inspect/nvr/service/impl/HikLoginResultCallBack.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.service.impl; +package com.inspect.nvr.service.impl; -import com.inspect.simulator.hikVision.utils.jna.HCNetSDK; +import com.inspect.nvr.hikVision.utils.jna.HCNetSDK; import com.sun.jna.Pointer; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/inspect/simulator/service/impl/HikVisionServiceImpl.java b/src/main/java/com/inspect/nvr/service/impl/HikVisionServiceImpl.java similarity index 86% rename from src/main/java/com/inspect/simulator/service/impl/HikVisionServiceImpl.java rename to src/main/java/com/inspect/nvr/service/impl/HikVisionServiceImpl.java index 806975b..c3f0551 100644 --- a/src/main/java/com/inspect/simulator/service/impl/HikVisionServiceImpl.java +++ b/src/main/java/com/inspect/nvr/service/impl/HikVisionServiceImpl.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.service.impl; +package com.inspect.nvr.service.impl; import cn.hutool.core.util.ObjectUtil; @@ -6,28 +6,24 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.inspect.simulator.constant.AlgConstants; -import com.inspect.simulator.domain.Infrared.*; -import com.inspect.simulator.domain.algorithm.in.AnalyseReqItem; -import com.inspect.simulator.domain.algorithm.in.AnalyseRequest; -import com.inspect.simulator.domain.algorithm.out.AnalyseResItem; -import com.inspect.simulator.domain.algorithm.out.AnalyseResPoint; -import com.inspect.simulator.domain.algorithm.out.AnalyseResult; -import com.inspect.simulator.domain.basedata.BasedataEqpBookChannel; -import com.inspect.simulator.domain.result.BasedataPatrolPoint; -import com.inspect.simulator.hikVision.utils.AjaxResult; -import com.inspect.simulator.hikVision.utils.StringUtils; -import com.inspect.simulator.hikVision.utils.jna.HCNetSDK; -import com.inspect.simulator.hikVision.utils.jna.HikVisionUtils; -import com.inspect.simulator.mapper.BasedataEqpBookChannelMapper; -import com.inspect.simulator.mapper.BasedataPatrolPointMapper; -import com.inspect.simulator.mapper.InfraredBoxMapper; -import com.inspect.simulator.service.HikFRemoteConfigCallBack_imp; -import com.inspect.simulator.service.HikVisionService; -import com.inspect.simulator.tempCount.TempCount; -import com.inspect.simulator.utils.DateUtils; -import com.inspect.simulator.utils.redis.RedisService; -import com.inspect.simulator.utils.sftp.SftpClient; +import com.inspect.nvr.constant.AlgConstants; +import com.inspect.nvr.domain.Infrared.*; +import com.inspect.nvr.domain.algorithm.in.AnalyseReqItem; +import com.inspect.nvr.domain.algorithm.in.AnalyseRequest; +import com.inspect.nvr.domain.algorithm.out.AnalyseResItem; +import com.inspect.nvr.domain.algorithm.out.AnalyseResPoint; +import com.inspect.nvr.domain.algorithm.out.AnalyseResult; +import com.inspect.nvr.hikVision.utils.AjaxResult; +import com.inspect.nvr.hikVision.utils.StringUtils; +import com.inspect.nvr.hikVision.utils.jna.HCNetSDK; +import com.inspect.nvr.hikVision.utils.jna.HikVisionUtils; + +import com.inspect.nvr.service.HikFRemoteConfigCallBack_imp; +import com.inspect.nvr.service.HikVisionService; +import com.inspect.nvr.tempCount.TempCount; +import com.inspect.nvr.utils.DateUtils; +import com.inspect.nvr.utils.redis.RedisService; +import com.inspect.nvr.utils.sftp.SftpClient; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import okhttp3.*; @@ -107,15 +103,6 @@ public class HikVisionServiceImpl implements HikVisionService { @Resource private TempCount tempCount; - @Resource - private BasedataEqpBookChannelMapper basedataEqpBookChannelMapper; - - @Resource - public InfraredBoxMapper infraredBoxMapper; - @Autowired - private BasedataPatrolPointMapper basedataPatrolPointMapper; - - @Resource private RedisService redisService; @@ -650,71 +637,8 @@ public class HikVisionServiceImpl implements HikVisionService { @Override public AjaxResult capturePicture(InfraPictureInfo infraPictureInfo) { - log.info("capturePicture, coordinate:{}", infraPictureInfo); - final String imageType = infraPictureInfo.getImgType(); - if (AlgConstants.INFRA_CAMERA.equals(imageType)) { - Long channelId = infraPictureInfo.getChannelId(); - //channelId = 1299L; - BasedataEqpBookChannel basedataEqpBookChannel = basedataEqpBookChannelMapper.selectBasedataEqpBookChannelByChannelId(channelId); - if (basedataEqpBookChannel != null) { - int firstX = 1; - int firstY = 1; - int secondX = 639; - int secondY = 511; - int imgWidth = 640; - int imgHeight = 512; - if (infraPictureInfo.getCoordinates() != null && !infraPictureInfo.getCoordinates().isEmpty()) { - firstX = infraPictureInfo.getCoordinates().get(0).getFirstX(); - firstY = infraPictureInfo.getCoordinates().get(0).getFirstY(); - secondX = infraPictureInfo.getCoordinates().get(0).getSecondX(); - secondY = infraPictureInfo.getCoordinates().get(0).getSecondY(); - imgWidth = infraPictureInfo.getImgHeight(); - imgHeight = infraPictureInfo.getImgWidth(); - } - String channelContent = firstX + "," + firstY + "," + secondX + "," + secondY + "," + imgWidth + "," + imgHeight; - basedataEqpBookChannel.setChannelContent(channelContent); - basedataEqpBookChannelMapper.updateBasedataEqpBookChannel(basedataEqpBookChannel); - return AjaxResult.success("设置成功"); - } else { - return AjaxResult.error("点位不存在"); - } - } else if (AlgConstants.INFRA_CAMERA_REVERSE.equals(imageType)) { - return AjaxResult.success("设置成功"); - } else if (AlgConstants.INFRA_1800.equals(imageType)) { - return AjaxResult.success("设置成功"); - } else if (AlgConstants.INFRA_YU3.equals(imageType)) { - Long patrolPointId = infraPictureInfo.getPatrolPointId(); - //channelId = 1299L; - BasedataPatrolPoint basedataPatrolPoint = basedataPatrolPointMapper.selectBasedataPatrolPointByPatrolPointId(patrolPointId); - log.info("capturePicture, basedataPatrolPoint: {}", basedataPatrolPoint); - if (basedataPatrolPoint != null) { - int firstX = 1; - int firstY = 1; - int secondX = 639; - int secondY = 511; - int imgWidth = 640; - int imgHeight = 512; - if (infraPictureInfo.getCoordinates() != null && !infraPictureInfo.getCoordinates().isEmpty()) { - firstX = infraPictureInfo.getCoordinates().get(0).getFirstX(); - firstY = infraPictureInfo.getCoordinates().get(0).getFirstY(); - secondX = infraPictureInfo.getCoordinates().get(0).getSecondX(); - secondY = infraPictureInfo.getCoordinates().get(0).getSecondY(); - imgWidth = infraPictureInfo.getImgHeight(); - imgHeight = infraPictureInfo.getImgWidth(); - } - - String infraFrameContent = firstX + "," + firstY + "," + secondX + "," + secondY + "," + imgWidth + "," + imgHeight; - log.info("capturePicture, infraFrameContent: {}", infraFrameContent); - basedataPatrolPoint.setMeterType(infraFrameContent); - basedataPatrolPointMapper.updateBasedataPatrolPoint(basedataPatrolPoint); - return AjaxResult.success("设置成功"); - } else { - return AjaxResult.error("点位不存在"); - } - } else { - return AjaxResult.error("不支持该类型"); - } + return AjaxResult.success("设置成功"); } //框选温度值计算 @@ -1140,40 +1064,4 @@ public class HikVisionServiceImpl implements HikVisionService { return fileName + ".csv"; } - - @Override - public int insertInfraredBoxList(InfraPictureInfo infraPictureInfo) { - List infraredBoxes = new ArrayList<>(); - if (StringUtils.isNotEmpty(infraPictureInfo.getImgName())) { - infraredBoxMapper.deleteInfraredBoxListByImgName(infraPictureInfo.getImgName()); - for (int i = 0; i < infraPictureInfo.getCoordinates().size(); i++) { - InfraredBox box = new InfraredBox(); - box.setImgName(infraPictureInfo.getImgName()); - box.setImgWidth(infraPictureInfo.getImgWidth()); - box.setImgHeight(infraPictureInfo.getImgHeight()); - String pointXy = infraPictureInfo.getCoordinates().get(i).getFirstX() + "," + infraPictureInfo.getCoordinates().get(i).getFirstY() + "," + - infraPictureInfo.getCoordinates().get(i).getSecondX() + "," + infraPictureInfo.getCoordinates().get(i).getSecondY(); - box.setPointsXy(pointXy); - box.setMaxValue(infraPictureInfo.getCoordinates().get(i).getMaxValue()); - box.setMinValue(infraPictureInfo.getCoordinates().get(i).getMinValue()); - box.setAvgValue(infraPictureInfo.getCoordinates().get(i).getAvgValue()); - box.setBoxName(infraPictureInfo.getCoordinates().get(i).getBoxName()); - box.setWidth(infraPictureInfo.getCoordinates().get(i).getWidth()); - box.setHeight(infraPictureInfo.getCoordinates().get(i).getHeight()); - infraredBoxes.add(box); - } - } - return infraredBoxMapper.insertInfraredBoxList(infraredBoxes); - } - - @Override - public int deleteInfraredBoxListByImgName(String imgName) { - return infraredBoxMapper.deleteInfraredBoxListByImgName(imgName); - } - - @Override - public List selectInfraredBoxListByImgName(String imgName) { - return infraredBoxMapper.selectInfraredBoxListByImgName(imgName); - } - } diff --git a/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java b/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java new file mode 100644 index 0000000..b843092 --- /dev/null +++ b/src/main/java/com/inspect/nvr/service/impl/IvsCameraServiceImpl.java @@ -0,0 +1,77 @@ +package com.inspect.nvr.service.impl; + +import com.inspect.nvr.domain.device.*; +import com.inspect.nvr.service.IvsCameraService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.ClassPathResource; +import org.springframework.stereotype.Service; +import org.springframework.util.StreamUtils; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Service +public class IvsCameraServiceImpl implements IvsCameraService { + private final Logger log = LoggerFactory.getLogger(this.getClass()); + + @Value("${test-mode:false}") + private boolean testMode; + + @Override + public PtzControlResult ptzControl(PtzControlParam param) { + PtzControlResult ptzControlResult = PtzControlResult.builder() + .resultCode("0") + .build(); + return ptzControlResult; + } + + @Override + public SnapshotCommandResult platformSnapshot(String cameraCode, String domainCode, SnapshotCommandParam param) { + SnapshotCommandResult snapshotCommandResult = + SnapshotCommandResult.builder() + .taskID("0123456789") + .build(); + return snapshotCommandResult; + } + + @Override + public SnapshotInfoListResult getSnapshotList(SnapshotInfoListParam param) { + SnapshotInfoListResult.SnapshotInfoList snapshotInfoList = new SnapshotInfoListResult.SnapshotInfoList(); + List infoList = new ArrayList<>(); + infoList.add( + SnapshotInfoListResult.SnapshotInfo.builder() + .pictureUrl("http://192.168.1.172:18539/downloadfile?filesessionid=HQ3HLF98QI6T645DSNVO4S066S00") + .cameraCode("01969538357008970118") + .build()); + snapshotInfoList.setTotal(1); + snapshotInfoList.setSnapshotInfos(infoList); + SnapshotInfoListResult snapshotInfoListResult = + SnapshotInfoListResult.builder() + .snapshotInfoList(snapshotInfoList) + .build(); + return snapshotInfoListResult; + } + + @Override + public ByteArrayInputStream downloadFile(String fileSessionId) { + if (testMode) { + try { + return new ByteArrayInputStream(loadDefaultImage()); + } catch (IOException e) { + throw new RuntimeException("测试环境生成错误图片失败", e); + } + } + + // 从nvr或者camera下载图片, 开发中 + return null; + } + + public byte[] loadDefaultImage() throws IOException { + ClassPathResource imgFile = new ClassPathResource("images/infrared_default.jpg"); + return StreamUtils.copyToByteArray(imgFile.getInputStream()); + } +} diff --git a/src/main/java/com/inspect/simulator/tempCount/TempCount.java b/src/main/java/com/inspect/nvr/tempCount/TempCount.java similarity index 98% rename from src/main/java/com/inspect/simulator/tempCount/TempCount.java rename to src/main/java/com/inspect/nvr/tempCount/TempCount.java index c710e7a..c8e2aff 100644 --- a/src/main/java/com/inspect/simulator/tempCount/TempCount.java +++ b/src/main/java/com/inspect/nvr/tempCount/TempCount.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.tempCount; +package com.inspect.nvr.tempCount; import org.opencv.core.Mat; import org.opencv.core.MatOfByte; diff --git a/src/main/java/com/inspect/simulator/tempCount/TemperatureStats.java b/src/main/java/com/inspect/nvr/tempCount/TemperatureStats.java similarity index 90% rename from src/main/java/com/inspect/simulator/tempCount/TemperatureStats.java rename to src/main/java/com/inspect/nvr/tempCount/TemperatureStats.java index 5574a3a..28f538a 100644 --- a/src/main/java/com/inspect/simulator/tempCount/TemperatureStats.java +++ b/src/main/java/com/inspect/nvr/tempCount/TemperatureStats.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.tempCount; +package com.inspect.nvr.tempCount; public class TemperatureStats { diff --git a/src/main/java/com/inspect/simulator/utils/CharsetKit.java b/src/main/java/com/inspect/nvr/utils/CharsetKit.java similarity index 97% rename from src/main/java/com/inspect/simulator/utils/CharsetKit.java rename to src/main/java/com/inspect/nvr/utils/CharsetKit.java index 56a81ab..d295954 100644 --- a/src/main/java/com/inspect/simulator/utils/CharsetKit.java +++ b/src/main/java/com/inspect/nvr/utils/CharsetKit.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils; +package com.inspect.nvr.utils; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/com/inspect/simulator/utils/Convert.java b/src/main/java/com/inspect/nvr/utils/Convert.java similarity index 99% rename from src/main/java/com/inspect/simulator/utils/Convert.java rename to src/main/java/com/inspect/nvr/utils/Convert.java index 67e8d65..4e18faf 100644 --- a/src/main/java/com/inspect/simulator/utils/Convert.java +++ b/src/main/java/com/inspect/nvr/utils/Convert.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils; +package com.inspect.nvr.utils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/com/inspect/simulator/utils/DateUtils.java b/src/main/java/com/inspect/nvr/utils/DateUtils.java similarity index 99% rename from src/main/java/com/inspect/simulator/utils/DateUtils.java rename to src/main/java/com/inspect/nvr/utils/DateUtils.java index fcc32b0..0b60431 100644 --- a/src/main/java/com/inspect/simulator/utils/DateUtils.java +++ b/src/main/java/com/inspect/nvr/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils; +package com.inspect.nvr.utils; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/src/main/java/com/inspect/simulator/utils/HttpClientUtils.java b/src/main/java/com/inspect/nvr/utils/HttpClientUtils.java similarity index 99% rename from src/main/java/com/inspect/simulator/utils/HttpClientUtils.java rename to src/main/java/com/inspect/nvr/utils/HttpClientUtils.java index 943a5a6..794ed11 100644 --- a/src/main/java/com/inspect/simulator/utils/HttpClientUtils.java +++ b/src/main/java/com/inspect/nvr/utils/HttpClientUtils.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils; +package com.inspect.nvr.utils; import java.io.*; import java.net.HttpURLConnection; diff --git a/src/main/java/com/inspect/simulator/utils/StrFormatter.java b/src/main/java/com/inspect/nvr/utils/StrFormatter.java similarity index 98% rename from src/main/java/com/inspect/simulator/utils/StrFormatter.java rename to src/main/java/com/inspect/nvr/utils/StrFormatter.java index 6533faf..f776d91 100644 --- a/src/main/java/com/inspect/simulator/utils/StrFormatter.java +++ b/src/main/java/com/inspect/nvr/utils/StrFormatter.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils; +package com.inspect.nvr.utils; public class StrFormatter { public static final String EMPTY_JSON = "{}"; diff --git a/src/main/java/com/inspect/simulator/utils/StringUtils.java b/src/main/java/com/inspect/nvr/utils/StringUtils.java similarity index 99% rename from src/main/java/com/inspect/simulator/utils/StringUtils.java rename to src/main/java/com/inspect/nvr/utils/StringUtils.java index 15bd555..79c8179 100644 --- a/src/main/java/com/inspect/simulator/utils/StringUtils.java +++ b/src/main/java/com/inspect/nvr/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils; +package com.inspect.nvr.utils; import org.springframework.util.AntPathMatcher; diff --git a/src/main/java/com/inspect/simulator/utils/TimeUtils.java b/src/main/java/com/inspect/nvr/utils/TimeUtils.java similarity index 94% rename from src/main/java/com/inspect/simulator/utils/TimeUtils.java rename to src/main/java/com/inspect/nvr/utils/TimeUtils.java index 148d36f..b040ebe 100644 --- a/src/main/java/com/inspect/simulator/utils/TimeUtils.java +++ b/src/main/java/com/inspect/nvr/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils; +package com.inspect.nvr.utils; public class TimeUtils { private static final String SIPB_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; diff --git a/src/main/java/com/inspect/simulator/utils/redis/FastJson2JsonRedisSerializer.java b/src/main/java/com/inspect/nvr/utils/redis/FastJson2JsonRedisSerializer.java similarity index 97% rename from src/main/java/com/inspect/simulator/utils/redis/FastJson2JsonRedisSerializer.java rename to src/main/java/com/inspect/nvr/utils/redis/FastJson2JsonRedisSerializer.java index 93656aa..6531edc 100644 --- a/src/main/java/com/inspect/simulator/utils/redis/FastJson2JsonRedisSerializer.java +++ b/src/main/java/com/inspect/nvr/utils/redis/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils.redis; +package com.inspect.nvr.utils.redis; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.parser.ParserConfig; diff --git a/src/main/java/com/inspect/simulator/utils/redis/RedisConfig.java b/src/main/java/com/inspect/nvr/utils/redis/RedisConfig.java similarity index 98% rename from src/main/java/com/inspect/simulator/utils/redis/RedisConfig.java rename to src/main/java/com/inspect/nvr/utils/redis/RedisConfig.java index 691e133..c0134ea 100644 --- a/src/main/java/com/inspect/simulator/utils/redis/RedisConfig.java +++ b/src/main/java/com/inspect/nvr/utils/redis/RedisConfig.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils.redis; +package com.inspect.nvr.utils.redis; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonTypeInfo.As; diff --git a/src/main/java/com/inspect/simulator/utils/redis/RedisService.java b/src/main/java/com/inspect/nvr/utils/redis/RedisService.java similarity index 99% rename from src/main/java/com/inspect/simulator/utils/redis/RedisService.java rename to src/main/java/com/inspect/nvr/utils/redis/RedisService.java index 9322490..ed28255 100644 --- a/src/main/java/com/inspect/simulator/utils/redis/RedisService.java +++ b/src/main/java/com/inspect/nvr/utils/redis/RedisService.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils.redis; +package com.inspect.nvr.utils.redis; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/inspect/simulator/utils/sftp/SftpClient.java b/src/main/java/com/inspect/nvr/utils/sftp/SftpClient.java similarity index 98% rename from src/main/java/com/inspect/simulator/utils/sftp/SftpClient.java rename to src/main/java/com/inspect/nvr/utils/sftp/SftpClient.java index 81e9344..d982170 100644 --- a/src/main/java/com/inspect/simulator/utils/sftp/SftpClient.java +++ b/src/main/java/com/inspect/nvr/utils/sftp/SftpClient.java @@ -1,9 +1,9 @@ -package com.inspect.simulator.utils.sftp; +package com.inspect.nvr.utils.sftp; import com.alibaba.fastjson.JSONObject; -import com.inspect.simulator.constant.Color; -import com.inspect.simulator.utils.StringUtils; +import com.inspect.nvr.constant.Color; +import com.inspect.nvr.utils.StringUtils; import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.net.ftp.FTPSClient; import org.slf4j.Logger; diff --git a/src/main/java/com/inspect/simulator/utils/sftp/SftpConstant.java b/src/main/java/com/inspect/nvr/utils/sftp/SftpConstant.java similarity index 77% rename from src/main/java/com/inspect/simulator/utils/sftp/SftpConstant.java rename to src/main/java/com/inspect/nvr/utils/sftp/SftpConstant.java index 69c2ff9..e96b5af 100644 --- a/src/main/java/com/inspect/simulator/utils/sftp/SftpConstant.java +++ b/src/main/java/com/inspect/nvr/utils/sftp/SftpConstant.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils.sftp; +package com.inspect.nvr.utils.sftp; public class SftpConstant { public static final String CHANNEL_SNAP_PATH = "snap/"; diff --git a/src/main/java/com/inspect/simulator/utils/sftp/SftpFactory.java b/src/main/java/com/inspect/nvr/utils/sftp/SftpFactory.java similarity index 94% rename from src/main/java/com/inspect/simulator/utils/sftp/SftpFactory.java rename to src/main/java/com/inspect/nvr/utils/sftp/SftpFactory.java index 9460650..2848fd0 100644 --- a/src/main/java/com/inspect/simulator/utils/sftp/SftpFactory.java +++ b/src/main/java/com/inspect/nvr/utils/sftp/SftpFactory.java @@ -1,9 +1,6 @@ -package com.inspect.simulator.utils.sftp; +package com.inspect.nvr.utils.sftp; -import com.alibaba.fastjson.JSONObject; - -import com.inspect.simulator.constant.Color; -import com.inspect.simulator.exception.ServiceException; +import com.inspect.nvr.exception.ServiceException; import org.apache.commons.net.ftp.FTPSClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/inspect/simulator/utils/sftp/SftpLoginConfig.java b/src/main/java/com/inspect/nvr/utils/sftp/SftpLoginConfig.java similarity index 95% rename from src/main/java/com/inspect/simulator/utils/sftp/SftpLoginConfig.java rename to src/main/java/com/inspect/nvr/utils/sftp/SftpLoginConfig.java index ec6bd8c..bc7ce1a 100644 --- a/src/main/java/com/inspect/simulator/utils/sftp/SftpLoginConfig.java +++ b/src/main/java/com/inspect/nvr/utils/sftp/SftpLoginConfig.java @@ -1,4 +1,4 @@ -package com.inspect.simulator.utils.sftp; +package com.inspect.nvr.utils.sftp; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/inspect/simulator/utils/sftp/SftpUploadEntity.java b/src/main/java/com/inspect/nvr/utils/sftp/SftpUploadEntity.java similarity index 94% rename from src/main/java/com/inspect/simulator/utils/sftp/SftpUploadEntity.java rename to src/main/java/com/inspect/nvr/utils/sftp/SftpUploadEntity.java index ca84f2c..bdf8caa 100644 --- a/src/main/java/com/inspect/simulator/utils/sftp/SftpUploadEntity.java +++ b/src/main/java/com/inspect/nvr/utils/sftp/SftpUploadEntity.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.utils.sftp; +package com.inspect.nvr.utils.sftp; -import com.inspect.simulator.utils.StringUtils; +import com.inspect.nvr.utils.StringUtils; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/inspect/simulator/utils/sftp/ftpClient.java b/src/main/java/com/inspect/nvr/utils/sftp/ftpClient.java similarity index 97% rename from src/main/java/com/inspect/simulator/utils/sftp/ftpClient.java rename to src/main/java/com/inspect/nvr/utils/sftp/ftpClient.java index d344d16..382c8c4 100644 --- a/src/main/java/com/inspect/simulator/utils/sftp/ftpClient.java +++ b/src/main/java/com/inspect/nvr/utils/sftp/ftpClient.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.utils.sftp; +package com.inspect.nvr.utils.sftp; -import com.inspect.simulator.utils.StringUtils; +import com.inspect.nvr.utils.StringUtils; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; import org.slf4j.Logger; diff --git a/src/main/java/com/inspect/simulator/view/IvsPlatformSnapshotView.java b/src/main/java/com/inspect/nvr/view/IvsPlatformSnapshotView.java similarity index 91% rename from src/main/java/com/inspect/simulator/view/IvsPlatformSnapshotView.java rename to src/main/java/com/inspect/nvr/view/IvsPlatformSnapshotView.java index 6185d76..d0c07e7 100644 --- a/src/main/java/com/inspect/simulator/view/IvsPlatformSnapshotView.java +++ b/src/main/java/com/inspect/nvr/view/IvsPlatformSnapshotView.java @@ -1,6 +1,6 @@ -package com.inspect.simulator.view; +package com.inspect.nvr.view; -import com.inspect.simulator.domain.ivs.IndexRange; +import com.inspect.nvr.domain.ivs.IndexRange; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/inspect/simulator/view/IvsRecordListView.java b/src/main/java/com/inspect/nvr/view/IvsRecordListView.java similarity index 95% rename from src/main/java/com/inspect/simulator/view/IvsRecordListView.java rename to src/main/java/com/inspect/nvr/view/IvsRecordListView.java index 239f5b6..d7f0946 100644 --- a/src/main/java/com/inspect/simulator/view/IvsRecordListView.java +++ b/src/main/java/com/inspect/nvr/view/IvsRecordListView.java @@ -1,7 +1,7 @@ -package com.inspect.simulator.view; +package com.inspect.nvr.view; -import com.inspect.simulator.domain.ivs.IndexRange; -import com.inspect.simulator.domain.ivs.TimeSpan; +import com.inspect.nvr.domain.ivs.IndexRange; +import com.inspect.nvr.domain.ivs.TimeSpan; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/inspect/simulator/InspectSimulatorApplication.java b/src/main/java/com/inspect/simulator/InspectSimulatorApplication.java deleted file mode 100644 index af9074c..0000000 --- a/src/main/java/com/inspect/simulator/InspectSimulatorApplication.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.inspect.simulator; - -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.scheduling.annotation.EnableScheduling; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; -import retrofit2.converter.scalars.ScalarsConverterFactory; - -import java.util.Date; - -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -@EnableScheduling -public class InspectSimulatorApplication { - private final static Logger log = LoggerFactory.getLogger(InspectSimulatorApplication.class); - - @Value("${analysis.api.url}") - private String apiUrlOfAnalysis; - @Value("${analysis.api.token}") - private String apiTokenOfAnalysis; - - @Value("${upper.api.url}") - private String apiUrlOfUpper; -// @Value("${upper.api.token}") -// private String apiTokenOfUpper; - - OkHttpClient.Builder clientBuilderOfAnalysis = new OkHttpClient.Builder(); - Interceptor interceptorOfAnalysis = chain -> { - Request request = chain.request() - .newBuilder() -// .addHeader("Authorization", "token " + token) -// .addHeader("content-type", "application/json") - .build(); - return chain.proceed(request); - }; - - @Bean(name = "RetrofitOfAnalysis") - public Retrofit retrofitOfAnalysis() { - clientBuilderOfAnalysis.interceptors().add(interceptorOfAnalysis); - return new Retrofit.Builder() - .baseUrl(apiUrlOfAnalysis) - .client(clientBuilderOfAnalysis.build()) - .addConverterFactory(ScalarsConverterFactory.create()) -// //.addConverterFactory(GsonConverterFactory.create()) - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - } - - OkHttpClient.Builder clientBuilderOfUpper = new OkHttpClient.Builder(); - Interceptor interceptorOfUpper = chain -> { - Request request = chain.request() - .newBuilder() -// .addHeader("Authorization", "token " + token) -// .addHeader("content-type", "application/json") - .build(); - return chain.proceed(request); - }; - - @Bean(name = "RetrofitOfUpper") - public Retrofit retrofitOfUpper() { - clientBuilderOfUpper.interceptors().add(interceptorOfUpper); - return new Retrofit.Builder() - .baseUrl(apiUrlOfUpper) - .client(clientBuilderOfAnalysis.build()) - .addConverterFactory(ScalarsConverterFactory.create()) -// //.addConverterFactory(GsonConverterFactory.create()) - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - } - - public static void main(String[] args) { - SpringApplication.run(InspectSimulatorApplication.class, args); - log.info("\n<=====☆ SIMULATOR MODULE ☆ =====> \n .-------. ____ __ \n | _ _ \\ \\ \\ / / \n | ( ' ) | \\ _. / ' \n |(_ o _) / _( )_ .' \n | (_,_).' __ ___(_ o _)' \n | |\\ \\ | || |(_,_)' \n | | \\ `' /| `-' / \n | | \\ / \\ / \n ''-' `'-' `-..-' "); - - log.info("-----------------------------------------------"); - log.info("时间"+new Date()); - } - -} diff --git a/src/main/java/com/inspect/simulator/controller/AlgorithmController.java b/src/main/java/com/inspect/simulator/controller/AlgorithmController.java deleted file mode 100644 index 7212daf..0000000 --- a/src/main/java/com/inspect/simulator/controller/AlgorithmController.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.inspect.simulator.controller; - -import com.google.gson.Gson; -import com.inspect.simulator.domain.algorithm.in.AnalyseRequest; -import com.inspect.simulator.domain.algorithm.out.AnalyseResItem; -import com.inspect.simulator.domain.algorithm.out.AnalyseResPoint; -import com.inspect.simulator.domain.algorithm.out.AnalyseResult; -import com.inspect.simulator.service.AlgorithmService; -import com.inspect.simulator.service.remote.AnalysisRemoteService; -import com.inspect.simulator.utils.HttpClientUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import retrofit2.Call; -import retrofit2.Response; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -@RestController -public class AlgorithmController { - private final Logger log = LoggerFactory.getLogger(this.getClass()); - - @Resource - private AlgorithmService algorithmService; - - @PostMapping("/simu/filter/picAnalyse") - public ResponseEntity filterPicAnalyse(@RequestBody final String analyseRequestStr) { -// log.info("[FILTER] filterPicAnalyse: analyseRequestStr={}", analyseRequestStr); -// AnalyseRequest analyseRequest = new Gson().fromJson(analyseRequestStr, AnalyseRequest.class); -// log.info("[FILTER] filterPicAnalyse: analyseRequest={}", new Gson().toJson(analyseRequest)); -// -// AnalyseResult analyseResult = new AnalyseResult(); -// analyseResult.setRequestId(analyseRequest.getRequestId()); -// AnalyseResPoint analyseResPoint = new AnalyseResPoint(); -// analyseResPoint.setValue("0"); -// analyseResPoint.setConf("0.85"); -// analyseResPoint.setCode("2000"); -// analyseResPoint.setResImageUrl(analyseRequest.getObjectList().get(0).getImageUrlList()[0]); -// List analyseResPoints = new ArrayList<>(); -// analyseResPoints.add(analyseResPoint); -// AnalyseResItem analyseResItem = new AnalyseResItem(); -// analyseResItem.setObjectId(analyseRequest.getObjectList().get(0).getObjectId()); -// analyseResItem.setAlgFactory("yd"); -// analyseResItem.setResults(analyseResPoints); -// List analyseResItems = new ArrayList<>(); -// analyseResItems.add(analyseResItem); -// analyseResult.setResultList(analyseResItems); -// -// log.info("[FILTER] filterPicAnalyse: analyseResult={}", new Gson().toJson(analyseResult)); -// try { -// Call call = analysisRemoteService.picAnalyseRetNotify(analyseResult); -// Response response = call.execute(); -// Object result = response.body(); -// System.out.println("result: " + result); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// -// return ResponseEntity.ok().body("{\"code\":\"200\"}"); - return ResponseEntity.ok().body(algorithmService.filterPicAnalyse(analyseRequestStr)); - } - - @PostMapping("/simu/bigModel/picAnalyse") - public ResponseEntity bigModelPicAnalyse(@RequestBody final String analyseRequestStr) { -// log.info("[FILTER] bigModelPicAnalyse: analyseRequestStr={}", analyseRequestStr); -// AnalyseRequest analyseRequest = new Gson().fromJson(analyseRequestStr, AnalyseRequest.class); -// log.info("[FILTER] bigModelPicAnalyse: analyseRequest={}", new Gson().toJson(analyseRequest)); -// -// AnalyseResult analyseResult = new AnalyseResult(); -// analyseResult.setRequestId(analyseRequest.getRequestId()); -// AnalyseResPoint analyseResPoint = new AnalyseResPoint(); -// analyseResPoint.setValue("1"); -// analyseResPoint.setConf("0.95"); -// analyseResPoint.setCode("2000"); -// analyseResPoint.setResImageUrl(analyseRequest.getObjectList().get(0).getImageUrlList()[0]); -// List analyseResPoints = new ArrayList<>(); -// analyseResPoints.add(analyseResPoint); -// AnalyseResItem analyseResItem = new AnalyseResItem(); -// analyseResItem.setObjectId(analyseRequest.getObjectList().get(0).getObjectId()); -// analyseResItem.setAlgFactory("yd"); -// analyseResItem.setResults(analyseResPoints); -// List analyseResItems = new ArrayList<>(); -// analyseResItems.add(analyseResItem); -// analyseResult.setResultList(analyseResItems); -// -// -// if(infraredPath.equals("null")) { -// // 如果nacos中没有配置红外路径，则将结果返回调用方 -// try { -// log.info("[BIG MODEL] filterPicAnalyse: nacos file.infraredPath not config, feedback to caller, analyseResult={}", new Gson().toJson(analyseResult)); -// Call call = analysisRemoteService.picAnalyseRetNotify(analyseResult); -// Response response = call.execute(); -// Object result = response.body(); -// System.out.println("result: " + result); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } else { -// // 如果nacos中配置了红外路径，则继续调用红外模块 -// try { -// log.info("[BIG MODEL] filterPicAnalyse: continue to call infrared, infraredPath: {}, analyseRequestStr={}", infraredPath, analyseRequestStr); -// String result = HttpClientUtils.sendPostAgain(infraredPath, analyseRequestStr); -// log.info("[BIG MODEL] continue to call infrared RESULT: {}", result); -// } catch (Exception e) { -// log.info("[BIG MODEL] continue to call infrared EXCEPTION: {}", e.getMessage()); -// } -// } -// return ResponseEntity -// .ok() -// .body("{\"code\":\"200\"}"); - return ResponseEntity.ok().body(algorithmService.bigModelPicAnalyse(analyseRequestStr)); - } - - @PostMapping("/simu/infrared/picAnalyse") - public ResponseEntity infraredPicAnalyse(@RequestBody final String analyseRequestStr) { - return ResponseEntity - .ok() - .body(algorithmService.infraredPicAnalyse(analyseRequestStr)); - } - - @PostMapping("/simu/bigModel/picAnalyseRetNotify") - public ResponseEntity bigModelPicAnalyseRetNotify(@RequestBody String picAnalyseResult) { - return ResponseEntity - .ok() - .body(algorithmService.bigModelPicAnalyseRetNotify(picAnalyseResult)); - } -} diff --git a/src/main/java/com/inspect/simulator/controller/PatrolResultController.java b/src/main/java/com/inspect/simulator/controller/PatrolResultController.java deleted file mode 100644 index 9769098..0000000 --- a/src/main/java/com/inspect/simulator/controller/PatrolResultController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.inspect.simulator.controller; - -import com.inspect.simulator.domain.result.upper.MessageBody; -import com.inspect.simulator.domain.result.upper.MessageResult; -import com.inspect.simulator.domain.result.upper.TokenParam; -import com.inspect.simulator.domain.result.upper.TokenResult; -import com.inspect.simulator.service.PatrolResultService; -import com.inspect.simulator.utils.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; - -@RestController -public class PatrolResultController { - private final Logger log = LoggerFactory.getLogger(this.getClass()); - - private final PatrolResultService patrolResultService; - - public PatrolResultController(PatrolResultService patrolResultService) { - this.patrolResultService = patrolResultService; - } - - @GetMapping("/patrol/result/upper/getToken") - public ResponseEntity getUpperToken(TokenParam tokenParam) { - TokenResult tokenResult = patrolResultService.getUpperToken(tokenParam); - return ResponseEntity - .ok() - .body(tokenResult); - } - - @PostMapping("/patrol/result/upper/messageNotify") - public ResponseEntity messageNotify( - @RequestHeader(value = "token") String token, - @RequestBody MessageBody messageBody) { - log.info("messageNotify: token={}, messageBody={}", token, messageBody); - MessageResult messageResult = patrolResultService.messageNotify(token, messageBody); - return ResponseEntity - .ok() - .body(messageResult); - } - - @PostMapping("/patrol/result/upper/send") - public void sendPatrolResultToUpperSystem() { - patrolResultService.sendPatrolResultToUpperSystem(); - } - - //@Scheduled(cron = "*/6 * * * * ?") - public void sayHello() { - final long threadId = Thread.currentThread().getId(); - final String execTime = DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date()); - log.info("[{}] {} --------------hello------------------", threadId, execTime); - - int i = 0; - while (i < 10000) { - i++; - try { - Thread.sleep(1); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - - log.info("[{}] {} --------------hello------------------ i: {}", threadId, execTime, i); - } - -} diff --git a/src/main/java/com/inspect/simulator/domain/analysis/vi/AnalysisObject.java b/src/main/java/com/inspect/simulator/domain/analysis/vi/AnalysisObject.java deleted file mode 100644 index f588c13..0000000 --- a/src/main/java/com/inspect/simulator/domain/analysis/vi/AnalysisObject.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.inspect.simulator.domain.analysis.vi; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class AnalysisObject { - private String objectId; - private String imageNormalUrlPath; - private List typeList; - private List imageUrlList; -} diff --git a/src/main/java/com/inspect/simulator/domain/analysis/vi/AnalysisRequest.java b/src/main/java/com/inspect/simulator/domain/analysis/vi/AnalysisRequest.java deleted file mode 100644 index cef77bb..0000000 --- a/src/main/java/com/inspect/simulator/domain/analysis/vi/AnalysisRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.inspect.simulator.domain.analysis.vi; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class AnalysisRequest { - private String requestId; - private String taskPatrolId; - private String requestHostIp; - private String requestHostPort; - private List objectList; -} diff --git a/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResult.java b/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResult.java deleted file mode 100644 index 000dad8..0000000 --- a/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResult.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.inspect.simulator.domain.analysis.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.io.Serializable; -import java.util.List; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class AnalysisResult implements Serializable { - private String code; - private List pos; - private String resImageUrl; - private Double conf; - private String type; - private String value; - private String desc; -} diff --git a/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResultEntity.java b/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResultEntity.java deleted file mode 100644 index d87185a..0000000 --- a/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResultEntity.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.inspect.simulator.domain.analysis.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.io.Serializable; -import java.util.List; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class AnalysisResultEntity implements Serializable { - private String requestId; - private List resultList; -} diff --git a/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResultList.java b/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResultList.java deleted file mode 100644 index 4bc5ec1..0000000 --- a/src/main/java/com/inspect/simulator/domain/analysis/vo/AnalysisResultList.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.inspect.simulator.domain.analysis.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.io.Serializable; -import java.util.List; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class AnalysisResultList implements Serializable { - private String algFactory; - private String objectId; - private List results; -} diff --git a/src/main/java/com/inspect/simulator/domain/basedata/BasedataEqpBook.java b/src/main/java/com/inspect/simulator/domain/basedata/BasedataEqpBook.java deleted file mode 100644 index 453e0c2..0000000 --- a/src/main/java/com/inspect/simulator/domain/basedata/BasedataEqpBook.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.inspect.simulator.domain.basedata; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Setter -@Getter -public class BasedataEqpBook extends BaseEntity { - private static final long serialVersionUID = 1L; - - private Long eqpBookId; - - private String stationName; - - private String stationCode; - - private Long areaId; - - private String areaName; - - private String patrolDeviceName; - - private String patrolDeviceCode; - - private String deviceModel; - - private String manufacturer; - - private String useUnit; - - private String deviceSource; - - private String productionDate; - - private String productionCode; - - private String isTransport; - - private String useMode; - - private String videoMode; - - private String place; - - private String positionX; - - private String positionY; - - private String positionZ; - - private String type; - - private String patrolDeviceInfo; - - private String robotsCode; - - private String ipAddr; - - private String port; - - private String user; - - private String password; - private String delFlag; - - private String mainSystemCode; - - private String mapFilePath; - - private String videoNvrCode; - - @Override - public String toString() { - return "BasedataEqpBook{" + - "eqpBookId=" + eqpBookId + - ", stationName='" + stationName + '\'' + - ", stationCode='" + stationCode + '\'' + - ", areaId=" + areaId + - ", areaName='" + areaName + '\'' + - ", patrolDeviceName='" + patrolDeviceName + '\'' + - ", patrolDeviceCode='" + patrolDeviceCode + '\'' + - ", deviceModel='" + deviceModel + '\'' + - ", manufacturer='" + manufacturer + '\'' + - ", useUnit='" + useUnit + '\'' + - ", deviceSource='" + deviceSource + '\'' + - ", productionDate='" + productionDate + '\'' + - ", productionCode='" + productionCode + '\'' + - ", isTransport='" + isTransport + '\'' + - ", useMode='" + useMode + '\'' + - ", videoMode='" + videoMode + '\'' + - ", place='" + place + '\'' + - ", positionX='" + positionX + '\'' + - ", positionY='" + positionY + '\'' + - ", positionZ='" + positionZ + '\'' + - ", type='" + type + '\'' + - ", patrolDeviceInfo='" + patrolDeviceInfo + '\'' + - ", robotsCode='" + robotsCode + '\'' + - ", ipAddr='" + ipAddr + '\'' + - ", port='" + port + '\'' + - ", user='" + user + '\'' + - ", password='" + password + '\'' + - ", delFlag='" + delFlag + '\'' + - ", mainSystemCode='" + mainSystemCode + '\'' + - ", mapFilePath='" + mapFilePath + '\'' + - ", videoNvrCode='" + videoNvrCode + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/basedata/BasedataEqpBookChannel.java b/src/main/java/com/inspect/simulator/domain/basedata/BasedataEqpBookChannel.java deleted file mode 100644 index e144deb..0000000 --- a/src/main/java/com/inspect/simulator/domain/basedata/BasedataEqpBookChannel.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.inspect.simulator.domain.basedata; -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class BasedataEqpBookChannel extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long channelId; - private String channelCode; - - private String channelName; - - private String parentChannelId; - - private Long eqpBookId; - - private String eqpBookName; - - private String channelType; - - private String onlineState; - - private String channelContent; - - private String provider; - - private String address; - - private String host; - - private String port; - - private String deleteFlag; - - private String patrolDeviceCode; - - private String username; - - private String password; - - private String deviceSource; - - @Override - public String toString() { - return "BasedataEqpBookChannel{" + - "channelId=" + channelId + - ", channelCode='" + channelCode + '\'' + - ", channelName='" + channelName + '\'' + - ", parentChannelId='" + parentChannelId + '\'' + - ", eqpBookId=" + eqpBookId + - ", eqpBookName='" + eqpBookName + '\'' + - ", channelType='" + channelType + '\'' + - ", onlineState='" + onlineState + '\'' + - ", channelContent='" + channelContent + '\'' + - ", provider='" + provider + '\'' + - ", address='" + address + '\'' + - ", host='" + host + '\'' + - ", port='" + port + '\'' + - ", deleteFlag='" + deleteFlag + '\'' + - ", patrolDeviceCode='" + patrolDeviceCode + '\'' + - ", username='" + username + '\'' + - ", password='" + password + '\'' + - ", deviceSource='" + deviceSource + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/AlgInfo.java b/src/main/java/com/inspect/simulator/domain/result/AlgInfo.java deleted file mode 100644 index 32b93c2..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/AlgInfo.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.inspect.simulator.domain.result; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class AlgInfo { - private String algSubtypeName; - private String algSubtypeCode; - private String algName; - -} diff --git a/src/main/java/com/inspect/simulator/domain/result/BasePointAreaInfo.java b/src/main/java/com/inspect/simulator/domain/result/BasePointAreaInfo.java deleted file mode 100644 index 1f33f00..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/BasePointAreaInfo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.inspect.simulator.domain.result; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Objects; - -@Setter -@Getter -public class BasePointAreaInfo { - private String patrolPointId; - private String patrolPointName; - private String deviceName; - private String mainName; - private String jgName; - private String areaName; - - @Override - public boolean equals(Object object) { - if (this == object) return true; - if (object == null || getClass() != object.getClass()) return false; - BasePointAreaInfo that = (BasePointAreaInfo) object; - return Objects.equals(patrolPointId, that.patrolPointId) && Objects.equals(patrolPointName, that.patrolPointName) && Objects.equals(deviceName, that.deviceName) && Objects.equals(mainName, that.mainName) && Objects.equals(jgName, that.jgName) && Objects.equals(areaName, that.areaName); - } - - @Override - public int hashCode() { - return Objects.hash(patrolPointId, patrolPointName, deviceName, mainName, jgName, areaName); - } - - @Override - public String toString() { - return "BasePointAreaInfo{" + - "patrolPointId='" + patrolPointId + '\'' + - ", patrolPointName='" + patrolPointName + '\'' + - ", deviceName='" + deviceName + '\'' + - ", mainName='" + mainName + '\'' + - ", jgName='" + jgName + '\'' + - ", areaName='" + areaName + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/BasedataEqpBookMoMain.java b/src/main/java/com/inspect/simulator/domain/result/BasedataEqpBookMoMain.java deleted file mode 100644 index 37ae67b..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/BasedataEqpBookMoMain.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.inspect.simulator.domain.BaseEntity; -import lombok.*; - -import java.util.List; - -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class BasedataEqpBookMoMain extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long eqpBookId; - - private String stationName; - - private String stationCode; - - private Long areaId; - - private String areaName; - - private String patrolDeviceName; - - private String patrolDeviceCode; - - private String deviceModel; - - private String manufacturer; - - private String useUnit; - - private String deviceSource; - - private String productionDate; - - private String productionCode; - - private String isTransport; - - private String useMode; - - private String videoMode; - - private String place; - - private String positionX; - - private String positionY; - - private String positionZ; - - private String type; - - private String patrolDeviceInfo; - - private String robotsCode; - - private String ipAddr; - - private String port; - - private String user; - - private String password; - private String mainSystemCode; - private String delFlag; - private List algId; - private List patrolTaskList; -} diff --git a/src/main/java/com/inspect/simulator/domain/result/BasedataPatrolPoint.java b/src/main/java/com/inspect/simulator/domain/result/BasedataPatrolPoint.java deleted file mode 100644 index c2339b8..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/BasedataPatrolPoint.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; - - - -@Setter -@Getter -public class BasedataPatrolPoint extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long patrolPointId; - private String patrolPointCode; - private String patrolPointName; - private Long deviceTypeId; - private Long mainDeviceId; - private Long deviceId; - private String deviceName; - private String patrolContent; - private String purpose; - private String deleteFlag; - private Long stdParolPointId; - private Long areaId; - private String patrolTypeId; - private String pointImptLevel; - private String alarmThreshold; - private String algSubtypeId; - private String algSubtypeName; - private String lowerValue; - private String upperValue; - private String positionX; - private String positionY; - private String positionZ; - private String algSubtypeIds; - private String originalAlgSubtypeIds; - private String originalDeviceId; - private String disRefPicturePath; - private String originalMainDeviceId; - private String meterType; - - @Override - public String toString() { - return "BasedataPatrolPoint{" + - "patrolPointId=" + patrolPointId + - ", patrolPointCode='" + patrolPointCode + '\'' + - ", patrolPointName='" + patrolPointName + '\'' + - ", deviceTypeId=" + deviceTypeId + - ", mainDeviceId=" + mainDeviceId + - ", deviceId=" + deviceId + - ", deviceName='" + deviceName + '\'' + - ", patrolContent='" + patrolContent + '\'' + - ", purpose='" + purpose + '\'' + - ", deleteFlag='" + deleteFlag + '\'' + - ", stdParolPointId=" + stdParolPointId + - ", areaId=" + areaId + - ", patrolTypeId='" + patrolTypeId + '\'' + - ", pointImptLevel='" + pointImptLevel + '\'' + - ", alarmThreshold='" + alarmThreshold + '\'' + - ", algSubtypeId='" + algSubtypeId + '\'' + - ", algSubtypeName='" + algSubtypeName + '\'' + - ", lowerValue='" + lowerValue + '\'' + - ", upperValue='" + upperValue + '\'' + - ", positionX='" + positionX + '\'' + - ", positionY='" + positionY + '\'' + - ", positionZ='" + positionZ + '\'' + - ", algSubtypeIds='" + algSubtypeIds + '\'' + - ", originalAlgSubtypeIds='" + originalAlgSubtypeIds + '\'' + - ", originalDeviceId='" + originalDeviceId + '\'' + - ", disRefPicturePath='" + disRefPicturePath + '\'' + - ", originalMainDeviceId='" + originalMainDeviceId + '\'' + - ", meterType='" + meterType + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolData.java b/src/main/java/com/inspect/simulator/domain/result/PatrolData.java deleted file mode 100644 index 339633e..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolData.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.inspect.simulator.domain.result; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class PatrolData { - private String lineId; - private String pointName; - private String patrolTime; - private String pointStatus; - private String warnStatus; - private String desc; - private String img; - private String imgType; - private String imgAnalyse; - private String dataType; - -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPos.java b/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPos.java deleted file mode 100644 index 7781dd4..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPos.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.inspect.simulator.domain.BaseEntity; -import lombok.*; - -import java.util.Objects; - -@Getter -@Setter -public class PatrolPresetPos extends BaseEntity { - private static final long serialVersionUID = 1L; - private String presetPosId; - private String presetPosCode; - private String presetPosName; - private Long patrolPointId; - private String channelId; - private String coordinateType; - private Long stopTime; - private String channelImg; - private String description; - private String isEnable; - private String algSubtypeCode; - private String eqpBookId; - private String channelCode; - private String channelType; - private String patrolDeviceCode; - private String stdParolPointId; - private String deviceId; - private String patrolDeviceName; - private String videoNvrCode; - private String channelContent; - - @Override - public boolean equals(Object object) { - if (this == object) return true; - if (object == null || getClass() != object.getClass()) return false; - PatrolPresetPos that = (PatrolPresetPos) object; - return Objects.equals(presetPosId, that.presetPosId) && Objects.equals(presetPosCode, that.presetPosCode) && Objects.equals(presetPosName, that.presetPosName) && Objects.equals(patrolPointId, that.patrolPointId) && Objects.equals(channelId, that.channelId) && Objects.equals(coordinateType, that.coordinateType) && Objects.equals(stopTime, that.stopTime) && Objects.equals(channelImg, that.channelImg) && Objects.equals(description, that.description) && Objects.equals(isEnable, that.isEnable) && Objects.equals(algSubtypeCode, that.algSubtypeCode) && Objects.equals(eqpBookId, that.eqpBookId) && Objects.equals(channelCode, that.channelCode) && Objects.equals(channelType, that.channelType) && Objects.equals(patrolDeviceCode, that.patrolDeviceCode) && Objects.equals(stdParolPointId, that.stdParolPointId) && Objects.equals(deviceId, that.deviceId) && Objects.equals(patrolDeviceName, that.patrolDeviceName) && Objects.equals(videoNvrCode, that.videoNvrCode) && Objects.equals(channelContent, that.channelContent); - } - - @Override - public int hashCode() { - return Objects.hash(presetPosId, presetPosCode, presetPosName, patrolPointId, channelId, coordinateType, stopTime, channelImg, description, isEnable, algSubtypeCode, eqpBookId, channelCode, channelType, patrolDeviceCode, stdParolPointId, deviceId, patrolDeviceName, videoNvrCode, channelContent); - } - - @Override - public String toString() { - return "PatrolPresetPos{" + - "presetPosId='" + presetPosId + '\'' + - ", presetPosCode='" + presetPosCode + '\'' + - ", presetPosName='" + presetPosName + '\'' + - ", patrolPointId=" + patrolPointId + - ", channelId='" + channelId + '\'' + - ", coordinateType='" + coordinateType + '\'' + - ", stopTime=" + stopTime + - ", channelImg='" + channelImg + '\'' + - ", description='" + description + '\'' + - ", isEnable='" + isEnable + '\'' + - ", algSubtypeCode='" + algSubtypeCode + '\'' + - ", eqpBookId='" + eqpBookId + '\'' + - ", channelCode='" + channelCode + '\'' + - ", channelType='" + channelType + '\'' + - ", patrolDeviceCode='" + patrolDeviceCode + '\'' + - ", stdParolPointId='" + stdParolPointId + '\'' + - ", deviceId='" + deviceId + '\'' + - ", patrolDeviceName='" + patrolDeviceName + '\'' + - ", videoNvrCode='" + videoNvrCode + '\'' + - ", channelContent='" + channelContent + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPosModule.java b/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPosModule.java deleted file mode 100644 index 515a713..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPosModule.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.inspect.simulator.domain.result; - - -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -@Setter -@Getter -public class PatrolPresetPosModule extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long presetPosId; - private String presetPosCode; - - private String presetPosName; - - private Long eqpBookId; - - private String patrolDeviceCode; - - private Long patrolPointId; - - private Long channelId; - - private String channelCode; - - private String channelType; - - private String coordinateType; - - private Long stopTime; - - private String channelImg; - - private String description; - - private String algSubtypeCode; - - private String isEnable; - private String algName; - - @Override - public String toString() { - return "PatrolPresetPosModule{" + - "presetPosId=" + presetPosId + - ", presetPosCode='" + presetPosCode + '\'' + - ", presetPosName='" + presetPosName + '\'' + - ", eqpBookId=" + eqpBookId + - ", patrolDeviceCode='" + patrolDeviceCode + '\'' + - ", patrolPointId=" + patrolPointId + - ", channelId=" + channelId + - ", channelCode='" + channelCode + '\'' + - ", channelType='" + channelType + '\'' + - ", coordinateType='" + coordinateType + '\'' + - ", stopTime=" + stopTime + - ", channelImg='" + channelImg + '\'' + - ", description='" + description + '\'' + - ", algSubtypeCode='" + algSubtypeCode + '\'' + - ", isEnable='" + isEnable + '\'' + - ", algName='" + algName + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolResult.java b/src/main/java/com/inspect/simulator/domain/result/PatrolResult.java deleted file mode 100644 index 57166ae..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolResult.java +++ /dev/null @@ -1,223 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; - -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; -import java.util.List; - -@Setter -@Getter -public class PatrolResult extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long lineId; - - @JsonProperty("patroldeviceName") - private String patrolDeviceName; - - @JsonProperty("patroldeviceCode") - private String patrolDeviceCode; - - private String taskName; - - private String taskCode; - - private String deviceName; - - private String deviceId; - - private String valueType; - - private String value; - - private String valueUnit; - private String unit; - private String time; - - private String recognitionType; - - private String fileType; - - private String filePath; - - private String rectangle; - - private String taskPatrolledId; - - private String valid; - - private String patrolStatus; - - private String checkPerson; - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - - private String checkTime; - private String checkResult; - - private String materialId; - - private String dataType; - - private String threshold; - private String taskId; - private String presetPosCode; - private String description; - private List infraRed; - private List visible; - private List audio; - private List video; - private List photo; - private String areaName; - private String areaType; - private String deviceNam; - @JsonProperty("devicetypName") - private String deviceTypeName; - private String mainId; - private String defectType; - private String beginTime; - private String endTime; - private String alarmType; - private String resultContent; - private String devNo; - private String componentName; - private String componentId; - private String bayName; - private String areaId; - private String mainDevId; - @JsonProperty("warnlevel") - private String warnLevel; - private String photoUrl; - private String videoUrl; - private String desc; - private String deviceCode; - private String devType; - private String phase; - private String status; - private String pointStatus; - private String suggestion; - private String resStatus; - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - private Date createTime; - private String content; - private List algId; - @JsonProperty("patrolpointName") - private String patrolPointName; - private String channelCode; - - private String pointName; - - private String algorithmsType; - - private String algorithmsName; - private String sampleRaw; - private String fitlerDefect; - private String mllmDefect; - private String fitlerDiffBase; - private String fitlerResultCode; - private String mllmResultCode; - private String filter; - - private String resImgUrl; - private String imageNormalUrlPath; - private String resultType; - - - public PatrolResult(String mainId) { - this.mainId = mainId; - } - - public PatrolResult() { - } - - @Override - public String toString() { - return "PatrolResult{" + - "lineId=" + lineId + - ", patrolDeviceName='" + patrolDeviceName + '\'' + - ", patrolDeviceCode='" + patrolDeviceCode + '\'' + - ", taskName='" + taskName + '\'' + - ", taskCode='" + taskCode + '\'' + - ", deviceName='" + deviceName + '\'' + - ", deviceId='" + deviceId + '\'' + - ", valueType='" + valueType + '\'' + - ", value='" + value + '\'' + - ", valueUnit='" + valueUnit + '\'' + - ", unit='" + unit + '\'' + - ", time='" + time + '\'' + - ", recognitionType='" + recognitionType + '\'' + - ", fileType='" + fileType + '\'' + - ", filePath='" + filePath + '\'' + - ", rectangle='" + rectangle + '\'' + - ", taskPatrolledId='" + taskPatrolledId + '\'' + - ", valid='" + valid + '\'' + - ", patrolStatus='" + patrolStatus + '\'' + - ", checkPerson='" + checkPerson + '\'' + - ", checkTime='" + checkTime + '\'' + - ", checkResult='" + checkResult + '\'' + - ", materialId='" + materialId + '\'' + - ", dataType='" + dataType + '\'' + - ", threshold='" + threshold + '\'' + - ", taskId='" + taskId + '\'' + - ", presetPosCode='" + presetPosCode + '\'' + - ", description='" + description + '\'' + - ", infraRed=" + infraRed + - ", visible=" + visible + - ", audio=" + audio + - ", video=" + video + - ", photo=" + photo + - ", areaName='" + areaName + '\'' + - ", areaType='" + areaType + '\'' + - ", deviceNam='" + deviceNam + '\'' + - ", deviceTypeName='" + deviceTypeName + '\'' + - ", mainId='" + mainId + '\'' + - ", defectType='" + defectType + '\'' + - ", beginTime='" + beginTime + '\'' + - ", endTime='" + endTime + '\'' + - ", alarmType='" + alarmType + '\'' + - ", resultContent='" + resultContent + '\'' + - ", devNo='" + devNo + '\'' + - ", componentName='" + componentName + '\'' + - ", componentId='" + componentId + '\'' + - ", bayName='" + bayName + '\'' + - ", areaId='" + areaId + '\'' + - ", mainDevId='" + mainDevId + '\'' + - ", warnLevel='" + warnLevel + '\'' + - ", photoUrl='" + photoUrl + '\'' + - ", videoUrl='" + videoUrl + '\'' + - ", desc='" + desc + '\'' + - ", deviceCode='" + deviceCode + '\'' + - ", devType='" + devType + '\'' + - ", phase='" + phase + '\'' + - ", status='" + status + '\'' + - ", pointStatus='" + pointStatus + '\'' + - ", suggestion='" + suggestion + '\'' + - ", resStatus='" + resStatus + '\'' + - ", createTime=" + createTime + - ", content='" + content + '\'' + - ", algId=" + algId + - ", patrolPointName='" + patrolPointName + '\'' + - ", channelCode='" + channelCode + '\'' + - ", pointName='" + pointName + '\'' + - ", algorithmsType='" + algorithmsType + '\'' + - ", algorithmsName='" + algorithmsName + '\'' + - ", sampleRaw='" + sampleRaw + '\'' + - ", fitlerDefect='" + fitlerDefect + '\'' + - ", mllmDefect='" + mllmDefect + '\'' + - ", fitlerDiffBase='" + fitlerDiffBase + '\'' + - ", fitlerResultCode='" + fitlerResultCode + '\'' + - ", mllmResultCode='" + mllmResultCode + '\'' + - ", filter='" + filter + '\'' + - ", resImgUrl='" + resImgUrl + '\'' + - ", imageNormalUrlPath='" + imageNormalUrlPath + '\'' + - ", resultType='" + resultType + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolResultRef.java b/src/main/java/com/inspect/simulator/domain/result/PatrolResultRef.java deleted file mode 100644 index 36d5d68..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolResultRef.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.inspect.simulator.domain.result; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Objects; - -@Setter -@Getter -public class PatrolResultRef { - private String lineId; - private String deviceId; - private String devType; - private String time; - private String value; - private String threshold; - private String filePath; - private String description; - private String pointStatus; - private String valueUnit; - private String resultContent; - - @Override - public boolean equals(Object object) { - if (this == object) return true; - if (object == null || getClass() != object.getClass()) return false; - PatrolResultRef that = (PatrolResultRef) object; - return Objects.equals(lineId, that.lineId) && Objects.equals(deviceId, that.deviceId) && Objects.equals(devType, that.devType) && Objects.equals(time, that.time) && Objects.equals(value, that.value) && Objects.equals(threshold, that.threshold) && Objects.equals(filePath, that.filePath) && Objects.equals(description, that.description) && Objects.equals(pointStatus, that.pointStatus) && Objects.equals(valueUnit, that.valueUnit) && Objects.equals(resultContent, that.resultContent); - } - - @Override - public int hashCode() { - return Objects.hash(lineId, deviceId, devType, time, value, threshold, filePath, description, pointStatus, valueUnit, resultContent); - } - - @Override - public String toString() { - return "PatrolResultRef{" + - "lineId='" + lineId + '\'' + - ", deviceId='" + deviceId + '\'' + - ", devType='" + devType + '\'' + - ", time='" + time + '\'' + - ", value='" + value + '\'' + - ", threshold='" + threshold + '\'' + - ", filePath='" + filePath + '\'' + - ", description='" + description + '\'' + - ", pointStatus='" + pointStatus + '\'' + - ", valueUnit='" + valueUnit + '\'' + - ", resultContent='" + resultContent + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolTaskDomain.java b/src/main/java/com/inspect/simulator/domain/result/PatrolTaskDomain.java deleted file mode 100644 index c423864..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolTaskDomain.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; -import java.util.List; - -@Setter -@Getter -public class PatrolTaskDomain extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long taskId; - - private String stationName; - - private String stationCode; - - private String type; - - private String taskCode; - - private String taskName; - - private String priority; - - private String deviceLevel; - - private String deviceList; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date fixedStartTime; - - private String cycleMonth; - - private String cycleWeek; - - private String cycleExecuteTime; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date cycleStartTime; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date cycleEndTime; - - private String intervalNumber; - - private String intervalType; - - private Date intervalExecuteTime; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date intervalStartTime; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date intervalEndTime; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date invalidStartTime; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date invalidEndTime; - - private String isEnable; - - private String creator; - - private String executionStatus; - - private String fileStatus; - private String taskCycle; - private String prevPoints; - private String devNo; - private List patrolTaskStatusList; - private List basedataEqpbookList; - -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolTaskStatus.java b/src/main/java/com/inspect/simulator/domain/result/PatrolTaskStatus.java deleted file mode 100644 index 32a1c7f..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolTaskStatus.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import com.inspect.simulator.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -@Setter -@Getter -@Builder -@AllArgsConstructor - -public class PatrolTaskStatus extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long lineId; - - private String taskPatrolledId; - - private String taskName; - - private String taskCode; - - private String taskState; - @JsonFormat( - pattern = "yyyy-MM- HH:mm:ss" - ) - private Date planStartTime; - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - - private Date startTime; - - private String taskProgress; - - private String taskEstimatedTime; - - private String description; - - private String posType; - - private String code; - - private String pos; - private String patrolType; - private String timeType; - private String timeConditions; - private String beginTime; - private String endTime; - private Date createTime; - private String patrolStatus; - private int year; - private String devNo; - private String command; - private String pointCount; - private String execType; - - public PatrolTaskStatus(String taskPatrolledId) { - this.taskPatrolledId = taskPatrolledId; - } - - public PatrolTaskStatus() { - } - - @Override - public String toString() { - return "PatrolTaskStatus{" + - "lineId=" + lineId + - ", taskPatrolledId='" + taskPatrolledId + '\'' + - ", taskName='" + taskName + '\'' + - ", taskCode='" + taskCode + '\'' + - ", taskState='" + taskState + '\'' + - ", planStartTime=" + planStartTime + - ", startTime=" + startTime + - ", taskProgress='" + taskProgress + '\'' + - ", taskEstimatedTime='" + taskEstimatedTime + '\'' + - ", description='" + description + '\'' + - ", posType='" + posType + '\'' + - ", code='" + code + '\'' + - ", pos='" + pos + '\'' + - ", patrolType='" + patrolType + '\'' + - ", timeType='" + timeType + '\'' + - ", timeConditions='" + timeConditions + '\'' + - ", beginTime='" + beginTime + '\'' + - ", endTime='" + endTime + '\'' + - ", createTime=" + createTime + - ", patrolStatus='" + patrolStatus + '\'' + - ", year=" + year + - ", devNo='" + devNo + '\'' + - ", command='" + command + '\'' + - ", pointCount='" + pointCount + '\'' + - ", execType='" + execType + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolTaskStatusDomain.java b/src/main/java/com/inspect/simulator/domain/result/PatrolTaskStatusDomain.java deleted file mode 100644 index df94f19..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolTaskStatusDomain.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -@Setter -@Getter -public class PatrolTaskStatusDomain extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long lineId; - private String taskPatrolledId; - - private String taskName; - - private String taskCode; - - private String taskState; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date planStartTime; - @JsonFormat( - pattern = "yyyy-MM-dd" - ) - - private Date startTime; - - private String taskProgress; - - private String taskEstimatedTime; - - private String description; - - private String posType; - - private String code; - - private String pos; - - private String patrolType; - private String timeType; - private String timeConditions; - private String beginTime; - private String endTime; - - @Override - public String toString() { - return "PatrolTaskStatusDomain{" + - "lineId=" + lineId + - ", taskPatrolledId='" + taskPatrolledId + '\'' + - ", taskName='" + taskName + '\'' + - ", taskCode='" + taskCode + '\'' + - ", taskState='" + taskState + '\'' + - ", planStartTime=" + planStartTime + - ", startTime=" + startTime + - ", taskProgress='" + taskProgress + '\'' + - ", taskEstimatedTime='" + taskEstimatedTime + '\'' + - ", description='" + description + '\'' + - ", posType='" + posType + '\'' + - ", code='" + code + '\'' + - ", pos='" + pos + '\'' + - ", patrolType='" + patrolType + '\'' + - ", timeType='" + timeType + '\'' + - ", timeConditions='" + timeConditions + '\'' + - ", beginTime='" + beginTime + '\'' + - ", endTime='" + endTime + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolUpdataLog.java b/src/main/java/com/inspect/simulator/domain/result/PatrolUpdataLog.java deleted file mode 100644 index ed451f8..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/PatrolUpdataLog.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.inspect.simulator.domain.result; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * @author WGY - * @create 2025-03-31 11:33 - **/ -@Data -@TableName("patrol_updata_log") -public class PatrolUpdataLog { - private static final long serialVersionUID = 1L; - @TableId - private Long logId; - - private String algorithmsType; - - private String resultCode; - - private String upNum; - - private String filter; - - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - private Date createTime; -} diff --git a/src/main/java/com/inspect/simulator/domain/result/ResultValue.java b/src/main/java/com/inspect/simulator/domain/result/ResultValue.java deleted file mode 100644 index bec2617..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/ResultValue.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.inspect.simulator.domain.result; - -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; - -@Setter -@Getter -public class ResultValue implements Serializable { - private static final long serialVersionUID = 1L; - private Long lineId; - private String areaName; - private String deviceName; - private String patrolDeviceName; - private String patrolPointName; - private String value; - private String createTime; - - @Override - public String toString() { - return "ResultValue{" + - "lineId=" + lineId + - ", areaName='" + areaName + '\'' + - ", deviceName='" + deviceName + '\'' + - ", patrolDeviceName='" + patrolDeviceName + '\'' + - ", patrolPointName='" + patrolPointName + '\'' + - ", value='" + value + '\'' + - ", createTime='" + createTime + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/TaskStatisticsConfig.java b/src/main/java/com/inspect/simulator/domain/result/TaskStatisticsConfig.java deleted file mode 100644 index 0c21680..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/TaskStatisticsConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.inspect.simulator.domain.result; - - -import com.inspect.simulator.domain.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class TaskStatisticsConfig extends BaseEntity { - private static final long serialVersionUID = 1L; - private Long id; - - private String type; - - private String taskCode; - - private String threshold; - - private String msg; - - @Override - public String toString() { - return "TaskStatisticsConfig{" + - "id=" + id + - ", type='" + type + '\'' + - ", taskCode='" + taskCode + '\'' + - ", threshold='" + threshold + '\'' + - ", msg='" + msg + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/upper/MessageBody.java b/src/main/java/com/inspect/simulator/domain/result/upper/MessageBody.java deleted file mode 100644 index 9350739..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/upper/MessageBody.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.inspect.simulator.domain.result.upper; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -public class MessageBody { - private String provinceCode; - - private String stationCode; - - private String voltLevel; - - private List samples; - - @Override - public String toString() { - return "MessageBody{" + - "provinceCode='" + provinceCode + '\'' + - ", stationCode='" + stationCode + '\'' + - ", voltLevel=" + voltLevel + - ", samples=" + samples + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java b/src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java deleted file mode 100644 index 414c44d..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/upper/MessageData.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.inspect.simulator.domain.result.upper; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class MessageData { - private String areaName; - - private String deviceName; - - private String pointName; - - private String time; - - private String algorithmsName; - - private String algorithmsType; - - private String sampleRaw; - - private String fitlerDefect; - - private String mllmDefect; - - private String fitlerDiffBase; - - private String fitlerResultCode; - - private String mllmResultCode; - - @Override - public String toString() { - return "MessageData{" + - "areaName='" + areaName + '\'' + - ", deviceName='" + deviceName + '\'' + - ", pointName='" + pointName + '\'' + - ", time='" + time + '\'' + - ", algorithmsName='" + algorithmsName + '\'' + - ", algorithmsType='" + algorithmsType + '\'' + - ", sampleRaw='" + sampleRaw + '\'' + - ", fitlerDefect='" + fitlerDefect + '\'' + - ", mllmDefect='" + mllmDefect + '\'' + - ", fitlerDiffBase='" + fitlerDiffBase + '\'' + - ", fitlerResultCode='" + fitlerResultCode + '\'' + - ", mllmResultCode='" + mllmResultCode + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/upper/MessageResult.java b/src/main/java/com/inspect/simulator/domain/result/upper/MessageResult.java deleted file mode 100644 index 091a26c..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/upper/MessageResult.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.inspect.simulator.domain.result.upper; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class MessageResult { - private Integer code; - private String msg; - private String resultCode; - private Boolean success; - private Data data; - - @Override - public String toString() { - return "MessageResult{" + - "code=" + code + - ", msg='" + msg + '\'' + - ", resultCode='" + resultCode + '\'' + - ", success=" + success + - ", data=" + data + - '}'; - } - - @Getter - @Setter - public static class Data { - private Integer code; - private String msg; - private Integer data; - private String resultCode; - private Boolean success; - - @Override - public String toString() { - return "Data{" + - "code=" + code + - ", msg='" + msg + '\'' + - ", data=" + data + - ", resultCode='" + resultCode + '\'' + - ", success=" + success + - '}'; - } - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/upper/TokenData.java b/src/main/java/com/inspect/simulator/domain/result/upper/TokenData.java deleted file mode 100644 index e238970..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/upper/TokenData.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.inspect.simulator.domain.result.upper; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Objects; - -@Getter -@Setter -public class TokenData { - private Integer expiresIn; - - private String refreshToken; - - private String token; - - private String tokenHead; - - @Override - public boolean equals(Object object) { - if (this == object) return true; - if (object == null || getClass() != object.getClass()) return false; - TokenData tokenData = (TokenData) object; - return Objects.equals(expiresIn, tokenData.expiresIn) && Objects.equals(refreshToken, tokenData.refreshToken) && Objects.equals(token, tokenData.token) && Objects.equals(tokenHead, tokenData.tokenHead); - } - - @Override - public int hashCode() { - return Objects.hash(expiresIn, refreshToken, token, tokenHead); - } - - @Override - public String toString() { - return "TokenData{" + - "expiresIn=" + expiresIn + - ", refreshToken='" + refreshToken + '\'' + - ", token='" + token + '\'' + - ", tokenHead='" + tokenHead + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/upper/TokenParam.java b/src/main/java/com/inspect/simulator/domain/result/upper/TokenParam.java deleted file mode 100644 index 65bfe9a..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/upper/TokenParam.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.inspect.simulator.domain.result.upper; - -import lombok.Getter; -import lombok.Setter; - -import java.util.Objects; - -@Getter -@Setter -public class TokenParam { - private String grantType; - private String clientId; - private String clientSecret; - - @Override - public boolean equals(Object object) { - if (this == object) return true; - if (object == null || getClass() != object.getClass()) return false; - TokenParam that = (TokenParam) object; - return Objects.equals(grantType, that.grantType) && Objects.equals(clientId, that.clientId) && Objects.equals(clientSecret, that.clientSecret); - } - - @Override - public int hashCode() { - return Objects.hash(grantType, clientId, clientSecret); - } - - @Override - public String toString() { - return "TokenParam{" + - "grantType='" + grantType + '\'' + - ", clientId='" + clientId + '\'' + - ", clientSecret='" + clientSecret + '\'' + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/domain/result/upper/TokenResult.java b/src/main/java/com/inspect/simulator/domain/result/upper/TokenResult.java deleted file mode 100644 index b09d40d..0000000 --- a/src/main/java/com/inspect/simulator/domain/result/upper/TokenResult.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.inspect.simulator.domain.result.upper; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class TokenResult { - private Integer code; - - private String msg; - - private String resultCode; - - private TokenData data; - - private Boolean success; - - @Override - public String toString() { - return "TokenResult{" + - "code=" + code + - ", msg='" + msg + '\'' + - ", resultCode='" + resultCode + '\'' + - ", data=" + data + - ", success=" + success + - '}'; - } -} diff --git a/src/main/java/com/inspect/simulator/mapper/BasedataEqpBookChannelMapper.java b/src/main/java/com/inspect/simulator/mapper/BasedataEqpBookChannelMapper.java deleted file mode 100644 index 99921d4..0000000 --- a/src/main/java/com/inspect/simulator/mapper/BasedataEqpBookChannelMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.inspect.simulator.mapper; - - -import com.inspect.simulator.domain.basedata.BasedataEqpBook; -import com.inspect.simulator.domain.basedata.BasedataEqpBookChannel; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface BasedataEqpBookChannelMapper { - BasedataEqpBookChannel selectBasedataEqpBookChannelByChannelId(Long channelId); - - List selectBasedataEqpBookChannelList(BasedataEqpBookChannel channel); - - int insertBasedataEqpBookChannel(BasedataEqpBookChannel channel); - - int updateBasedataEqpBookChannel(BasedataEqpBookChannel channel); - - int deleteBasedataEqpBookChannelByChannelId(Long channelId); - - int deleteBasedataEqpBookChannelByChannelIds(Long[] channelIds); - - List getChannelByEqpBookCode(BasedataEqpBook eqpBook); - -} diff --git a/src/main/java/com/inspect/simulator/mapper/BasedataPatrolPointMapper.java b/src/main/java/com/inspect/simulator/mapper/BasedataPatrolPointMapper.java deleted file mode 100644 index ec72b65..0000000 --- a/src/main/java/com/inspect/simulator/mapper/BasedataPatrolPointMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.inspect.simulator.mapper; - - -import com.inspect.simulator.domain.result.BasedataPatrolPoint; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -@Mapper -public interface BasedataPatrolPointMapper { - BasedataPatrolPoint selectBasedataPatrolPointByPatrolPointId(Long patrolPointId); - - List selectBasedataPatrolPointList(BasedataPatrolPoint patrolPoint); - - List selectBasedataPatrolPointListLikePointCode(BasedataPatrolPoint patrolPoint); - - List selectBasedataMonitorList(BasedataPatrolPoint patrolPoint); - - List selectBasedataMonitorUnionList(BasedataPatrolPoint patrolPoint); - - int insertBasedataPatrolPoint(BasedataPatrolPoint patrolPoint); - - int updateBasedataPatrolPoint(BasedataPatrolPoint patrolPoint); - - int deleteBasedataPatrolPointByPatrolPointId(Long patrolPointId); - - int deleteBasedataPatrolPointByPatrolPointIds(Long[] patrolPointIds); - - int selectPresetPosByPatrolPointId(Long[] patrolPointIds); - - BasedataPatrolPoint selectBasedataPatrolPointPresetForOne(BasedataPatrolPoint patrolPoint); - -} diff --git a/src/main/java/com/inspect/simulator/mapper/InfraredBoxMapper.java b/src/main/java/com/inspect/simulator/mapper/InfraredBoxMapper.java deleted file mode 100644 index 9ac8b95..0000000 --- a/src/main/java/com/inspect/simulator/mapper/InfraredBoxMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.inspect.simulator.mapper; - -import com.inspect.simulator.domain.Infrared.InfraPictureInfo; -import com.inspect.simulator.domain.Infrared.InfraredBox; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -@Mapper -public interface InfraredBoxMapper { - - int insertInfraredBoxList(List infraredBoxes); - - int deleteInfraredBoxListByImgName(String imgName); - - List selectInfraredBoxListByImgName(String imgName); - -} diff --git a/src/main/java/com/inspect/simulator/mapper/PatrolPresetPosMapper.java b/src/main/java/com/inspect/simulator/mapper/PatrolPresetPosMapper.java deleted file mode 100644 index d825c33..0000000 --- a/src/main/java/com/inspect/simulator/mapper/PatrolPresetPosMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.inspect.simulator.mapper; - -import com.inspect.simulator.domain.result.PatrolPresetPos; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface PatrolPresetPosMapper { - List selectPatrolPresetPosByPatrolPointId(String patrolPointId); - - - String selectChannelImgByPatrolPointId(Integer patrolPointId); -} diff --git a/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java b/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java deleted file mode 100644 index 0eb9213..0000000 --- a/src/main/java/com/inspect/simulator/mapper/PatrolResultMapper.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.inspect.simulator.mapper; - - -import com.inspect.simulator.domain.result.*; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@Mapper -public interface PatrolResultMapper { - PatrolResult selectPatrolResultByLineId(Long lineId); - - Map selectBaseInfoByPointId(String pointId); - - List> selectAlgTypeByAlaName(String key); - - Map selectBaseByPointId(String pointId); - - List selectPatrolResultList(PatrolResult patrolResult); - - List selectPatrolResultListOrderBy(PatrolResult patrolResult); - - List selectPatrolDataResultByTaskCode(PatrolResult patrolResult); - - List selectPatrolDataResultByTaskCodeList(PatrolTaskStatus patrolTaskStatus); - - List selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpBookMoMain); - - List selectPatroByAllDev(PatrolResult patrolResult); - - List selectAlgInfo(PatrolResult patrolResult); - - List queryPatrolResultByPointID(String key, Date date, Date date2); - - Map selectAlgorithmType(String key); - - Map selectAlgorithmInfo(String key); - - List selectAlgorithmTypeList(String key); - - Map selectThresholdByPointId(String pointId); - - Map selectAlgTypeDataType(String key); - - Map selectAlgTypeByCode(String code); - - Map selectBasedataStation(); - - List> selectEvnData(String key); - - Map selectDevInfoById(String id); - - Map selectAreByAudit(String key); - - Map selectAreInfo(String key); - - List> selectAreInfoByParentId(String parentId); - - int insertPatrolResult(PatrolResult patrolResult); - - int updatePatrolResult(PatrolResult patrolResult); - - int updatePatrolResultByMainId(String mainId); - - int deletePatrolResultByLineId(Long lineId); - - int deletePatrolResultByLineIds(Long[] lineIds); - - int updatePatrolResultValue(PatrolResult patrolResult); - - List selectOilResultValue(PatrolResult patrolResult); - - List select6FsResultValue(PatrolResult patrolResult); - - List queryOneTaskResult(PatrolResult patrolResult); - - Integer queryTaskDeviceNum(String key); - - TaskStatisticsConfig selectStatisticsTaskConfigList(String key); - - List queryDiffTimeResult(@Param("taskCode") String taskCode, @Param("time") Long time); - - List queryNumTypeResult(@Param("num") Integer num, @Param("deviceId") String deviceId, @Param("patrolDeviceCode") String patrolDeviceCode); - - List selectResultRefByLineId(String lineId); - - List selectBaseInfoByMainId(String mainId); - - int updatePatrolResultUpStatus(@Param("lineIds") Set lineIds); - - List selectCurrentPatrolResultList(String createTimeStr); - -} diff --git a/src/main/java/com/inspect/simulator/mapper/PatrolUpdataLogMapper.java b/src/main/java/com/inspect/simulator/mapper/PatrolUpdataLogMapper.java deleted file mode 100644 index 227e0cb..0000000 --- a/src/main/java/com/inspect/simulator/mapper/PatrolUpdataLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.inspect.simulator.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.inspect.simulator.domain.result.PatrolUpdataLog; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author WGY - * @create 2025-03-31 11:38 - **/ -@Mapper -public interface PatrolUpdataLogMapper extends BaseMapper { - -} diff --git a/src/main/java/com/inspect/simulator/mapper/ResultAnalysisMapper.java b/src/main/java/com/inspect/simulator/mapper/ResultAnalysisMapper.java deleted file mode 100644 index 0f2e798..0000000 --- a/src/main/java/com/inspect/simulator/mapper/ResultAnalysisMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.inspect.simulator.mapper; - -import org.apache.ibatis.annotations.Mapper; -@Mapper -public interface ResultAnalysisMapper { - - String selectChannelImgByPatrolPointCode(String patrolPointId); - String selectChannelImgByPatrolPointId(String patrolPointId); - String selectImgByPatrolPointId(String patrolPointId); - -} diff --git a/src/main/java/com/inspect/simulator/service/AlgorithmService.java b/src/main/java/com/inspect/simulator/service/AlgorithmService.java deleted file mode 100644 index 4fa97a9..0000000 --- a/src/main/java/com/inspect/simulator/service/AlgorithmService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.inspect.simulator.service; - -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; - -public interface AlgorithmService { - - String filterPicAnalyse(final String analyseRequestStr); - - String bigModelPicAnalyse(final String analyseRequestStr); - - String infraredPicAnalyse(final String analyseRequestStr); - - String bigModelPicAnalyseRetNotify(final String picAnalyseResult); -} diff --git a/src/main/java/com/inspect/simulator/service/IPatrolUpdataLogService.java b/src/main/java/com/inspect/simulator/service/IPatrolUpdataLogService.java deleted file mode 100644 index 3f6ce99..0000000 --- a/src/main/java/com/inspect/simulator/service/IPatrolUpdataLogService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.inspect.simulator.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.inspect.simulator.domain.result.PatrolUpdataLog; - -/** - * @author WGY - * @create 2025-03-31 13:35 - **/ -public interface IPatrolUpdataLogService extends IService { -} diff --git a/src/main/java/com/inspect/simulator/service/PatrolPresetPosService.java b/src/main/java/com/inspect/simulator/service/PatrolPresetPosService.java deleted file mode 100644 index a545ce9..0000000 --- a/src/main/java/com/inspect/simulator/service/PatrolPresetPosService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.inspect.simulator.service; - - -public interface PatrolPresetPosService { - String selectChannelImgByPatrolPointId(Integer patrolPointId); -} diff --git a/src/main/java/com/inspect/simulator/service/PatrolResultService.java b/src/main/java/com/inspect/simulator/service/PatrolResultService.java deleted file mode 100644 index aa3a7e3..0000000 --- a/src/main/java/com/inspect/simulator/service/PatrolResultService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.inspect.simulator.service; - -import com.inspect.simulator.domain.result.upper.MessageBody; -import com.inspect.simulator.domain.result.upper.MessageResult; -import com.inspect.simulator.domain.result.upper.TokenParam; -import com.inspect.simulator.domain.result.upper.TokenResult; - -public interface PatrolResultService { - - TokenResult getUpperToken(TokenParam tokenParam); - - MessageResult messageNotify(String token, MessageBody messageBody); - - void sendPatrolResultToUpperSystem(); -} diff --git a/src/main/java/com/inspect/simulator/service/ResultAnalysisService.java b/src/main/java/com/inspect/simulator/service/ResultAnalysisService.java deleted file mode 100644 index 476ca2a..0000000 --- a/src/main/java/com/inspect/simulator/service/ResultAnalysisService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.inspect.simulator.service; - - -public interface ResultAnalysisService { - - String selectChannelImgByPatrolPointId(String patrolPointId); -} diff --git a/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java deleted file mode 100644 index 3fe7b03..0000000 --- a/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java +++ /dev/null @@ -1,273 +0,0 @@ -package com.inspect.simulator.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; -import com.inspect.simulator.constant.Color; -import com.inspect.simulator.domain.Infrared.Coordinate; -import com.inspect.simulator.domain.Infrared.InfraPictureInfo; -import com.inspect.simulator.domain.Infrared.InfraredInfo; -import com.inspect.simulator.domain.algorithm.in.AnalyseReqItem; -import com.inspect.simulator.domain.algorithm.in.AnalyseRequest; -import com.inspect.simulator.domain.algorithm.out.AnalyseResItem; -import com.inspect.simulator.domain.algorithm.out.AnalyseResPoint; -import com.inspect.simulator.domain.algorithm.out.AnalyseResult; -import com.inspect.simulator.domain.basedata.BasedataEqpBookChannel; -import com.inspect.simulator.domain.result.BasedataPatrolPoint; -import com.inspect.simulator.domain.result.PatrolPresetPos; -import com.inspect.simulator.mapper.BasedataPatrolPointMapper; -import com.inspect.simulator.mapper.PatrolPresetPosMapper; -import com.inspect.simulator.service.AlgorithmService; -import com.inspect.simulator.service.remote.AnalysisRemoteService; -import com.inspect.simulator.utils.HttpClientUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import retrofit2.Call; -import retrofit2.Response; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class AlgorithmServiceImpl implements AlgorithmService { - private final Logger log = LoggerFactory.getLogger(this.getClass()); - - @Value("${file.infraredPath:null}") - private String infraredPath; - - @Resource - private AnalysisRemoteService analysisRemoteService; - - @Resource - private PatrolPresetPosMapper patrolPresetPosMapper; - - @Resource - private BasedataPatrolPointMapper basedataPatrolPointMapper; - - @Resource - private HikVisionServiceImpl hikVisionService; - - @Override - public String filterPicAnalyse(String analyseRequestStr) { - log.info(Color.MAGENTA + "[FILTER] filterPicAnalyse: analyseRequestStr={}" + Color.END, analyseRequestStr); - AnalyseRequest analyseRequest = new Gson().fromJson(analyseRequestStr, AnalyseRequest.class); - - String[] typeList = analyseRequest.getObjectList().get(0).getTypeList(); - String typeListStr = String.join(",", typeList); - - AnalyseResult analyseResult = new AnalyseResult(); - analyseResult.setRequestId(analyseRequest.getRequestId()); - AnalyseResPoint analyseResPoint = new AnalyseResPoint(); - analyseResPoint.setValue("0"); - analyseResPoint.setConf("0.85"); - analyseResPoint.setCode("2000"); - analyseResPoint.setType(typeListStr); - analyseResPoint.setResImageUrl(analyseRequest.getObjectList().get(0).getImageUrlList()[0]); - List analyseResPoints = new ArrayList<>(); - analyseResPoints.add(analyseResPoint); - AnalyseResItem analyseResItem = new AnalyseResItem(); - analyseResItem.setObjectId(analyseRequest.getObjectList().get(0).getObjectId()); - analyseResItem.setAlgFactory("yd"); - analyseResItem.setResults(analyseResPoints); - - List analyseResItems = new ArrayList<>(); - analyseResItems.add(analyseResItem); - analyseResult.setResultList(analyseResItems); - - log.info(Color.MAGENTA + "[FILTER] filterPicAnalyse: analyseResult={}" + Color.END, new Gson().toJson(analyseResult)); - try { - Call call = analysisRemoteService.picAnalyseRetNotify(analyseResult); - Response response = call.execute(); - Object result = response.body(); - System.out.println("result: " + result); - } catch (Exception e) { - e.printStackTrace(); - } - return "{\"code\":\"200\"}"; - } - - @Override - public String bigModelPicAnalyse(String analyseRequestStr) { - log.info(Color.MAGENTA + "[BIG MODEL] bigModelPicAnalyse: analyseRequestStr={}" + Color.END, analyseRequestStr); - AnalyseRequest analyseRequest = new Gson().fromJson(analyseRequestStr, AnalyseRequest.class); - - String[] typeList = analyseRequest.getObjectList().get(0).getTypeList(); - String typeListStr = String.join(",", typeList); - AnalyseResult analyseResult = new AnalyseResult(); - analyseResult.setRequestId(analyseRequest.getRequestId()); - AnalyseResPoint analyseResPoint = new AnalyseResPoint(); - analyseResPoint.setValue("1"); - analyseResPoint.setConf("0.95"); - analyseResPoint.setCode("2000"); - analyseResPoint.setType(typeListStr); - analyseResPoint.setResImageUrl(analyseRequest.getObjectList().get(0).getImageUrlList()[0]); - List analyseResPoints = new ArrayList<>(); - analyseResPoints.add(analyseResPoint); - AnalyseResItem analyseResItem = new AnalyseResItem(); - analyseResItem.setObjectId(analyseRequest.getObjectList().get(0).getObjectId()); - analyseResItem.setAlgFactory("yd"); - analyseResItem.setResults(analyseResPoints); - List analyseResItems = new ArrayList<>(); - analyseResItems.add(analyseResItem); - analyseResult.setResultList(analyseResItems); - - if (infraredPath.equals("null")) { - // 如果nacos中没有配置红外路径，则将结果返回调用方 - try { - log.info(Color.MAGENTA + "[BIG MODEL] filterPicAnalyse: nacos file.infraredPath not config, feedback to caller, analyseResult={}" + Color.END, new Gson().toJson(analyseResult)); - Call call = analysisRemoteService.picAnalyseRetNotify(analyseResult); - Response response = call.execute(); - Object result = response.body(); - System.out.println("result: " + result); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - // 如果nacos中配置了红外路径，则继续调用红外模块 - try { - log.info(Color.MAGENTA + "[BIG MODEL] filterPicAnalyse: continue to call infrared, infraredPath: {}, analyseRequestStr={}" + Color.END, infraredPath, analyseRequestStr); - // 将请求红外的发起方地址改为大模型的地址 - analyseRequest.setRequestHostIp("199.199.199.210"); - analyseRequest.setRequestHostPort("18530"); - final String analyseRequestStrNew = new Gson().toJson(analyseRequest); - String infraredResult = HttpClientUtils.sendPostAgain(infraredPath, analyseRequestStrNew); - log.info(Color.MAGENTA + "[BIG MODEL] FROM infrared RESULT: {}" + Color.END, infraredResult); - // 返回给智巡服务器 - AnalyseResult analyseResultFromInfrared = new Gson().fromJson(infraredResult, AnalyseResult.class); - Call call = analysisRemoteService.picAnalyseRetNotify(analyseResultFromInfrared); - Response response = call.execute(); - Object objectFromPatrolMain = response.body(); - log.info(Color.MAGENTA + "[BIG MODEL] FROM PATROL-MAIN: {}", objectFromPatrolMain); - } catch (Exception e) { - log.error("[BIG MODEL] continue to call infrared EXCEPTION: {}", e.getMessage()); - } - } - return "{\"code\":\"200\"}"; - } - - @Override - public String infraredPicAnalyse(String analyseRequestStr) { - log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: analyseRequestStr={}" + Color.END, analyseRequestStr); - AnalyseRequest analyseRequest; - try { - analyseRequest = new Gson().fromJson(analyseRequestStr, AnalyseRequest.class); - } catch (Exception e) { - log.error(Color.MAGENTA + "[INFRARED] irPicAnalyse: analyseRequestJson parse exception: {}" + Color.END, e.getMessage()); - return "{\"code\":\"201\"}"; - } - log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: analyseRequest={}" + Color.END, new Gson().toJson(analyseRequest)); - - - List analyseReqItemList = analyseRequest.getObjectList(); - if (analyseReqItemList == null || analyseReqItemList.isEmpty()) { - log.error("[INFRARED] irPicAnalyse: analyseReqItemList empty!"); - return "{\"code\":\"202\"}"; - } - - final AnalyseReqItem analyseReqItem = analyseReqItemList.get(0); - final String[] typeList = analyseReqItem.getTypeList(); - String algType = "unKnownType"; - if (typeList != null && typeList.length != 0) { - algType = typeList[0]; - } - - final String patrolPointId = analyseReqItem.getObjectId(); -// // 根据patrol_point_id查询数据表patrol_preset_pos，得到channel_id,根据channel_id查询数据表basedata_eqpbook_channel，得到channel_content -// List patrolPresetPosList = patrolPresetPosMapper.selectPatrolPresetPosByPatrolPointId(patrolPointId); -// if (patrolPresetPosList == null || patrolPresetPosList.isEmpty()) { -// log.error("[INFRARED] irPicAnalyse: patrolPresetPosList empty!"); -// return "{\"code\":\"203\"}"; -// } -// PatrolPresetPos patrolPresetPos = patrolPresetPosList.get(0); -// final String channelContent = patrolPresetPos.getChannelContent(); -// log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: channelContent={}" + Color.END, channelContent); - - // 根据patrol_point_id查询数据表patrol_preset_pos，得到channel_id,根据channel_id查询数据表basedata_eqpbook_channel，得到channel_content - BasedataPatrolPoint basedataPatrolPoint = new BasedataPatrolPoint(); - basedataPatrolPoint.setPatrolPointCode(patrolPointId); - List basedataPatrolPoints = basedataPatrolPointMapper.selectBasedataPatrolPointListLikePointCode(basedataPatrolPoint); - if (basedataPatrolPoints == null || basedataPatrolPoints.isEmpty()) { - log.error("[INFRARED] irPicAnalyse: basedataPatrolPoints empty!"); - return "{\"code\":\"203\"}"; - } - BasedataPatrolPoint basedataPatrolPoint2 = basedataPatrolPoints.get(0); - final String infraFrameContent = basedataPatrolPoint2.getMeterType(); - log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: basedataPatrolPoint2: {}, infraFrameContent={}" + Color.END, basedataPatrolPoint2, infraFrameContent); - String[] imageUrlList = analyseReqItem.getImageUrlList(); - String[] typeListImg = analyseReqItem.getTypeList(); - // 调用红外算法 - InfraPictureInfo infraPictureInfo = new InfraPictureInfo(); - infraPictureInfo.setImgType(typeListImg[0]); - infraPictureInfo.setFilePath(imageUrlList[0]); - InfraredInfo infraredInfo = hikVisionService.calculatePicture(infraPictureInfo,infraFrameContent); - - final String feedBackHostIp = analyseRequest.getRequestHostIp(); - final String feedBackPort = analyseRequest.getRequestHostPort(); - final String feedbackUrl = "http://" + feedBackHostIp + ":" + feedBackPort + "/simu/bigModel/picAnalyseRetNotify"; - log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: feedbackUrl={}" + Color.END, feedbackUrl); - - AnalyseResult analyseResult = new AnalyseResult(); - analyseResult.setRequestId(analyseRequest.getRequestId()); - AnalyseResPoint analyseResPoint = new AnalyseResPoint(); -// analyseResPoint.setValue("0"); - analyseResPoint.setConf("0.99"); - String typeListStr = String.join(",", typeList); - -// if (String.valueOf((double) infraredInfo.getFrameMax()) != null && infraredInfo.getOutPath() !=null) { -// analyseResPoint.setValue("0");//成功 -// } else { -// analyseResPoint.setValue("1");//失败 -// } -// analyseResPoint.setConf(String.format("%.2f", (double) infraredInfo.getFrameMax())); - analyseResPoint.setValue(String.format("%.2f", (double) infraredInfo.getFrameMax())); - analyseResPoint.setResImageUrl(infraredInfo.getOutPath()); - analyseResPoint.setType(typeListStr); - analyseResPoint.setCode("2000"); -// analyseResPoint.setResImageUrl(analyseRequest.getObjectList().get(0).getImageUrlList()[0]); - List analyseResPoints = new ArrayList<>(); - analyseResPoints.add(analyseResPoint); - AnalyseResItem analyseResItem = new AnalyseResItem(); - analyseResItem.setObjectId(analyseRequest.getObjectList().get(0).getObjectId()); - analyseResItem.setAlgFactory(algType); - analyseResItem.setResults(analyseResPoints); - List analyseResItems = new ArrayList<>(); - analyseResItems.add(analyseResItem); - analyseResult.setResultList(analyseResItems); - - log.info(Color.GREEN+"返回值打印: 最高温度值"+analyseResPoint.getValue()+",返回图片路径："+analyseResPoint.getResImageUrl()); -// try { -//// String analyseResultOutJson = JSONObject.toJSONString(analyseResult); -// String analyseResultOutJson = new Gson().toJson(analyseResult); -// System.out.println("打印返回"+analyseResultOutJson); -// log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: feedbackUrl={}, analyseResultOutJson={}" + Color.END, feedbackUrl, analyseResultOutJson); -// String result = HttpClientUtils.sendPostAgain(feedbackUrl, analyseResultOutJson); -// log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: feedbackUrl={}, result: {}" + Color.END, feedbackUrl, result); -// } catch (Exception e) { -// log.error("[INFRARED] irPicAnalyse: feedbackUrl={}, EXCEPTION: {}", feedbackUrl, e.getMessage()); -// } - String analyseResultOutJson = new Gson().toJson(analyseResult); - log.info(Color.GREEN + "[INFRARED] irPicAnalyse analyseResultOutJson: {}", analyseResultOutJson); - return analyseResultOutJson; - } - - @Override - public String bigModelPicAnalyseRetNotify(final String picAnalyseResult) { - AnalyseResult analyseResult = new Gson().fromJson(picAnalyseResult, AnalyseResult.class); - log.info(Color.MAGENTA + "[BIG MODEL] bigModelPicAnalyseRetNotify: picAnalyseResultStr={}, picAnalyseResult: {}" + Color.END, picAnalyseResult, analyseResult); - try { - Call call = analysisRemoteService.picAnalyseRetNotify(analyseResult); - Response response = call.execute(); - Object result = response.body(); - System.out.println("result: " + result); - } catch (Exception e) { - e.printStackTrace(); - } - return ""; - } - -} diff --git a/src/main/java/com/inspect/simulator/service/impl/PatrolPresetPosServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/PatrolPresetPosServiceImpl.java deleted file mode 100644 index dfe8943..0000000 --- a/src/main/java/com/inspect/simulator/service/impl/PatrolPresetPosServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.inspect.simulator.service.impl; - - -import com.inspect.simulator.mapper.BasedataPatrolPointMapper; -import com.inspect.simulator.mapper.PatrolPresetPosMapper; -import com.inspect.simulator.service.PatrolPresetPosService; -import com.inspect.simulator.utils.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - - -@Service -public class PatrolPresetPosServiceImpl implements PatrolPresetPosService { - - @Resource - private PatrolPresetPosMapper patrolPresetPosMapper; - - @Override - public String selectChannelImgByPatrolPointId(Integer patrolPointId) { - String img = patrolPresetPosMapper.selectChannelImgByPatrolPointId(patrolPointId); - if (StringUtils.isNotEmpty(img)){ - return "/"+img; - }else { - return "不存在"+patrolPointId+"对应的图！"; - } - - } -} diff --git a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java deleted file mode 100644 index 0820161..0000000 --- a/src/main/java/com/inspect/simulator/service/impl/PatrolResultServiceImpl.java +++ /dev/null @@ -1,348 +0,0 @@ -package com.inspect.simulator.service.impl; - -import com.alibaba.nacos.client.config.common.GroupKey; -import com.google.gson.Gson; -import com.inspect.simulator.domain.result.PatrolResult; -import com.inspect.simulator.domain.result.PatrolUpdataLog; -import com.inspect.simulator.domain.result.upper.*; -import com.inspect.simulator.mapper.PatrolResultMapper; -import com.inspect.simulator.service.IPatrolUpdataLogService; -import com.inspect.simulator.service.PatrolResultService; -import com.inspect.simulator.service.remote.UpperRemoteService; -import com.inspect.simulator.utils.DateUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; -import retrofit2.Call; -import retrofit2.Response; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class PatrolResultServiceImpl implements PatrolResultService { - - @Value("${upper.stationCode:30000001-112967078}") - private String stationCode; - - @Value("${upper.provinceCode:330000}") - private String provinceCode; - - @Value("${upper.voltLevel:800}") - private String voltLevel; - private static String token; - - private static final String MLLM_FILTER = "0"; - - private static final String FITLER_FILTER = "1"; - - private static final Set VALID_RESULT_CODES = new HashSet<>(Arrays.asList("0", "1")); - - private final Logger log = LoggerFactory.getLogger(this.getClass()); - - private final UpperRemoteService upperRemoteService; - - private final PatrolResultMapper patrolResultMapper; - - @Autowired - private IPatrolUpdataLogService patrolUpdataLogService; - - public PatrolResultServiceImpl(PatrolResultMapper patrolResultMapper, UpperRemoteService upperRemoteService) { - this.patrolResultMapper = patrolResultMapper; - this.upperRemoteService = upperRemoteService; - } - - @Override - public TokenResult getUpperToken(TokenParam tokenParam) { - log.info("tokenParam: {}", tokenParam); - TokenResult tokenResult = new TokenResult(); - tokenResult.setCode(401); - tokenResult.setMsg("认证异常"); - tokenResult.setResultCode("OAUTH_012"); - try { - Call call = upperRemoteService.getOathToken(tokenParam.getGrantType(), tokenParam.getClientId(), tokenParam.getClientSecret()); - Response response = call.execute(); - Object result = response.body(); - tokenResult = new Gson().fromJson(new Gson().toJson(result), TokenResult.class); - log.info("Upper token: {}", tokenResult); - } catch (Exception e) { - log.error("getUpperToken Exception: {}", e.getMessage()); - } - return tokenResult; - } - - @Override - public MessageResult messageNotify(String token, MessageBody messageBody) { - MessageResult messageResult = new MessageResult(); - messageResult.setSuccess(false); - messageResult.setResultCode("201"); - try { - final String bearerToken = "Bearer " + token; - log.info("bearerToken: {}", bearerToken); - Call call = upperRemoteService.messageNotify(bearerToken, messageBody); - Response response = call.execute(); - Object result = response.body(); - log.info("messageNotify res: {}", new Gson().toJson(result)); - messageResult = new Gson().fromJson(new Gson().toJson(result), MessageResult.class); - } catch (Exception e) { - log.error("messageNotify Exception: {}", e.getMessage()); - } - return messageResult; - } - - @Scheduled(cron = "59 59 0/1 * * ?") - public void sendPatrolResultToUpperSystem() { - final long threadId = Thread.currentThread().getId(); - Date date = new Date(); - final String execTime = DateUtils.format(DateUtils.yyyyMMddHHmmss2, date); - log.info("[{}] [{}] sendPatrolResultToUpperSystem", threadId, execTime); - // 查询当天的巡检结果 - String createTimeStr = DateUtils.parseDateToStr("yyyy-MM-dd", date); - -// createTimeStr = "2025-03-27"; - List patrolResults = patrolResultMapper.selectCurrentPatrolResultList(createTimeStr); - if (patrolResults == null || patrolResults.size() <= 0) { - log.info("[{}] [{}] sendPatrolResultToUpperSystem no data", threadId, execTime); - return; - } - try { - String token = getOrRefreshToken(false); - Set lineIds = new HashSet<>(); - MessageBody messageBody = prepareMessageBody(patrolResults, lineIds); - MessageResult messageResult = messageNotify(token, messageBody); - - if (messageResult == null || !messageResult.getSuccess()) { - log.warn("[{}] [{}] First attempt to send message failed. Retrying with a new token.", threadId, execTime); - token = getOrRefreshToken(true); - messageResult = messageNotify(token, messageBody); - } - log.info("sendPatrolResultToUpperSystem messageResult: {}", messageResult); - if (messageResult != null && messageResult.getSuccess() && lineIds.size() > 0) { - // 成功则更新数据库中上送状态 - int row = patrolResultMapper.updatePatrolResultUpStatus(lineIds); - log.info("[{}] [{}] sendPatrolResultToUpperSystem updatePatrolResultUpStatus row:{}", threadId, execTime, row); - List samples = messageBody.getSamples(); - // 记录上送初筛正常的数据 - List filterDataList = samples.stream().filter(messageData -> "0".equals(messageData.getFitlerResultCode()) && StringUtils.isEmpty(messageData.getMllmResultCode())).collect(Collectors.toList()); - Map> staticFilterListMap = filterDataList.stream().collect(Collectors.groupingBy(p -> new GroupKeyStatic(p.getAlgorithmsType(), p.getFitlerResultCode()))); - Map staticFilterResultMap = new HashMap<>(); - for (Map.Entry> groupKeyStaticListEntry : staticFilterListMap.entrySet()) { - GroupKeyStatic groupKey = groupKeyStaticListEntry.getKey(); - List messageDatas = groupKeyStaticListEntry.getValue(); - staticFilterResultMap.put(groupKey, messageDatas.size()); - } - List updataLogs = new ArrayList<>(); - for (Map.Entry groupKeyStaticIntegerEntry : staticFilterResultMap.entrySet()) { - PatrolUpdataLog patrolUpdataLog = new PatrolUpdataLog(); - GroupKeyStatic groupKey = groupKeyStaticIntegerEntry.getKey(); - int count = groupKeyStaticIntegerEntry.getValue(); - patrolUpdataLog.setAlgorithmsType(groupKey.getAlgorithmsType()); - patrolUpdataLog.setResultCode(groupKey.getResultCode()); - patrolUpdataLog.setUpNum(String.valueOf(count)); - patrolUpdataLog.setCreateTime(date); - patrolUpdataLog.setFilter(FITLER_FILTER); - updataLogs.add(patrolUpdataLog); - } - // 记录初筛缺陷（大模型正常，缺陷）数据 - List mllmDataList = samples.stream().filter(messageData -> StringUtils.isNotEmpty(messageData.getMllmResultCode())).collect(Collectors.toList()); - Map> staticMllmListMap = mllmDataList.stream().collect(Collectors.groupingBy(p -> new GroupKeyStatic(p.getAlgorithmsType(), p.getMllmResultCode()))); - Map staticMllmResultMap = new HashMap<>(); - for (Map.Entry> groupKeyStaticListEntry : staticMllmListMap.entrySet()) { - GroupKeyStatic groupKey = groupKeyStaticListEntry.getKey(); - List messageDatas = groupKeyStaticListEntry.getValue(); - staticMllmResultMap.put(groupKey, messageDatas.size()); - } - for (Map.Entry groupKeyStaticIntegerEntry : staticMllmResultMap.entrySet()) { - PatrolUpdataLog patrolUpdataLog = new PatrolUpdataLog(); - GroupKeyStatic groupKey = groupKeyStaticIntegerEntry.getKey(); - int count = groupKeyStaticIntegerEntry.getValue(); - patrolUpdataLog.setAlgorithmsType(groupKey.getAlgorithmsType()); - patrolUpdataLog.setResultCode(groupKey.getResultCode()); - patrolUpdataLog.setUpNum(String.valueOf(count)); - patrolUpdataLog.setCreateTime(date); - patrolUpdataLog.setFilter(MLLM_FILTER); - updataLogs.add(patrolUpdataLog); - } - log.info("updataLogs size：{},updataLogs: {}", updataLogs.size(), updataLogs); - boolean b = patrolUpdataLogService.saveBatch(updataLogs); - } else { - log.error("[{}] [{}] sendPatrolResultToUpperSystem failed", threadId, execTime); - } - } catch (Exception e) { - log.error("sendPatrolResultToUpperSystem Exception", e); - } - } - private String getOrRefreshToken(Boolean isTokenExpired) { - if (token == null || isTokenExpired) { - TokenParam tokenParam = new TokenParam(); - tokenParam.setGrantType("client_credentials"); - tokenParam.setClientId("patrol"); - tokenParam.setClientSecret("8dc6595707a1d457cdef07f46c034a1c"); - TokenResult tokenResult = getUpperToken(tokenParam); -// TokenResult tokenResult = new TokenResult(); -// TokenData tokenData1 = new TokenData(); -// tokenData1.setExpiresIn(10000); -// tokenData1.setRefreshToken("123456"); -// String s = UUID.randomUUID().toString(); -// tokenData1.setToken(s); -// log.info("tokenData1: {}", s); -// tokenResult.setData(tokenData1); - - TokenData tokenData = tokenResult.getData(); - if (tokenData != null) { - token = tokenData.getToken(); - } else { - throw new RuntimeException("sendPatrolResultToUpperSystem failed to obtain token"); - } - } - return token; - } - - private MessageBody prepareMessageBody(List patrolResults, Set lineIds) { - MessageBody messageBody = new MessageBody(); - // 绍兴站 -// messageBody.setProvinceCode("330000"); -// messageBody.setStationCode("30000001-112967078"); - // 灵州站 -// messageBody.setProvinceCode("640000"); -// messageBody.setStationCode("1cc010d8a78a598ccb52fb470301531cbff88e26c5"); -// messageBody.setVoltLevel("800"); - messageBody.setProvinceCode(provinceCode); - messageBody.setStationCode(stationCode); - messageBody.setVoltLevel(voltLevel); - List samples = new ArrayList<>(); - if (patrolResults == null) { - return messageBody; - } - Map> groupedResults = patrolResults.stream() - .collect(Collectors.groupingBy(p -> new GroupKey( - p.getLineId(), - p.getDeviceName(), - p.getCreateTime(), - p.getAlgorithmsType() - ))); - - groupedResults.forEach((key, group) -> { - MessageData sample = new MessageData(); - PatrolResult firstPr = group.get(0); - sample.setAreaName(firstPr.getAreaName()); - sample.setDeviceName(firstPr.getDeviceName()); - sample.setPointName(firstPr.getPointName()); - sample.setTime(DateUtils.format(DateUtils.yyyyMMddHHmmss2, firstPr.getCreateTime())); - sample.setSampleRaw(firstPr.getFilePath()); - sample.setAlgorithmsName(firstPr.getAlgorithmsName()); - sample.setAlgorithmsType(firstPr.getAlgorithmsType()); - - // 处理同一分组内的不同filter结果 - group.forEach(pr -> { - // result type是检测出来有缺陷的 0是缺陷 1是正常 2是异常(异常不算是缺陷比如图片抓拍失败为空算是异常，或者是大模型服务挂掉分析失败也是异常，这种的不算是缺陷) - String resultType = pr.getResultType(); - if (StringUtils.isNotEmpty(resultType)) { - if ("1".equals(pr.getResultType())) { - resultType = "0"; - } else if ("0".equals(pr.getResultType())) { - resultType = "1"; - } - } - String filter = pr.getFilter(); - - if (MLLM_FILTER.equals(filter)) { - sample.setMllmDefect(pr.getResImgUrl()); - sample.setMllmResultCode(resultType); - } else if (FITLER_FILTER.equals(filter)) { - sample.setFitlerDefect(pr.getResImgUrl()); - sample.setFitlerDiffBase(pr.getImageNormalUrlPath()); - sample.setFitlerResultCode(resultType); - } - }); - // 上传大模型正常0和缺陷1的图片，忽略异常的图片,初筛正常的图片(去掉表计识别) - if (isValidResultCode(sample.getMllmResultCode()) || ("0".equals(sample.getFitlerResultCode()) && StringUtils.isEmpty(sample.getMllmResultCode()))) { - samples.add(sample); - lineIds.add(firstPr.getLineId()); - } - }); - messageBody.setSamples(samples); - log.info("samples size: {},messageBody: {}", samples.size(), messageBody); - return messageBody; - } - - private boolean isValidResultCode(String resultCode) { - return VALID_RESULT_CODES.contains(resultCode); - } - - // 分组键，用于分组PatrolResult对象 - private static class GroupKey { - private final Long lineId; - private final String deviceName; - private final Date createTime; - private final String algorithmsType; - - public GroupKey(Long lineId, String deviceName, Date createTime, String algorithmsType) { - this.lineId = lineId; - this.deviceName = deviceName; - this.createTime = createTime; - this.algorithmsType = algorithmsType; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - GroupKey groupKey = (GroupKey) o; - return Objects.equals(lineId, groupKey.lineId) && - Objects.equals(deviceName, groupKey.deviceName) && - Objects.equals(createTime, groupKey.createTime) && - Objects.equals(algorithmsType, groupKey.algorithmsType); - } - - @Override - public int hashCode() { - return Objects.hash(lineId, deviceName, createTime, algorithmsType); - } - } - - private static class GroupKeyStatic { - private final String algorithmsType; - private final String resultCode; - - public GroupKeyStatic(String algorithmsType, String resultCode) { - this.resultCode = resultCode; - this.algorithmsType = algorithmsType; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - GroupKeyStatic groupKey = (GroupKeyStatic) o; - return Objects.equals(algorithmsType, groupKey.algorithmsType) && - Objects.equals(resultCode, groupKey.resultCode); - } - - @Override - public int hashCode() { - return Objects.hash(algorithmsType, resultCode); - } - - public String getAlgorithmsType() { - return algorithmsType; - } - - public String getResultCode() { - return resultCode; - } - - @Override - public String toString() { - return "GroupKeyStatic{" + - "algorithmsType='" + algorithmsType + '\'' + - ", resultCode='" + resultCode + '\'' + - '}'; - } - } - -} diff --git a/src/main/java/com/inspect/simulator/service/impl/PatrolUpdataLogServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/PatrolUpdataLogServiceImpl.java deleted file mode 100644 index b8ff4cb..0000000 --- a/src/main/java/com/inspect/simulator/service/impl/PatrolUpdataLogServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.inspect.simulator.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.inspect.simulator.domain.result.PatrolUpdataLog; -import com.inspect.simulator.mapper.PatrolUpdataLogMapper; -import com.inspect.simulator.service.IPatrolUpdataLogService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author WGY - * @create 2025-03-31 13:37 - **/ -@Service -@Slf4j -public class PatrolUpdataLogServiceImpl extends ServiceImpl implements IPatrolUpdataLogService { - -} diff --git a/src/main/java/com/inspect/simulator/service/impl/ResultAnnalysisServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/ResultAnnalysisServiceImpl.java deleted file mode 100644 index 42bec67..0000000 --- a/src/main/java/com/inspect/simulator/service/impl/ResultAnnalysisServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.inspect.simulator.service.impl; - - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.inspect.simulator.mapper.ResultAnalysisMapper; -import com.inspect.simulator.service.ResultAnalysisService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - - -@Service -public class ResultAnnalysisServiceImpl implements ResultAnalysisService { - - @Resource - private ResultAnalysisMapper resultAnalysisMapper; - - @Override - public String selectChannelImgByPatrolPointId(String patrolPointId) { - String resImageUrl=null; - String jsonStr=null; - String pointCode = resultAnalysisMapper.selectChannelImgByPatrolPointCode(patrolPointId); - int index = pointCode.indexOf("|"); - String pointId = pointCode.substring(index + 1); - jsonStr = resultAnalysisMapper.selectChannelImgByPatrolPointId(pointId); - if (jsonStr==null){ - jsonStr=resultAnalysisMapper.selectImgByPatrolPointId(patrolPointId); - } - resImageUrl = extractResImageUrl(jsonStr, patrolPointId); - if (resImageUrl==null){ - try { - JSONObject jsonObject = JSONObject.parseObject(jsonStr); - resImageUrl = jsonObject.getString("resImageUrl"); - } catch (Exception e) { - e.getMessage(); - } - } - return resImageUrl != null ? resImageUrl : "Image URL not found！！！"; - } - - public String extractResImageUrl(String jsonStr, String objectId) { - if (jsonStr == null || jsonStr.isEmpty()) { - return null; - } - try { - JSONObject json = JSONObject.parseObject(jsonStr); - String[] listKeys = {"resultList"}; - for (String key : listKeys) { - if (json.containsKey(key)) { - JSONArray items = json.getJSONArray(key); - for (int i = 0; i < items.size(); i++) { - JSONObject item = items.getJSONObject(i); - if (objectId.equals(item.getString("objectId"))) { - JSONArray results = item.getJSONArray("results"); - if (results != null && !results.isEmpty()) { - JSONObject firstResult = results.getJSONObject(0); - if (firstResult.containsKey("resImageUrl")) { - return firstResult.getString("resImageUrl"); - } - } - } - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - -} diff --git a/src/main/java/com/inspect/simulator/service/remote/AnalysisRemoteService.java b/src/main/java/com/inspect/simulator/service/remote/AnalysisRemoteService.java deleted file mode 100644 index 89ff33e..0000000 --- a/src/main/java/com/inspect/simulator/service/remote/AnalysisRemoteService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.inspect.simulator.service.remote; - -import com.inspect.simulator.domain.algorithm.out.AnalyseResult; -import com.inspect.simulator.domain.analysis.vo.AnalysisResultEntity; -import retrofit2.Call; -import retrofit2.http.Body; -import retrofit2.http.POST; - -public interface AnalysisRemoteService { - @POST("picAnalyseRetNotify") - Call analysisResultNotify(@Body AnalysisResultEntity analysisResultEntity); - - @POST("picAnalyseRetNotify") - Call picAnalyseRetNotify(@Body AnalyseResult analyseResult); -} diff --git a/src/main/java/com/inspect/simulator/service/remote/UpperRemoteService.java b/src/main/java/com/inspect/simulator/service/remote/UpperRemoteService.java deleted file mode 100644 index 1a6a250..0000000 --- a/src/main/java/com/inspect/simulator/service/remote/UpperRemoteService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.inspect.simulator.service.remote; - -import com.inspect.simulator.domain.result.upper.MessageBody; -import retrofit2.Call; -import retrofit2.http.Body; -import retrofit2.http.Header; -import retrofit2.http.POST; -import retrofit2.http.Query; - -public interface UpperRemoteService { - @POST("/ylkj-oauth2/oauth/token") - Call getOathToken( - @Query("grant_type") String grantType, - @Query("client_id") String clientId, - @Query("client_secret") String clientSecret - ); - - @POST("/ylkj-oauth2/api/v1/inner/002") - Call messageNotify( - @Header("Authorization") String bearerToken, - @Body MessageBody messageBody - ); -} diff --git a/src/main/java/com/inspect/simulator/service/remote/impl/AnalysisRemoteServiceImpl.java b/src/main/java/com/inspect/simulator/service/remote/impl/AnalysisRemoteServiceImpl.java deleted file mode 100644 index c5500cf..0000000 --- a/src/main/java/com/inspect/simulator/service/remote/impl/AnalysisRemoteServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.inspect.simulator.service.remote.impl; - -import com.inspect.simulator.domain.algorithm.out.AnalyseResult; -import com.inspect.simulator.domain.analysis.vo.AnalysisResultEntity; -import com.inspect.simulator.service.remote.AnalysisRemoteService; -import lombok.EqualsAndHashCode; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; -import retrofit2.Call; -import retrofit2.Retrofit; - -import javax.annotation.PostConstruct; - -@EqualsAndHashCode -@Service -public class AnalysisRemoteServiceImpl implements AnalysisRemoteService { - - private final Retrofit retrofit; - - private AnalysisRemoteService analysisRemoteService; - - public AnalysisRemoteServiceImpl(@Qualifier("RetrofitOfAnalysis") Retrofit retrofit) { - this.retrofit = retrofit; - } - - @PostConstruct - public void setup() { - analysisRemoteService = retrofit.create(AnalysisRemoteService.class); - } - - @Override - public Call analysisResultNotify(AnalysisResultEntity analysisResultEntity) { - return analysisRemoteService.analysisResultNotify(analysisResultEntity); - } - - @Override - public Call picAnalyseRetNotify(AnalyseResult analyseResult) { - return analysisRemoteService.picAnalyseRetNotify(analyseResult); - } -} diff --git a/src/main/java/com/inspect/simulator/service/remote/impl/UpperRemoteServiceImpl.java b/src/main/java/com/inspect/simulator/service/remote/impl/UpperRemoteServiceImpl.java deleted file mode 100644 index 8e4c177..0000000 --- a/src/main/java/com/inspect/simulator/service/remote/impl/UpperRemoteServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.inspect.simulator.service.remote.impl; - -import com.inspect.simulator.domain.result.upper.MessageBody; -import com.inspect.simulator.service.remote.AnalysisRemoteService; -import com.inspect.simulator.service.remote.UpperRemoteService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; -import retrofit2.Call; -import retrofit2.Retrofit; - -import javax.annotation.PostConstruct; - -@Service -public class UpperRemoteServiceImpl implements UpperRemoteService { - private final Retrofit retrofit; - - private UpperRemoteService upperRemoteService; - - public UpperRemoteServiceImpl(@Qualifier("RetrofitOfUpper") Retrofit retrofit) { - this.retrofit = retrofit; - } - - @PostConstruct - public void setup() { - upperRemoteService = retrofit.create(UpperRemoteService.class); - } - - @Override - public Call getOathToken(String grantType, String clientId, String clientSecret) { - return upperRemoteService.getOathToken(grantType, clientId, clientSecret); - } - - @Override - public Call messageNotify(String token, MessageBody messageBody) { - return upperRemoteService.messageNotify(token, messageBody); - } -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..f6a1d53 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,12 @@ +server: + port: 18530 + +spring: + application: + name: inspect-nvr + profiles: + active: dev + + + + diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml deleted file mode 100644 index 5b7742c..0000000 --- a/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,28 +0,0 @@ - -server: - port: 18530 - -spring: - application: - name: inspect-simulator - profiles: - active: test - cloud: - nacos: - discovery: - server-addr: http://192.168.1.116:8848 - namespace: aea23d4f-1dbd-4089-9e80-e2803fb37ffe - config: - server-addr: ${spring.cloud.nacos.discovery.server-addr} - namespace: ${spring.cloud.nacos.discovery.namespace} - file-extension: yml - group: DEFAULT_GROUP - timeout: 5000 - config-long-poll-timeout: 10000 - max-retry: 10 - shared-configs: - - inspect-simulator-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - - main: - allow-bean-definition-overriding: true - allow-circular-references: true diff --git a/src/main/resources/images-2024-08-13.rar b/src/main/resources/images-2024-08-13.rar deleted file mode 100644 index d91d0e8..0000000 Binary files a/src/main/resources/images-2024-08-13.rar and /dev/null differ diff --git a/src/main/resources/images/02160558340532190101.jpg b/src/main/resources/images/02160558340532190101.jpg deleted file mode 100644 index b41f3e7..0000000 Binary files a/src/main/resources/images/02160558340532190101.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190102.jpg b/src/main/resources/images/02160558340532190102.jpg deleted file mode 100644 index 131c538..0000000 Binary files a/src/main/resources/images/02160558340532190102.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190104.jpg b/src/main/resources/images/02160558340532190104.jpg deleted file mode 100644 index 46c257f..0000000 Binary files a/src/main/resources/images/02160558340532190104.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190105.jpg b/src/main/resources/images/02160558340532190105.jpg deleted file mode 100644 index b3323c1..0000000 Binary files a/src/main/resources/images/02160558340532190105.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190106.jpg b/src/main/resources/images/02160558340532190106.jpg deleted file mode 100644 index 1f29a89..0000000 Binary files a/src/main/resources/images/02160558340532190106.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190108.jpg b/src/main/resources/images/02160558340532190108.jpg deleted file mode 100644 index cf4bc6a..0000000 Binary files a/src/main/resources/images/02160558340532190108.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190109.jpg b/src/main/resources/images/02160558340532190109.jpg deleted file mode 100644 index baf3d38..0000000 Binary files a/src/main/resources/images/02160558340532190109.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190110.jpg b/src/main/resources/images/02160558340532190110.jpg deleted file mode 100644 index f5841ca..0000000 Binary files a/src/main/resources/images/02160558340532190110.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190112.jpg b/src/main/resources/images/02160558340532190112.jpg deleted file mode 100644 index c2f38d4..0000000 Binary files a/src/main/resources/images/02160558340532190112.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190113.jpg b/src/main/resources/images/02160558340532190113.jpg deleted file mode 100644 index e66552d..0000000 Binary files a/src/main/resources/images/02160558340532190113.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190114.jpg b/src/main/resources/images/02160558340532190114.jpg deleted file mode 100644 index 867d431..0000000 Binary files a/src/main/resources/images/02160558340532190114.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190115.jpg b/src/main/resources/images/02160558340532190115.jpg deleted file mode 100644 index f6c23ed..0000000 Binary files a/src/main/resources/images/02160558340532190115.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190116.jpg b/src/main/resources/images/02160558340532190116.jpg deleted file mode 100644 index 2abef5a..0000000 Binary files a/src/main/resources/images/02160558340532190116.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190117.jpg b/src/main/resources/images/02160558340532190117.jpg deleted file mode 100644 index 2c44eb5..0000000 Binary files a/src/main/resources/images/02160558340532190117.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190118.jpg b/src/main/resources/images/02160558340532190118.jpg deleted file mode 100644 index ef8145d..0000000 Binary files a/src/main/resources/images/02160558340532190118.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190119.jpg b/src/main/resources/images/02160558340532190119.jpg deleted file mode 100644 index afb2ab1..0000000 Binary files a/src/main/resources/images/02160558340532190119.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190120.jpg b/src/main/resources/images/02160558340532190120.jpg deleted file mode 100644 index da1492f..0000000 Binary files a/src/main/resources/images/02160558340532190120.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190121.jpg b/src/main/resources/images/02160558340532190121.jpg deleted file mode 100644 index 88b1632..0000000 Binary files a/src/main/resources/images/02160558340532190121.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190122.jpg b/src/main/resources/images/02160558340532190122.jpg deleted file mode 100644 index b0d5e08..0000000 Binary files a/src/main/resources/images/02160558340532190122.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190123.jpg b/src/main/resources/images/02160558340532190123.jpg deleted file mode 100644 index d809f19..0000000 Binary files a/src/main/resources/images/02160558340532190123.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190124.jpg b/src/main/resources/images/02160558340532190124.jpg deleted file mode 100644 index 93c3994..0000000 Binary files a/src/main/resources/images/02160558340532190124.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190125.jpg b/src/main/resources/images/02160558340532190125.jpg deleted file mode 100644 index 90ddd29..0000000 Binary files a/src/main/resources/images/02160558340532190125.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190126.jpg b/src/main/resources/images/02160558340532190126.jpg deleted file mode 100644 index 7a849c0..0000000 Binary files a/src/main/resources/images/02160558340532190126.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190128.jpg b/src/main/resources/images/02160558340532190128.jpg deleted file mode 100644 index 3abf405..0000000 Binary files a/src/main/resources/images/02160558340532190128.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190129.jpg b/src/main/resources/images/02160558340532190129.jpg deleted file mode 100644 index 3e16e77..0000000 Binary files a/src/main/resources/images/02160558340532190129.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190130.jpg b/src/main/resources/images/02160558340532190130.jpg deleted file mode 100644 index e69c950..0000000 Binary files a/src/main/resources/images/02160558340532190130.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190132.jpg b/src/main/resources/images/02160558340532190132.jpg deleted file mode 100644 index 305e269..0000000 Binary files a/src/main/resources/images/02160558340532190132.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190133.jpg b/src/main/resources/images/02160558340532190133.jpg deleted file mode 100644 index 08d85d2..0000000 Binary files a/src/main/resources/images/02160558340532190133.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190134.jpg b/src/main/resources/images/02160558340532190134.jpg deleted file mode 100644 index eb7fc58..0000000 Binary files a/src/main/resources/images/02160558340532190134.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190136.jpg b/src/main/resources/images/02160558340532190136.jpg deleted file mode 100644 index fa2d64b..0000000 Binary files a/src/main/resources/images/02160558340532190136.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190137.jpg b/src/main/resources/images/02160558340532190137.jpg deleted file mode 100644 index a4e6696..0000000 Binary files a/src/main/resources/images/02160558340532190137.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190138.jpg b/src/main/resources/images/02160558340532190138.jpg deleted file mode 100644 index 0043939..0000000 Binary files a/src/main/resources/images/02160558340532190138.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190139.jpg b/src/main/resources/images/02160558340532190139.jpg deleted file mode 100644 index 7a0a32c..0000000 Binary files a/src/main/resources/images/02160558340532190139.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190140.jpg b/src/main/resources/images/02160558340532190140.jpg deleted file mode 100644 index 9d0f54e..0000000 Binary files a/src/main/resources/images/02160558340532190140.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190141.jpg b/src/main/resources/images/02160558340532190141.jpg deleted file mode 100644 index 6c4c79b..0000000 Binary files a/src/main/resources/images/02160558340532190141.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190142.jpg b/src/main/resources/images/02160558340532190142.jpg deleted file mode 100644 index d01e749..0000000 Binary files a/src/main/resources/images/02160558340532190142.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190143.jpg b/src/main/resources/images/02160558340532190143.jpg deleted file mode 100644 index b8aca0b..0000000 Binary files a/src/main/resources/images/02160558340532190143.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190144.jpg b/src/main/resources/images/02160558340532190144.jpg deleted file mode 100644 index ca4b0cf..0000000 Binary files a/src/main/resources/images/02160558340532190144.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190145.jpg b/src/main/resources/images/02160558340532190145.jpg deleted file mode 100644 index ac98ace..0000000 Binary files a/src/main/resources/images/02160558340532190145.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190146.jpg b/src/main/resources/images/02160558340532190146.jpg deleted file mode 100644 index 1147ad5..0000000 Binary files a/src/main/resources/images/02160558340532190146.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190147.jpg b/src/main/resources/images/02160558340532190147.jpg deleted file mode 100644 index d222d98..0000000 Binary files a/src/main/resources/images/02160558340532190147.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190148.jpg b/src/main/resources/images/02160558340532190148.jpg deleted file mode 100644 index 7fbab5f..0000000 Binary files a/src/main/resources/images/02160558340532190148.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190149.jpg b/src/main/resources/images/02160558340532190149.jpg deleted file mode 100644 index 0718489..0000000 Binary files a/src/main/resources/images/02160558340532190149.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190150.jpg b/src/main/resources/images/02160558340532190150.jpg deleted file mode 100644 index 494bf07..0000000 Binary files a/src/main/resources/images/02160558340532190150.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190152.jpg b/src/main/resources/images/02160558340532190152.jpg deleted file mode 100644 index dd2ccb0..0000000 Binary files a/src/main/resources/images/02160558340532190152.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190153.jpg b/src/main/resources/images/02160558340532190153.jpg deleted file mode 100644 index e0ef81b..0000000 Binary files a/src/main/resources/images/02160558340532190153.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190154.jpg b/src/main/resources/images/02160558340532190154.jpg deleted file mode 100644 index 59d246c..0000000 Binary files a/src/main/resources/images/02160558340532190154.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190156.jpg b/src/main/resources/images/02160558340532190156.jpg deleted file mode 100644 index ebffde0..0000000 Binary files a/src/main/resources/images/02160558340532190156.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190157.jpg b/src/main/resources/images/02160558340532190157.jpg deleted file mode 100644 index 2918155..0000000 Binary files a/src/main/resources/images/02160558340532190157.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190158.jpg b/src/main/resources/images/02160558340532190158.jpg deleted file mode 100644 index 47551e8..0000000 Binary files a/src/main/resources/images/02160558340532190158.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340532190160.jpg b/src/main/resources/images/02160558340532190160.jpg deleted file mode 100644 index 610fe69..0000000 Binary files a/src/main/resources/images/02160558340532190160.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910101.jpg b/src/main/resources/images/02160558340721910101.jpg deleted file mode 100644 index ed92b9b..0000000 Binary files a/src/main/resources/images/02160558340721910101.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910103.jpg b/src/main/resources/images/02160558340721910103.jpg deleted file mode 100644 index c646888..0000000 Binary files a/src/main/resources/images/02160558340721910103.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910104.jpg b/src/main/resources/images/02160558340721910104.jpg deleted file mode 100644 index 9faf326..0000000 Binary files a/src/main/resources/images/02160558340721910104.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910105.jpg b/src/main/resources/images/02160558340721910105.jpg deleted file mode 100644 index e223c58..0000000 Binary files a/src/main/resources/images/02160558340721910105.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910106.jpg b/src/main/resources/images/02160558340721910106.jpg deleted file mode 100644 index 8daa283..0000000 Binary files a/src/main/resources/images/02160558340721910106.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910108.jpg b/src/main/resources/images/02160558340721910108.jpg deleted file mode 100644 index da1a0cc..0000000 Binary files a/src/main/resources/images/02160558340721910108.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910109.jpg b/src/main/resources/images/02160558340721910109.jpg deleted file mode 100644 index 6b481f5..0000000 Binary files a/src/main/resources/images/02160558340721910109.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910110.jpg b/src/main/resources/images/02160558340721910110.jpg deleted file mode 100644 index 93b5042..0000000 Binary files a/src/main/resources/images/02160558340721910110.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910111.jpg b/src/main/resources/images/02160558340721910111.jpg deleted file mode 100644 index f4dc37b..0000000 Binary files a/src/main/resources/images/02160558340721910111.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910113.jpg b/src/main/resources/images/02160558340721910113.jpg deleted file mode 100644 index f8a7121..0000000 Binary files a/src/main/resources/images/02160558340721910113.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910114.jpg b/src/main/resources/images/02160558340721910114.jpg deleted file mode 100644 index 17d07c8..0000000 Binary files a/src/main/resources/images/02160558340721910114.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910115.jpg b/src/main/resources/images/02160558340721910115.jpg deleted file mode 100644 index 7d17f6a..0000000 Binary files a/src/main/resources/images/02160558340721910115.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910116.jpg b/src/main/resources/images/02160558340721910116.jpg deleted file mode 100644 index 32205e6..0000000 Binary files a/src/main/resources/images/02160558340721910116.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910118.jpg b/src/main/resources/images/02160558340721910118.jpg deleted file mode 100644 index 2bce9aa..0000000 Binary files a/src/main/resources/images/02160558340721910118.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910119.jpg b/src/main/resources/images/02160558340721910119.jpg deleted file mode 100644 index d2ed8bc..0000000 Binary files a/src/main/resources/images/02160558340721910119.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910120.jpg b/src/main/resources/images/02160558340721910120.jpg deleted file mode 100644 index da055c0..0000000 Binary files a/src/main/resources/images/02160558340721910120.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910121.jpg b/src/main/resources/images/02160558340721910121.jpg deleted file mode 100644 index 77c6e1f..0000000 Binary files a/src/main/resources/images/02160558340721910121.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910123.jpg b/src/main/resources/images/02160558340721910123.jpg deleted file mode 100644 index a2fa4e2..0000000 Binary files a/src/main/resources/images/02160558340721910123.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910124.jpg b/src/main/resources/images/02160558340721910124.jpg deleted file mode 100644 index 08a9504..0000000 Binary files a/src/main/resources/images/02160558340721910124.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910125.jpg b/src/main/resources/images/02160558340721910125.jpg deleted file mode 100644 index 1e5b717..0000000 Binary files a/src/main/resources/images/02160558340721910125.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910126.jpg b/src/main/resources/images/02160558340721910126.jpg deleted file mode 100644 index 6c2ad85..0000000 Binary files a/src/main/resources/images/02160558340721910126.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910128.jpg b/src/main/resources/images/02160558340721910128.jpg deleted file mode 100644 index 04e438c..0000000 Binary files a/src/main/resources/images/02160558340721910128.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910129.jpg b/src/main/resources/images/02160558340721910129.jpg deleted file mode 100644 index d0f759d..0000000 Binary files a/src/main/resources/images/02160558340721910129.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910130.jpg b/src/main/resources/images/02160558340721910130.jpg deleted file mode 100644 index cec6d0f..0000000 Binary files a/src/main/resources/images/02160558340721910130.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910131.jpg b/src/main/resources/images/02160558340721910131.jpg deleted file mode 100644 index e1f2b6d..0000000 Binary files a/src/main/resources/images/02160558340721910131.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910133.jpg b/src/main/resources/images/02160558340721910133.jpg deleted file mode 100644 index 4096ba6..0000000 Binary files a/src/main/resources/images/02160558340721910133.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910134.jpg b/src/main/resources/images/02160558340721910134.jpg deleted file mode 100644 index c6ea750..0000000 Binary files a/src/main/resources/images/02160558340721910134.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910135.jpg b/src/main/resources/images/02160558340721910135.jpg deleted file mode 100644 index c340191..0000000 Binary files a/src/main/resources/images/02160558340721910135.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910136.jpg b/src/main/resources/images/02160558340721910136.jpg deleted file mode 100644 index 621d545..0000000 Binary files a/src/main/resources/images/02160558340721910136.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910138.jpg b/src/main/resources/images/02160558340721910138.jpg deleted file mode 100644 index c37c5d3..0000000 Binary files a/src/main/resources/images/02160558340721910138.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910139.jpg b/src/main/resources/images/02160558340721910139.jpg deleted file mode 100644 index 0e09566..0000000 Binary files a/src/main/resources/images/02160558340721910139.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910140.jpg b/src/main/resources/images/02160558340721910140.jpg deleted file mode 100644 index e2a9f32..0000000 Binary files a/src/main/resources/images/02160558340721910140.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910143.jpg b/src/main/resources/images/02160558340721910143.jpg deleted file mode 100644 index cd7a29f..0000000 Binary files a/src/main/resources/images/02160558340721910143.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910144.jpg b/src/main/resources/images/02160558340721910144.jpg deleted file mode 100644 index c6709f9..0000000 Binary files a/src/main/resources/images/02160558340721910144.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910145.jpg b/src/main/resources/images/02160558340721910145.jpg deleted file mode 100644 index 4249b0a..0000000 Binary files a/src/main/resources/images/02160558340721910145.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910146.jpg b/src/main/resources/images/02160558340721910146.jpg deleted file mode 100644 index e3a167d..0000000 Binary files a/src/main/resources/images/02160558340721910146.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910148.jpg b/src/main/resources/images/02160558340721910148.jpg deleted file mode 100644 index be056af..0000000 Binary files a/src/main/resources/images/02160558340721910148.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910149.jpg b/src/main/resources/images/02160558340721910149.jpg deleted file mode 100644 index 17cb1cc..0000000 Binary files a/src/main/resources/images/02160558340721910149.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910152.jpg b/src/main/resources/images/02160558340721910152.jpg deleted file mode 100644 index bc0ae9b..0000000 Binary files a/src/main/resources/images/02160558340721910152.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910153.jpg b/src/main/resources/images/02160558340721910153.jpg deleted file mode 100644 index e312cf8..0000000 Binary files a/src/main/resources/images/02160558340721910153.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910154.jpg b/src/main/resources/images/02160558340721910154.jpg deleted file mode 100644 index 7fa0b15..0000000 Binary files a/src/main/resources/images/02160558340721910154.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910156.jpg b/src/main/resources/images/02160558340721910156.jpg deleted file mode 100644 index ff981f1..0000000 Binary files a/src/main/resources/images/02160558340721910156.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910157.jpg b/src/main/resources/images/02160558340721910157.jpg deleted file mode 100644 index 030736c..0000000 Binary files a/src/main/resources/images/02160558340721910157.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910158.jpg b/src/main/resources/images/02160558340721910158.jpg deleted file mode 100644 index fc4bf8a..0000000 Binary files a/src/main/resources/images/02160558340721910158.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910159.jpg b/src/main/resources/images/02160558340721910159.jpg deleted file mode 100644 index 8b2d702..0000000 Binary files a/src/main/resources/images/02160558340721910159.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910160.jpg b/src/main/resources/images/02160558340721910160.jpg deleted file mode 100644 index b42ffa9..0000000 Binary files a/src/main/resources/images/02160558340721910160.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558340721910161.jpg b/src/main/resources/images/02160558340721910161.jpg deleted file mode 100644 index 1c902ef..0000000 Binary files a/src/main/resources/images/02160558340721910161.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360101.jpg b/src/main/resources/images/02160558345383360101.jpg deleted file mode 100644 index 0b5347e..0000000 Binary files a/src/main/resources/images/02160558345383360101.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360102.jpg b/src/main/resources/images/02160558345383360102.jpg deleted file mode 100644 index f292d9c..0000000 Binary files a/src/main/resources/images/02160558345383360102.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360103.jpg b/src/main/resources/images/02160558345383360103.jpg deleted file mode 100644 index 0ccc8e5..0000000 Binary files a/src/main/resources/images/02160558345383360103.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360104.jpg b/src/main/resources/images/02160558345383360104.jpg deleted file mode 100644 index 82551aa..0000000 Binary files a/src/main/resources/images/02160558345383360104.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360105.jpg b/src/main/resources/images/02160558345383360105.jpg deleted file mode 100644 index fb7f7f0..0000000 Binary files a/src/main/resources/images/02160558345383360105.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360106.jpg b/src/main/resources/images/02160558345383360106.jpg deleted file mode 100644 index 19fb5de..0000000 Binary files a/src/main/resources/images/02160558345383360106.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360107.jpg b/src/main/resources/images/02160558345383360107.jpg deleted file mode 100644 index dc82ddd..0000000 Binary files a/src/main/resources/images/02160558345383360107.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360108.jpg b/src/main/resources/images/02160558345383360108.jpg deleted file mode 100644 index 01b1b75..0000000 Binary files a/src/main/resources/images/02160558345383360108.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360110.jpg b/src/main/resources/images/02160558345383360110.jpg deleted file mode 100644 index e6297d9..0000000 Binary files a/src/main/resources/images/02160558345383360110.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360111.jpg b/src/main/resources/images/02160558345383360111.jpg deleted file mode 100644 index 687ab46..0000000 Binary files a/src/main/resources/images/02160558345383360111.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360112.jpg b/src/main/resources/images/02160558345383360112.jpg deleted file mode 100644 index ad0a123..0000000 Binary files a/src/main/resources/images/02160558345383360112.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360113.jpg b/src/main/resources/images/02160558345383360113.jpg deleted file mode 100644 index 06e9a65..0000000 Binary files a/src/main/resources/images/02160558345383360113.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360114.jpg b/src/main/resources/images/02160558345383360114.jpg deleted file mode 100644 index 08cf0c7..0000000 Binary files a/src/main/resources/images/02160558345383360114.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360115.jpg b/src/main/resources/images/02160558345383360115.jpg deleted file mode 100644 index 9eb5682..0000000 Binary files a/src/main/resources/images/02160558345383360115.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360116.jpg b/src/main/resources/images/02160558345383360116.jpg deleted file mode 100644 index 95ac180..0000000 Binary files a/src/main/resources/images/02160558345383360116.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360117.jpg b/src/main/resources/images/02160558345383360117.jpg deleted file mode 100644 index d7a435e..0000000 Binary files a/src/main/resources/images/02160558345383360117.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360118.jpg b/src/main/resources/images/02160558345383360118.jpg deleted file mode 100644 index 75f508f..0000000 Binary files a/src/main/resources/images/02160558345383360118.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360120.jpg b/src/main/resources/images/02160558345383360120.jpg deleted file mode 100644 index 21b9cfd..0000000 Binary files a/src/main/resources/images/02160558345383360120.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360121.jpg b/src/main/resources/images/02160558345383360121.jpg deleted file mode 100644 index 55fa354..0000000 Binary files a/src/main/resources/images/02160558345383360121.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360122.jpg b/src/main/resources/images/02160558345383360122.jpg deleted file mode 100644 index 3b111ed..0000000 Binary files a/src/main/resources/images/02160558345383360122.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360124.jpg b/src/main/resources/images/02160558345383360124.jpg deleted file mode 100644 index ba5fbc2..0000000 Binary files a/src/main/resources/images/02160558345383360124.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360125.jpg b/src/main/resources/images/02160558345383360125.jpg deleted file mode 100644 index 704f8db..0000000 Binary files a/src/main/resources/images/02160558345383360125.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360126.jpg b/src/main/resources/images/02160558345383360126.jpg deleted file mode 100644 index a98fc36..0000000 Binary files a/src/main/resources/images/02160558345383360126.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360127.jpg b/src/main/resources/images/02160558345383360127.jpg deleted file mode 100644 index 7379121..0000000 Binary files a/src/main/resources/images/02160558345383360127.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360128.jpg b/src/main/resources/images/02160558345383360128.jpg deleted file mode 100644 index a8b630b..0000000 Binary files a/src/main/resources/images/02160558345383360128.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360130.jpg b/src/main/resources/images/02160558345383360130.jpg deleted file mode 100644 index 7eaf2b1..0000000 Binary files a/src/main/resources/images/02160558345383360130.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360131.jpg b/src/main/resources/images/02160558345383360131.jpg deleted file mode 100644 index e39a8bd..0000000 Binary files a/src/main/resources/images/02160558345383360131.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360132.jpg b/src/main/resources/images/02160558345383360132.jpg deleted file mode 100644 index 8775fd2..0000000 Binary files a/src/main/resources/images/02160558345383360132.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360133.jpg b/src/main/resources/images/02160558345383360133.jpg deleted file mode 100644 index 5a787b0..0000000 Binary files a/src/main/resources/images/02160558345383360133.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360134.jpg b/src/main/resources/images/02160558345383360134.jpg deleted file mode 100644 index e39a8bd..0000000 Binary files a/src/main/resources/images/02160558345383360134.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360135.jpg b/src/main/resources/images/02160558345383360135.jpg deleted file mode 100644 index 34ccd53..0000000 Binary files a/src/main/resources/images/02160558345383360135.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360136.jpg b/src/main/resources/images/02160558345383360136.jpg deleted file mode 100644 index 96ac955..0000000 Binary files a/src/main/resources/images/02160558345383360136.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360138.jpg b/src/main/resources/images/02160558345383360138.jpg deleted file mode 100644 index dd2d7c5..0000000 Binary files a/src/main/resources/images/02160558345383360138.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360139.jpg b/src/main/resources/images/02160558345383360139.jpg deleted file mode 100644 index c71674d..0000000 Binary files a/src/main/resources/images/02160558345383360139.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360140.jpg b/src/main/resources/images/02160558345383360140.jpg deleted file mode 100644 index e21e63f..0000000 Binary files a/src/main/resources/images/02160558345383360140.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360141.jpg b/src/main/resources/images/02160558345383360141.jpg deleted file mode 100644 index 32e98f5..0000000 Binary files a/src/main/resources/images/02160558345383360141.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360142.jpg b/src/main/resources/images/02160558345383360142.jpg deleted file mode 100644 index 9b7c459..0000000 Binary files a/src/main/resources/images/02160558345383360142.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360143.jpg b/src/main/resources/images/02160558345383360143.jpg deleted file mode 100644 index fdac8b9..0000000 Binary files a/src/main/resources/images/02160558345383360143.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558345383360144.jpg b/src/main/resources/images/02160558345383360144.jpg deleted file mode 100644 index 41a4b05..0000000 Binary files a/src/main/resources/images/02160558345383360144.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710101.jpg b/src/main/resources/images/02160558348356710101.jpg deleted file mode 100644 index e223c58..0000000 Binary files a/src/main/resources/images/02160558348356710101.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710102.jpg b/src/main/resources/images/02160558348356710102.jpg deleted file mode 100644 index 610fe69..0000000 Binary files a/src/main/resources/images/02160558348356710102.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710104.jpg b/src/main/resources/images/02160558348356710104.jpg deleted file mode 100644 index 28744db..0000000 Binary files a/src/main/resources/images/02160558348356710104.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710105.jpg b/src/main/resources/images/02160558348356710105.jpg deleted file mode 100644 index 5b28499..0000000 Binary files a/src/main/resources/images/02160558348356710105.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710106.jpg b/src/main/resources/images/02160558348356710106.jpg deleted file mode 100644 index e06e477..0000000 Binary files a/src/main/resources/images/02160558348356710106.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710108.jpg b/src/main/resources/images/02160558348356710108.jpg deleted file mode 100644 index 87717a8..0000000 Binary files a/src/main/resources/images/02160558348356710108.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710109.jpg b/src/main/resources/images/02160558348356710109.jpg deleted file mode 100644 index 6171f7d..0000000 Binary files a/src/main/resources/images/02160558348356710109.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710110.jpg b/src/main/resources/images/02160558348356710110.jpg deleted file mode 100644 index 20e8353..0000000 Binary files a/src/main/resources/images/02160558348356710110.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710112.jpg b/src/main/resources/images/02160558348356710112.jpg deleted file mode 100644 index 1360054..0000000 Binary files a/src/main/resources/images/02160558348356710112.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710113.jpg b/src/main/resources/images/02160558348356710113.jpg deleted file mode 100644 index fed3f4a..0000000 Binary files a/src/main/resources/images/02160558348356710113.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710114.jpg b/src/main/resources/images/02160558348356710114.jpg deleted file mode 100644 index 6ee9a12..0000000 Binary files a/src/main/resources/images/02160558348356710114.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710115.jpg b/src/main/resources/images/02160558348356710115.jpg deleted file mode 100644 index 86288a2..0000000 Binary files a/src/main/resources/images/02160558348356710115.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710116.jpg b/src/main/resources/images/02160558348356710116.jpg deleted file mode 100644 index 7dbb672..0000000 Binary files a/src/main/resources/images/02160558348356710116.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710117.jpg b/src/main/resources/images/02160558348356710117.jpg deleted file mode 100644 index 55cee6b..0000000 Binary files a/src/main/resources/images/02160558348356710117.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710118.jpg b/src/main/resources/images/02160558348356710118.jpg deleted file mode 100644 index 2e439bc..0000000 Binary files a/src/main/resources/images/02160558348356710118.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710119.jpg b/src/main/resources/images/02160558348356710119.jpg deleted file mode 100644 index 4a5bd51..0000000 Binary files a/src/main/resources/images/02160558348356710119.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710120.jpg b/src/main/resources/images/02160558348356710120.jpg deleted file mode 100644 index 1f0a814..0000000 Binary files a/src/main/resources/images/02160558348356710120.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710121.jpg b/src/main/resources/images/02160558348356710121.jpg deleted file mode 100644 index 0f9ceef..0000000 Binary files a/src/main/resources/images/02160558348356710121.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710123.jpg b/src/main/resources/images/02160558348356710123.jpg deleted file mode 100644 index eb96ce7..0000000 Binary files a/src/main/resources/images/02160558348356710123.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710124.jpg b/src/main/resources/images/02160558348356710124.jpg deleted file mode 100644 index 076e729..0000000 Binary files a/src/main/resources/images/02160558348356710124.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710125.jpg b/src/main/resources/images/02160558348356710125.jpg deleted file mode 100644 index b12a5f3..0000000 Binary files a/src/main/resources/images/02160558348356710125.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710126.jpg b/src/main/resources/images/02160558348356710126.jpg deleted file mode 100644 index 10b9ba0..0000000 Binary files a/src/main/resources/images/02160558348356710126.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710128.jpg b/src/main/resources/images/02160558348356710128.jpg deleted file mode 100644 index 1025ce0..0000000 Binary files a/src/main/resources/images/02160558348356710128.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710129.jpg b/src/main/resources/images/02160558348356710129.jpg deleted file mode 100644 index 591a5da..0000000 Binary files a/src/main/resources/images/02160558348356710129.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710130.jpg b/src/main/resources/images/02160558348356710130.jpg deleted file mode 100644 index 4d5bbff..0000000 Binary files a/src/main/resources/images/02160558348356710130.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710132.jpg b/src/main/resources/images/02160558348356710132.jpg deleted file mode 100644 index aa8f0e7..0000000 Binary files a/src/main/resources/images/02160558348356710132.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710133.jpg b/src/main/resources/images/02160558348356710133.jpg deleted file mode 100644 index b41f3e7..0000000 Binary files a/src/main/resources/images/02160558348356710133.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710134.jpg b/src/main/resources/images/02160558348356710134.jpg deleted file mode 100644 index da1a0cc..0000000 Binary files a/src/main/resources/images/02160558348356710134.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710136.jpg b/src/main/resources/images/02160558348356710136.jpg deleted file mode 100644 index e57784e..0000000 Binary files a/src/main/resources/images/02160558348356710136.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710137.jpg b/src/main/resources/images/02160558348356710137.jpg deleted file mode 100644 index 1147ad5..0000000 Binary files a/src/main/resources/images/02160558348356710137.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710138.jpg b/src/main/resources/images/02160558348356710138.jpg deleted file mode 100644 index ebffde0..0000000 Binary files a/src/main/resources/images/02160558348356710138.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710139.jpg b/src/main/resources/images/02160558348356710139.jpg deleted file mode 100644 index b41f3e7..0000000 Binary files a/src/main/resources/images/02160558348356710139.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710140.jpg b/src/main/resources/images/02160558348356710140.jpg deleted file mode 100644 index b12a5f3..0000000 Binary files a/src/main/resources/images/02160558348356710140.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710141.jpg b/src/main/resources/images/02160558348356710141.jpg deleted file mode 100644 index f0605b3..0000000 Binary files a/src/main/resources/images/02160558348356710141.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710142.jpg b/src/main/resources/images/02160558348356710142.jpg deleted file mode 100644 index 1147ad5..0000000 Binary files a/src/main/resources/images/02160558348356710142.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710144.jpg b/src/main/resources/images/02160558348356710144.jpg deleted file mode 100644 index ac98ace..0000000 Binary files a/src/main/resources/images/02160558348356710144.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710145.jpg b/src/main/resources/images/02160558348356710145.jpg deleted file mode 100644 index 8e67cdb..0000000 Binary files a/src/main/resources/images/02160558348356710145.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710146.jpg b/src/main/resources/images/02160558348356710146.jpg deleted file mode 100644 index 23cb50d..0000000 Binary files a/src/main/resources/images/02160558348356710146.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710147.jpg b/src/main/resources/images/02160558348356710147.jpg deleted file mode 100644 index f8a7121..0000000 Binary files a/src/main/resources/images/02160558348356710147.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710148.jpg b/src/main/resources/images/02160558348356710148.jpg deleted file mode 100644 index e28cfa2..0000000 Binary files a/src/main/resources/images/02160558348356710148.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710149.jpg b/src/main/resources/images/02160558348356710149.jpg deleted file mode 100644 index c980a5c..0000000 Binary files a/src/main/resources/images/02160558348356710149.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710150.jpg b/src/main/resources/images/02160558348356710150.jpg deleted file mode 100644 index 7ae7663..0000000 Binary files a/src/main/resources/images/02160558348356710150.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710152.jpg b/src/main/resources/images/02160558348356710152.jpg deleted file mode 100644 index 3226389..0000000 Binary files a/src/main/resources/images/02160558348356710152.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710153.jpg b/src/main/resources/images/02160558348356710153.jpg deleted file mode 100644 index 2918155..0000000 Binary files a/src/main/resources/images/02160558348356710153.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710154.jpg b/src/main/resources/images/02160558348356710154.jpg deleted file mode 100644 index dd2ccb0..0000000 Binary files a/src/main/resources/images/02160558348356710154.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710156.jpg b/src/main/resources/images/02160558348356710156.jpg deleted file mode 100644 index a4e6696..0000000 Binary files a/src/main/resources/images/02160558348356710156.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710157.jpg b/src/main/resources/images/02160558348356710157.jpg deleted file mode 100644 index 3226389..0000000 Binary files a/src/main/resources/images/02160558348356710157.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348356710160.jpg b/src/main/resources/images/02160558348356710160.jpg deleted file mode 100644 index 4eebc31..0000000 Binary files a/src/main/resources/images/02160558348356710160.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680101.jpg b/src/main/resources/images/02160558348953680101.jpg deleted file mode 100644 index 7ae7663..0000000 Binary files a/src/main/resources/images/02160558348953680101.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680102.jpg b/src/main/resources/images/02160558348953680102.jpg deleted file mode 100644 index 92f072c..0000000 Binary files a/src/main/resources/images/02160558348953680102.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680103.jpg b/src/main/resources/images/02160558348953680103.jpg deleted file mode 100644 index 98bdb1f..0000000 Binary files a/src/main/resources/images/02160558348953680103.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680104.jpg b/src/main/resources/images/02160558348953680104.jpg deleted file mode 100644 index f0605b3..0000000 Binary files a/src/main/resources/images/02160558348953680104.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680105.jpg b/src/main/resources/images/02160558348953680105.jpg deleted file mode 100644 index e705265..0000000 Binary files a/src/main/resources/images/02160558348953680105.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680106.jpg b/src/main/resources/images/02160558348953680106.jpg deleted file mode 100644 index c980a5c..0000000 Binary files a/src/main/resources/images/02160558348953680106.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680107.jpg b/src/main/resources/images/02160558348953680107.jpg deleted file mode 100644 index a0f362b..0000000 Binary files a/src/main/resources/images/02160558348953680107.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680108.jpg b/src/main/resources/images/02160558348953680108.jpg deleted file mode 100644 index 96edeee..0000000 Binary files a/src/main/resources/images/02160558348953680108.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680109.jpg b/src/main/resources/images/02160558348953680109.jpg deleted file mode 100644 index 19752c5..0000000 Binary files a/src/main/resources/images/02160558348953680109.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680110.jpg b/src/main/resources/images/02160558348953680110.jpg deleted file mode 100644 index 23cb50d..0000000 Binary files a/src/main/resources/images/02160558348953680110.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680111.jpg b/src/main/resources/images/02160558348953680111.jpg deleted file mode 100644 index 28744db..0000000 Binary files a/src/main/resources/images/02160558348953680111.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680112.jpg b/src/main/resources/images/02160558348953680112.jpg deleted file mode 100644 index 8e67cdb..0000000 Binary files a/src/main/resources/images/02160558348953680112.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680113.jpg b/src/main/resources/images/02160558348953680113.jpg deleted file mode 100644 index e28cfa2..0000000 Binary files a/src/main/resources/images/02160558348953680113.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680114.jpg b/src/main/resources/images/02160558348953680114.jpg deleted file mode 100644 index 3226389..0000000 Binary files a/src/main/resources/images/02160558348953680114.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680115.jpg b/src/main/resources/images/02160558348953680115.jpg deleted file mode 100644 index 4eebc31..0000000 Binary files a/src/main/resources/images/02160558348953680115.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680116.jpg b/src/main/resources/images/02160558348953680116.jpg deleted file mode 100644 index 5b28499..0000000 Binary files a/src/main/resources/images/02160558348953680116.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680117.jpg b/src/main/resources/images/02160558348953680117.jpg deleted file mode 100644 index e06e477..0000000 Binary files a/src/main/resources/images/02160558348953680117.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680118.jpg b/src/main/resources/images/02160558348953680118.jpg deleted file mode 100644 index 87717a8..0000000 Binary files a/src/main/resources/images/02160558348953680118.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680119.jpg b/src/main/resources/images/02160558348953680119.jpg deleted file mode 100644 index 6171f7d..0000000 Binary files a/src/main/resources/images/02160558348953680119.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680120.jpg b/src/main/resources/images/02160558348953680120.jpg deleted file mode 100644 index 1360054..0000000 Binary files a/src/main/resources/images/02160558348953680120.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680121.jpg b/src/main/resources/images/02160558348953680121.jpg deleted file mode 100644 index 20e8353..0000000 Binary files a/src/main/resources/images/02160558348953680121.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680123.jpg b/src/main/resources/images/02160558348953680123.jpg deleted file mode 100644 index fed3f4a..0000000 Binary files a/src/main/resources/images/02160558348953680123.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680124.jpg b/src/main/resources/images/02160558348953680124.jpg deleted file mode 100644 index 6ee9a12..0000000 Binary files a/src/main/resources/images/02160558348953680124.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680125.jpg b/src/main/resources/images/02160558348953680125.jpg deleted file mode 100644 index 86288a2..0000000 Binary files a/src/main/resources/images/02160558348953680125.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680126.jpg b/src/main/resources/images/02160558348953680126.jpg deleted file mode 100644 index 4a5bd51..0000000 Binary files a/src/main/resources/images/02160558348953680126.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680127.jpg b/src/main/resources/images/02160558348953680127.jpg deleted file mode 100644 index 7dbb672..0000000 Binary files a/src/main/resources/images/02160558348953680127.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680129.jpg b/src/main/resources/images/02160558348953680129.jpg deleted file mode 100644 index 1f0a814..0000000 Binary files a/src/main/resources/images/02160558348953680129.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680130.jpg b/src/main/resources/images/02160558348953680130.jpg deleted file mode 100644 index 2e439bc..0000000 Binary files a/src/main/resources/images/02160558348953680130.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680131.jpg b/src/main/resources/images/02160558348953680131.jpg deleted file mode 100644 index 55cee6b..0000000 Binary files a/src/main/resources/images/02160558348953680131.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680132.jpg b/src/main/resources/images/02160558348953680132.jpg deleted file mode 100644 index d464e9c..0000000 Binary files a/src/main/resources/images/02160558348953680132.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680134.jpg b/src/main/resources/images/02160558348953680134.jpg deleted file mode 100644 index cbfe2e0..0000000 Binary files a/src/main/resources/images/02160558348953680134.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680135.jpg b/src/main/resources/images/02160558348953680135.jpg deleted file mode 100644 index df35867..0000000 Binary files a/src/main/resources/images/02160558348953680135.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680136.jpg b/src/main/resources/images/02160558348953680136.jpg deleted file mode 100644 index c151245..0000000 Binary files a/src/main/resources/images/02160558348953680136.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680137.jpg b/src/main/resources/images/02160558348953680137.jpg deleted file mode 100644 index ac7253b..0000000 Binary files a/src/main/resources/images/02160558348953680137.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680139.jpg b/src/main/resources/images/02160558348953680139.jpg deleted file mode 100644 index e57784e..0000000 Binary files a/src/main/resources/images/02160558348953680139.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680140.jpg b/src/main/resources/images/02160558348953680140.jpg deleted file mode 100644 index fb2eb7d..0000000 Binary files a/src/main/resources/images/02160558348953680140.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680141.jpg b/src/main/resources/images/02160558348953680141.jpg deleted file mode 100644 index aa2049a..0000000 Binary files a/src/main/resources/images/02160558348953680141.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680142.jpg b/src/main/resources/images/02160558348953680142.jpg deleted file mode 100644 index 0f9ceef..0000000 Binary files a/src/main/resources/images/02160558348953680142.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680144.jpg b/src/main/resources/images/02160558348953680144.jpg deleted file mode 100644 index eb96ce7..0000000 Binary files a/src/main/resources/images/02160558348953680144.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680145.jpg b/src/main/resources/images/02160558348953680145.jpg deleted file mode 100644 index 076e729..0000000 Binary files a/src/main/resources/images/02160558348953680145.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680146.jpg b/src/main/resources/images/02160558348953680146.jpg deleted file mode 100644 index b12a5f3..0000000 Binary files a/src/main/resources/images/02160558348953680146.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680148.jpg b/src/main/resources/images/02160558348953680148.jpg deleted file mode 100644 index 10b9ba0..0000000 Binary files a/src/main/resources/images/02160558348953680148.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680149.jpg b/src/main/resources/images/02160558348953680149.jpg deleted file mode 100644 index 1025ce0..0000000 Binary files a/src/main/resources/images/02160558348953680149.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680150.jpg b/src/main/resources/images/02160558348953680150.jpg deleted file mode 100644 index 591a5da..0000000 Binary files a/src/main/resources/images/02160558348953680150.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680152.jpg b/src/main/resources/images/02160558348953680152.jpg deleted file mode 100644 index 4d5bbff..0000000 Binary files a/src/main/resources/images/02160558348953680152.jpg and /dev/null differ diff --git a/src/main/resources/images/02160558348953680153.jpg b/src/main/resources/images/02160558348953680153.jpg deleted file mode 100644 index aa8f0e7..0000000 Binary files a/src/main/resources/images/02160558348953680153.jpg and /dev/null differ diff --git a/src/main/resources/images/infrared_default.jpg b/src/main/resources/images/infrared_default.jpg new file mode 100644 index 0000000..d788d51 Binary files /dev/null and b/src/main/resources/images/infrared_default.jpg differ diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index cd4f5be..8b63258 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -32,7 +32,7 @@ 512MB - ${LOG_HOME}/archive/inspect-simulator.%d{yyyy-MM-dd}-%i.log.gz + ${LOG_HOME}/archive/inspect-nvr.%d{yyyy-MM-dd}-%i.log.gz 60 diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 353a7d0..1484479 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/src/main/resources/mapper/BasedataPatrolPointMapper.xml b/src/main/resources/mapper/BasedataPatrolPointMapper.xml deleted file mode 100644 index c422ec4..0000000 --- a/src/main/resources/mapper/BasedataPatrolPointMapper.xml +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select patrol_point_id, - patrol_point_code, - patrol_point_name, - device_type_id, - main_device_id, - device_id, - area_id, - patrol_content, - purpose, - create_by, - create_time, - update_by, - update_time, - delete_flag, - std_parol_point_id, - point_impt_level, - patrol_type_id, - lower_value, - upper_value, - position_x, - position_y, - position_z, - alg_subtype_ids, - original_alg_subtype_ids, - original_device_id, - dis_ref_picture_path, - original_main_device_id, - alarm_threshold, - meter_type - from basedata_patrolpoint - - - - - - - - - - - - - - insert into basedata_patrolpoint - - patrol_point_code, - patrol_point_name, - device_type_id, - main_device_id, - device_id, - area_id, - patrol_content, - purpose, - create_by, - create_time, - update_by, - update_time, - delete_flag, - std_parol_point_id, - point_impt_level, - patrol_type_id, - lower_value, - upper_value, - position_x, - position_y, - position_z, - alg_subtype_ids, - original_alg_subtype_ids, - original_device_id, - dis_ref_picture_path, - original_main_device_id, - alarm_threshold, - meter_type, - - - #{patrolPointCode}, - #{patrolPointName}, - #{deviceTypeId}, - #{mainDeviceId}, - #{deviceId}, - #{areaId}, - #{patrolContent}, - #{purpose}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{deleteFlag}, - #{stdParolPointId}, - #{pointImptLevel}, - #{patrolTypeId}, - #{lowerValue}, - #{upperValue}, - #{positionX}, - #{positionY}, - #{positionZ}, - #{algSubtypeIds}, - #{originalAlgSubtypeIds}, - #{originalDeviceId}, - #{disRefPicturePath}, - #{originalMainDeviceId}, - #{alarmThreshold}, - #{meterType}, - - - - - update basedata_patrolpoint - - patrol_point_code = #{patrolPointCode}, - patrol_point_name = #{patrolPointName}, - device_type_id = #{deviceTypeId}, - main_device_id = #{mainDeviceId}, - device_id = #{deviceId}, - area_id = #{areaId}, - patrol_content = #{patrolContent}, - purpose = #{purpose}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - delete_flag = #{deleteFlag}, - std_parol_point_id = #{stdParolPointId}, - point_impt_level = #{pointImptLevel}, - patrol_type_id = #{patrolTypeId}, - upper_value = #{upperValue}, - lower_value = #{lowerValue}, - position_x = #{positionX}, - position_y = #{positionY}, - position_z = #{positionZ}, - alg_subtype_ids = #{algSubtypeIds}, - original_alg_subtype_ids = #{originalAlgSubtypeIds}, - original_device_id = #{originalDeviceId}, - dis_ref_picture_path = #{disRefPicturePath}, - original_main_device_id = #{originalMainDeviceId}, - alarm_threshold = #{alarmThreshold}, - meter_type = #{meterType}, - - where patrol_point_id = #{patrolPointId} - - - - delete - from basedata_patrolpoint - where patrol_point_id = #{patrolPointId} - - - - delete from basedata_patrolpoint where patrol_point_id in - - #{patrolPointId} - - - - diff --git a/src/main/resources/mapper/InfraredBoxMapper.xml b/src/main/resources/mapper/InfraredBoxMapper.xml deleted file mode 100644 index 7c3d0c2..0000000 --- a/src/main/resources/mapper/InfraredBoxMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - insert into basedata_infrared_box (img_name,img_width,img_height,points_xy,max_value,min_value,avg_value,box_name,width,height) - - #{infraredBox.imgName},#{infraredBox.imgWidth},#{infraredBox.imgHeight},#{infraredBox.pointsXy}, - #{infraredBox.maxValue},#{infraredBox.minValue},#{infraredBox.avgValue},#{infraredBox.boxName}, - #{infraredBox.width},#{infraredBox.height} - - - - - delete from basedata_infrared_box where img_name = #{imgName} - - - - - diff --git a/src/main/resources/mapper/PatrolPresetPosMapper.xml b/src/main/resources/mapper/PatrolPresetPosMapper.xml deleted file mode 100644 index 16c3759..0000000 --- a/src/main/resources/mapper/PatrolPresetPosMapper.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select preset_pos_id, - preset_pos_code, - preset_pos_name, - patrol_point_id, - channel_id, - coordinate_type, - stop_time, - channel_img, - description, - is_enable, - create_time, - alg_subtype_code, - eqp_book_id, - channel_code, - channel_type, - patrol_device_code, - video_nvr_code - from patrol_preset_pos - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/PatrolResultMapper.xml b/src/main/resources/mapper/PatrolResultMapper.xml deleted file mode 100644 index d7bb533..0000000 --- a/src/main/resources/mapper/PatrolResultMapper.xml +++ /dev/null @@ -1,792 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select line_id, - main_id, - check_result, - create_time, - task_id, - patroldevice_name, - patrol_status, - check_person, - check_time, - patroldevice_code, - task_name, - task_code, - device_name, - device_id, - value_type, - value, - value_unit, - unit, time, recognition_type, file_type, file_path, rectangle, task_patrolled_id, valid, material_id, data_type, threshold - from patrol_result - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into patrol_result - - patroldevice_name, - patroldevice_code, - task_name, - task_code, - device_name, - device_id, - value_type, - value, - value_unit, - unit, - time, - recognition_type, - file_type, - file_path, - rectangle, - task_patrolled_id, - valid, - patrol_status, - check_person, - check_time, - check_result, - material_id, - data_type, - threshold, - task_id, - main_id, - create_time, - - - #{patrolDeviceName}, - #{patrolDeviceCode}, - #{taskName}, - #{taskCode}, - #{deviceName}, - #{deviceId}, - #{valueType}, - #{value}, - #{valueUnit}, - #{unit}, - #{time}, - #{recognitionType}, - #{fileType}, - #{filePath}, - #{rectangle}, - #{taskPatrolledId}, - #{valid}, - #{patrolStatus}, - #{checkPerson}, - #{checkTime}, - #{checkResult}, - #{materialId}, - #{dataType}, - #{threshold}, - #{taskId}, - #{mainId}, - #{createTime}, - - - - - update patrol_result - - patroldevice_name = #{patrolDeviceName}, - patroldevice_code = #{patrolDeviceCode}, - task_name = #{taskName}, - task_code = #{taskCode}, - device_name = #{deviceName}, - device_id = #{deviceId}, - value_type = #{valueType}, - value = #{value}, - value_unit = #{valueUnit}, - unit = #{unit}, - time = #{time}, - recognition_type = #{recognitionType}, - file_type = #{fileType}, - file_path = #{filePath}, - rectangle = #{rectangle}, - task_patrolled_id = #{taskPatrolledId}, - valid = #{valid}, - patrol_status = #{patrolStatus}, - check_person = #{checkPerson}, - check_time = #{checkTime}, - check_result = #{checkResult}, - material_id = #{materialId}, - data_type = #{dataType}, - threshold = #{threshold}, - task_id = #{taskId}, - main_id = #{mainId}, - - where line_id = #{lineId} - - - - update patrol_result - set patrol_status = '1' - where main_id = #{mainId} - - - delete - from patrol_result - where line_id = #{lineId} - - - - delete from patrol_result where line_id in - - #{lineId} - - - - - update patrol_result - - value = #{value}, - - where line_id = #{lineId} - - - update patrol_result set check_time = now() where line_id in - - #{lineId} - - - - - - - - - - - - - - - - - - select id, type, task_code, threshold, msg - from statistics_task_config - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/PatrolUpdataLog.xml b/src/main/resources/mapper/PatrolUpdataLog.xml deleted file mode 100644 index 7740efc..0000000 --- a/src/main/resources/mapper/PatrolUpdataLog.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/ResultAnalysisMapper.xml b/src/main/resources/mapper/ResultAnalysisMapper.xml deleted file mode 100644 index ac7d742..0000000 --- a/src/main/resources/mapper/ResultAnalysisMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/metadata/BasedataEqpBookChannelMapper.xml b/src/main/resources/mapper/metadata/BasedataEqpBookChannelMapper.xml deleted file mode 100644 index c395efd..0000000 --- a/src/main/resources/mapper/metadata/BasedataEqpBookChannelMapper.xml +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select channel_id, - channel_code, - channel_name, - parent_channel_id, - eqp_book_id, - channel_type, - online_state, - channel_content, - provider, - address, - host, - port, - create_by, - create_time, - update_by, - update_time, - delete_flag, - patrol_device_code, - username, - password, - device_source - from basedata_eqpbook_channel - - - - - - - - insert into basedata_eqpbook_channel - - channel_code, - channel_name, - parent_channel_id, - eqp_book_id, - channel_type, - online_state, - channel_content, - provider, - address, - host, - port, - create_by, - create_time, - update_by, - update_time, - delete_flag, - patrol_device_code, - username, - password, - device_source, - - - #{channelCode}, - #{channelName}, - #{parentChannelId}, - #{eqpBookId}, - #{channelType}, - #{onlineState}, - #{channelContent}, - #{provider}, - #{address}, - #{host}, - #{port}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{deleteFlag}, - #{patrolDeviceCode}, - #{username}, - #{password}, - #{deviceSource}, - - - - - update basedata_eqpbook_channel - - channel_code = #{channelCode}, - channel_name = #{channelName}, - parent_channel_id = #{parentChannelId}, - eqp_book_id = #{eqpBookId}, - channel_type = #{channelType}, - online_state = #{onlineState}, - channel_content = #{channelContent}, - provider = #{provider}, - address = #{address}, - host = #{host}, - port = #{port}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - delete_flag = #{deleteFlag}, - patrol_device_code = #{patrolDeviceCode}, - username = #{username}, - password = #{password}, - device_source = #{deviceSource}, - - where channel_id = #{channelId} - - - - delete - from basedata_eqpbook_channel - where channel_id = #{channelId} - - - - delete from basedata_eqpbook_channel where channel_id in - - #{channelId} - - - - - \ No newline at end of file