Prechádzať zdrojové kódy

report mapper to jpa

shjung 3 rokov pred
rodič
commit
e83e7cbe31

+ 4 - 2
src/main/java/com/its/api/its/global/CodeManager.java

@@ -1,5 +1,6 @@
 package com.its.api.its.global;
 
+import com.its.api.config.AppUtils;
 import com.its.api.its.model.dto.code.TbCmmnCdDto;
 import com.its.api.its.model.entity.code.TbSectGradClsf;
 import com.its.api.its.repository.code.TbSectGradClsfRepository;
@@ -127,9 +128,10 @@ public class CodeManager {
         codes.put(SECT_GRAD_CD, codeMap);
     }
 
-    public void loadCode(String CMMN_CLSF_CD) {
+    public static void loadCode(String CMMN_CLSF_CD) {
+        TbCmmnCdService cmmnCdService = (TbCmmnCdService) AppUtils.getBean(TbCmmnCdService.class);
         HashMap<String, Code> codeMap = new HashMap<>();
-        List<TbCmmnCdDto> codeList = this.cmmnCdService.findAllByCmmnClsfCd(CMMN_CLSF_CD);
+        List<TbCmmnCdDto> codeList = cmmnCdService.findAllByCmmnClsfCd(CMMN_CLSF_CD);
         if (codeList != null) {
             for (TbCmmnCdDto cd : codeList) {
                 codeMap.put(cd.getCmmnCd(), new Code(cd.getCmmnCd(), cd.getCmmnCdKorNm(), cd.getCmmnDescEnglNm()));

+ 9 - 0
src/main/java/com/its/api/its/service/report/ReportService.java

@@ -1,10 +1,13 @@
 package com.its.api.its.service.report;
 
+import com.its.api.its.global.CodeManager;
 import com.its.api.its.model.dto.report.*;
 import com.its.api.its.model.entity.cctv.TbCctvSttsHs;
 import com.its.api.its.model.entity.vds.TbVdsCtlrSttsHs;
 import com.its.api.its.model.entity.vms.TbVmsSttsHs;
 import com.its.api.its.repository.cctv.TbCctvSttsHsRepository;
+import com.its.api.its.repository.code.TbCmmnCdRepository;
+import com.its.api.its.repository.incident.TbIncdOcrrRepository;
 import com.its.api.its.repository.report.ReportMapper;
 import com.its.api.its.repository.vds.TbVdsCtlrSttsHsRepository;
 import com.its.api.its.repository.vms.TbVmsSttsHsRepository;
@@ -27,6 +30,9 @@ public class ReportService {
     private final TbCctvSttsHsRepository cctvSttsHsRepo;
     private final TbVmsSttsHsRepository vmsSttsHsRepo;
     private final TbVdsCtlrSttsHsRepository vdsSttsHsRepo;
+    private final TbIncdOcrrRepository incdOcrrRepo;
+    private final TbCmmnCdRepository cmmnCdRepo;
+
 
     /**
      * 보고서 - 시설물 보고서 - 시설물 현황
@@ -107,6 +113,9 @@ public class ReportService {
     }
 
     public List<ReportTrafficIncidentDto> findAllTrafficIncident(String fromDt, String toDt){
+
+        CodeManager.loadCode(CodeManager.INCD_CODE_IDTU);
+
         Map<String, String> param = new HashMap<>();
         param.put("FROM_DT", fromDt);
         param.put("TO_DT", toDt);