dev

src/main/java/com/its/op/controller/its/facility/TbFcltFailController.java

@@ -77,7 +77,7 @@ public class TbFcltFailController {
     @GetMapping(value = "/list/type/all/{type}/{fromDay}/{toDay}", produces = {"application/json; charset=utf8"})
     public List<TbFcltFailDto> findAllTypeListByDate(@PathVariable("type") final String type,
                                                      @PathVariable("fromDay") final String fromDay,
-                                                 @PathVariable("toDay") final String toDay) {
+                                                     @PathVariable("toDay") final String toDay) {
         return this.service.findAllTypeListByDate(type, true, fromDay, toDay);
     }
 
@@ -85,8 +85,8 @@ public class TbFcltFailController {
     @ApiOperation(value = "그룹별 시설물 장애 현황 조회(완료항목 포함)", response = TbFcltFailDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/type/all/group/{group}/{fromDay}/{toDay}", produces = {"application/json; charset=utf8"})
     public List<TbFcltFailDto> findAllGroupTypeListByDate(@PathVariable("group") final String group,
-                                                     @PathVariable("fromDay") final String fromDay,
-                                                     @PathVariable("toDay") final String toDay) {
+                                                          @PathVariable("fromDay") final String fromDay,
+                                                          @PathVariable("toDay") final String toDay) {
         return this.service.findAllGroupTypeListByDate(group, fromDay, toDay);
     }
 
@@ -94,7 +94,7 @@ public class TbFcltFailController {
     @GetMapping(value = "/list/type/mng/{type}/{fromDay}/{toDay}", produces = {"application/json; charset=utf8"})
     public List<TbFcltFailDto> findRegTypeListByDate(@PathVariable("type") final String type,
                                                      @PathVariable("fromDay") final String fromDay,
-                                                 @PathVariable("toDay") final String toDay) {
+                                                     @PathVariable("toDay") final String toDay) {
         return this.service.findAllTypeListByDate(type, false, fromDay, toDay);
     }
 

src/main/java/com/its/op/dto/its/facility/TbFcltFailDto.java

@@ -93,6 +93,10 @@ public class TbFcltFailDto implements Serializable {
     @JsonProperty("fclt_group")
     private String fcltGroup;
 
+    @ApiModelProperty("시설물 중분류")
+    @JsonProperty("fclt_type")
+    private String fcltType;
+
     @ApiModelProperty("시설물 위치")  // Y VARCHAR2(100)
     @JsonProperty("fclt_lctn")
     private String fcltLctn;
@@ -117,6 +121,10 @@ public class TbFcltFailDto implements Serializable {
     @JsonProperty("wthr_desc")    // WTHR_CD
     private String wthrDesc;
 
+    @ApiModelProperty("품목명")
+    @JsonProperty("subj_nm")
+    private String subjNm;
+
     @ApiModelProperty("사용여부 설명")
     @JsonProperty("use_desc")    // USE_YN
     private String useDesc;

src/main/java/com/its/op/entity/its/facility/TbFcltFail.java

@@ -124,7 +124,9 @@ public class TbFcltFail implements Serializable {
                 .build();
 
         if (this.fclt != null) {
-            dto.setFcltGroup(CodeManager.getCodeDescShort("FMITS", this.fclt.getFcltType()));
+            dto.setFcltGroup(CodeManager.getCodeDescShort("FMS", this.fclt.getFcltType()));
+            dto.setFcltType(this.fclt.getFcltType());
+            dto.setFcltLctn(this.fclt.getFcltLctn());
         }
 
         dto.setFailOcrrDesc(FcltCodeManager.getFailOcrrTypeName(this.failOcrrCd));
@@ -132,6 +134,7 @@ public class TbFcltFail implements Serializable {
         dto.setFailRegDesc(CodeManager.getCodeDescShort("FREG", this.failRegCd));
         dto.setFailLevlDesc(CodeManager.getCodeDescShort("FLVL", this.failLevlCd));
         dto.setWthrDesc(CodeManager.getCodeDescShort("FWTHR", this.wthrCd));
+        dto.setSubjNm(FcltCodeManager.getFcltSubjName(this.subjNmbr));  // 부품명
 
         return dto;
     }

src/main/java/com/its/op/entity/its/facility/TbFcltInfr.java

@@ -170,7 +170,7 @@ public class TbFcltInfr implements Serializable {
         if (this.subUser != null) {
             dto.setSubUserNm(this.subUser.getName());
         }
-        String fcltGroup = CodeManager.getCodeDescShort("FMITS", this.fcltType);
+        String fcltGroup = CodeManager.getCodeDescShort("FMS", this.fcltType);
 //        if (CodeManager.defUnknownDesc.equals(fcltGroup)) {
 //            fcltGroup = CodeManager.getCodeDescShort("FMS", this.fcltType);
 //        }

src/main/java/com/its/op/entity/its/oper/TbUserMsg.java

@@ -1,6 +1,7 @@
 package com.its.op.entity.its.oper;
 
 import com.its.op.dto.its.oper.TbUserMsgDto;
+import com.its.op.global.CodeManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -61,7 +62,7 @@ public class TbUserMsg implements Serializable {
     private String userId;
 
     public TbUserMsgDto toDto() {
-        return TbUserMsgDto.builder()
+        TbUserMsgDto dto = TbUserMsgDto.builder()
                 .msgNmbr(this.msgNmbr)
                 .regDt(this.regDt)
                 .msgCd(this.msgCd)
@@ -71,6 +72,8 @@ public class TbUserMsg implements Serializable {
                 .endDt(this.endDt)
                 .userId(this.userId)
                 .build();
+        dto.setMsgDesc(CodeManager.getCodeDescShort("FMSG", this.msgCd));
+        return dto;
     }
 
     public TbUserMsg(Long msgNmbr) {

src/main/java/com/its/op/global/FcltCodeManager.java

@@ -3,9 +3,11 @@ package com.its.op.global;
 import com.its.op.dto.its.facility.TbFcltFailOcrrTypeDto;
 import com.its.op.dto.its.facility.TbFcltFailTypeActDto;
 import com.its.op.dto.its.facility.TbFcltFailTypeDto;
+import com.its.op.dto.its.facility.TbFcltSubjDto;
 import com.its.op.service.its.facility.TbFcltFailOcrrTypeService;
 import com.its.op.service.its.facility.TbFcltFailTypeActService;
 import com.its.op.service.its.facility.TbFcltFailTypeService;
+import com.its.op.service.its.facility.TbFcltSubjService;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,12 +29,16 @@ public class FcltCodeManager {
     private final TbFcltFailTypeService failTypeService;
     // 시설물 장애 유형별 조치
     private final TbFcltFailTypeActService failTypeActService;
+    // 시설물 부품
+    private final TbFcltSubjService fcltSubService;
 
     public static final String defFcltCodeUnknown = "UNKNOWN";
 
     private static final ConcurrentHashMap<String, TbFcltFailOcrrTypeDto> codeFailOcrrType = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, TbFcltFailTypeDto> codeFailType = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, TbFcltFailTypeActDto> codeFailTypeAct = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<Long, TbFcltSubjDto> codeFcltSubj = new ConcurrentHashMap<>();
+
     //private static final ConcurrentHashMap<String, HashMap<String, Code>> codes = new ConcurrentHashMap<>();
 
     @PostConstruct
@@ -59,6 +65,11 @@ public class FcltCodeManager {
         for (TbFcltFailTypeActDto code : codeList3) {
             codeFailTypeAct.put(code.getFailActCd(), code);
         }
+
+        List<TbFcltSubjDto> codeList4 = this.fcltSubService.findAll();
+        for (TbFcltSubjDto code : codeList4) {
+            codeFcltSubj.put(code.getSubjNmbr(), code);
+        }
     }
 
     public static String getFailOcrrTypeName(String CODE) {
@@ -84,4 +95,13 @@ public class FcltCodeManager {
         }
         return defFcltCodeUnknown;
     }
+
+    public static String getFcltSubjName(Long CODE) {
+        TbFcltSubjDto code = codeFcltSubj.get(CODE);
+        if (code != null) {
+            return code.getSubjNm();
+        }
+        return defFcltCodeUnknown;
+    }
+
 }

src/main/java/com/its/op/security/WebLoginSuccessHandler.java

@@ -62,6 +62,7 @@ public class WebLoginSuccessHandler implements AuthenticationSuccessHandler {
 
         CookieUtils.setCookie(response, WebMvcConfig.USER_UUID, WebMvcConfig.encUserId(cnncHs.getUserId()), 60*60);
         CookieUtils.setCookie(response, WebMvcConfig.USER_TIME, cnncHs.getLoginHms(), 60*60);
+        CookieUtils.setCookie(response, "OPER_SYST_ID", userInfr.getOperSystId(), 60*60);
 
         String defaultSuccessUrl = "/application/op/00.main/main.html";
         String uri = defaultSuccessUrl;