shjung hace 2 años
padre
commit
5f8efbe4c4

+ 4 - 0
src/main/java/com/its/op/dto/its/cctv/TbCctvCtlrSttsDto.java

@@ -3,8 +3,10 @@ package com.its.op.dto.its.cctv;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -13,6 +15,8 @@ import java.io.Serializable;
  */
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @ApiModel("TbCctvCtlrSttsDto(CCTV 상태)")
 public class TbCctvCtlrSttsDto implements Serializable {
     private static final long serialVersionUID = 1L;

+ 1 - 0
src/main/java/com/its/op/service/its/cctv/CctvControlService.java

@@ -501,6 +501,7 @@ public class CctvControlService {
             try {
                 log.info("requestPresetValue: {}", resultString);
                 result = objectMapper.readValue(resultString, CctvPresetControlDto.CctvPresetValueRes.class);
+                //TODO: 필요한 경우 나머지 필드(코드설명 등) 값을 여기서 채워 줘야 한다.
             } catch (JsonProcessingException e) {
                 log.error("requestPresetValue: result json parsing error: {}", resultString);
                 return new CctvPresetControlDto.CctvPresetValueRes(9, "CCTV 카메라 현재위치 요청 결과 수신 중 오류가 발생했습니다.");

+ 7 - 0
src/main/java/com/its/op/service/its/unit/TbUnitSystService.java

@@ -1,5 +1,7 @@
 package com.its.op.service.its.unit;
 
+import com.its.op.config.AppUtils;
+import com.its.op.config.CctvServerConfig;
 import com.its.op.dao.repository.its.unit.TbUnitSystRepository;
 import com.its.op.dto.its.unit.TbUnitSystDto;
 import com.its.op.dto.its.unit.TbUnitSystSttsDto;
@@ -90,6 +92,11 @@ public class TbUnitSystService {
         TbUnitSyst obj = req.toEntity();
         this.repo.save(obj);
         this.manager.put(obj.getSystId(), obj);
+        CctvServerConfig cctvServerConfig = (CctvServerConfig) AppUtils.getBean(CctvServerConfig.class);
+        if (cctvServerConfig.getProcessId().equals(req.getSystId())) {
+            cctvServerConfig.setIpAddress(req.getSystIp1().trim());
+            cctvServerConfig.setPort(Integer.parseInt(req.getPrgmPort().trim()));
+        };
         return obj.toDto();
     }