diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin index 6e13194..2df0747 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin differ diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock index 7c0b75b..cad6850 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin index 09dd655..09c80dc 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock index a4f74cd..c5472a2 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin index 6876413..69affce 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin and b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin differ diff --git a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 8b6a884..b364a59 100644 Binary files a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class index 45d50fc..66f8174 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemCustService.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemCustService.class index 39be4e4..60fa664 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemCustService.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemCustService.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.class index cc17560..88a4df1 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.class index 5d04434..b9a937e 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/PolicyResource.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/PolicyResource.class index a27b549..630fe0f 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/PolicyResource.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/common/code/enumresource/PolicyResource.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.class index c8a79e9..76e3996 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.class index ae896f1..c489037 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.class index f196d20..749ecee 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.class differ diff --git a/main_vm/build/tmp/compileJava/previous-compilation-data.bin b/main_vm/build/tmp/compileJava/previous-compilation-data.bin index 410186e..b17eb05 100644 Binary files a/main_vm/build/tmp/compileJava/previous-compilation-data.bin and b/main_vm/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java index 1934f53..333f765 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/controller/SystemCustController.java @@ -140,6 +140,7 @@ public class SystemCustController { @PostMapping("/cust/modify") @ResponseBody public void CustModify(@RequestBody SystemCustSaveReq dto) throws CustomNotFoundException { + log.info(" useYn------------------ {}", new Gson().toJson(dto)); custService.CustModify(dto); } diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemCustService.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemCustService.java index a0769a4..7ad469a 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemCustService.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemCustService.java @@ -93,7 +93,7 @@ public class SystemCustService { tbIcsOprMngInfoRepo.saveAll(dto.toOpr(uv)); tbCustPolicyRepo.saveAll(dto.toPolicy()); tbUserCustRepo.saveAll(dto.toSystemAdmin(uv)); - tbProjectSettingRepo.saveAll(WisenutInsert(dto.toWisenutInsert())); +// tbProjectSettingRepo.saveAll(WisenutInsert(dto.toWisenutInsert())); } public List WisenutInsert(List dto) throws CustomNotFoundException { @@ -200,7 +200,7 @@ public class SystemCustService { String serviceGroup = e.getAddServiceGroup(); List beforPol = custPolBase.get(serviceGroup); List insertVal = e.getAuthList(); - + log.info("modiiiiiiii - {}", new Gson().toJson(e)); //수정할 데이터 if (custPolBase.keySet().stream().collect(Collectors.toList()).contains(e.getAddServiceGroup())) { TbServiceGrouop tsg = tbServiceGrouopRepo.findByServiceGroup(serviceGroup) @@ -237,7 +237,9 @@ public class SystemCustService { .policyVal(h) .build()); } + log.info(".getAddUseYn() --- " + e.getAddUseYn()); saveService.add(e.toService(custResult.getCustCode(), uv)); +// saveService.add(e.toService(custResult.getCustCode(), uv)); saveOpr.add(e.toOprmngCode(custResult.getCustCode(), uv)); } } @@ -246,9 +248,9 @@ public class SystemCustService { tbCustPolicyRepo.deleteByServiceGroupInAndPolicyValIn(e, delUpperVal.get(e)); tbServiceGroupPolicyRepo.deleteByServiceGroupInAndPolicyValIn(e, delUpperVal.get(e)); } - - tbCustPolicyRepo.saveAll(insertPol); + log.info(".saveService() --- {}" , new Gson().toJson(saveService)); tbServiceGrouopRepo.saveAll(saveService); + tbCustPolicyRepo.saveAll(insertPol); tbIcsOprMngInfoRepo.saveAll(saveOpr); //프로젝트세팅 테이블이 저장되어야 해야된다해서 나중에 추가된 코드 //1차에선 데이터를 DB에서 SQL로 인서트했다고함. @@ -260,7 +262,7 @@ public class SystemCustService { .serviceGroupDesc(e.getServiceGroupDesc()) .build()); } - tbProjectSettingRepo.saveAll(WisenutInsert(saveProject)); +// tbProjectSettingRepo.saveAll(WisenutInsert(saveProject)); } } diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.java index 86a3e93..2849c46 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/service/SystemServiceGroupService.java @@ -186,7 +186,7 @@ public class SystemServiceGroupService { .oprMngCode(dto.getCustCode()+"_RCP_"+dto.getSubServiceGroup()) .serviceGroupDesc(dto.getSubServiceGroupDesc()) .build()); - tbProjectSettingRepo.saveAll(systemCustService.WisenutInsert(proSet)); +// tbProjectSettingRepo.saveAll(systemCustService.WisenutInsert(proSet)); } diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.java index 9c8db33..f03c777 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/system/vo/SystemCustSaveSubReq.java @@ -34,7 +34,24 @@ public class SystemCustSaveSubReq { this.authList = authList; } + public TbServiceGrouop toService(String custCode, UserVo uv, String yn) { + System.out.println("use - " + this.addUseYn); + return TbServiceGrouop.builder() + .serviceGroup(this.addServiceGroup.toUpperCase()) + .serviceGroupUpper(this.addServiceGroup) + .custCode(custCode) + .serviceType("M") + .serviceGroupName(this.addServiceGroupName) + .serviceGroupDesc(this.addServiceGroupDesc) + .useYn(yn) + .registId(uv.getUserId()) + .registDate(LocalDateTime.now()) + .updateId(uv.getUserId()) + .updateDate(LocalDateTime.now()) + .build(); + } public TbServiceGrouop toService(String custCode, UserVo uv) { + System.out.println("use - " + this.addUseYn); return TbServiceGrouop.builder() .serviceGroup(this.addServiceGroup.toUpperCase()) .serviceGroupUpper(this.addServiceGroup) @@ -42,7 +59,7 @@ public class SystemCustSaveSubReq { .serviceType("M") .serviceGroupName(this.addServiceGroupName) .serviceGroupDesc(this.addServiceGroupDesc) - .useYn(this.addUseYn) + .useYn("Y") .registId(uv.getUserId()) .registDate(LocalDateTime.now()) .updateId(uv.getUserId()) @@ -56,7 +73,7 @@ public class SystemCustSaveSubReq { .serviceGroup(this.addServiceGroup) .oprMngCode(custCode+"_RCP_"+this.addServiceGroup.toUpperCase()) .solVal("RCP") - .useYn(this.addUseYn) + .useYn("Y") .registId(uv.getUserId()) .registDate(LocalDateTime.now()) .updateId(uv.getUserId()) diff --git a/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/PolicyResource.java b/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/PolicyResource.java index 119257c..4637d48 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/PolicyResource.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/common/code/enumresource/PolicyResource.java @@ -44,61 +44,60 @@ public enum PolicyResource { rcpoprmanagettstagmanageRead(MenuResource.rcpoprmanagettstagmanage, "TTS태그관리읽기권한", "Y", 1, Arrays.asList()), - - gudguideRead(MenuResource.gudguide,"상담가이드전체권한","Y",1,Arrays.asList()), - gudguideconsultationRealtimemanageRead(MenuResource.gudguideconsultationRealtimemanage,"실시간상담전체권한","Y",1,Arrays.asList()), - gudguideadminMonitoringmanageRead(MenuResource.gudguideadminMonitoringmanage,"관리자모니터링전체권한","Y",1,Arrays.asList()), - gudguidehistoryRead(MenuResource.gudguidehistory,"상담이력관리전체권한","Y",1,Arrays.asList()), - gudguidehistoryscrchmanageRead(MenuResource.gudguidehistoryscrchmanage,"상담이력조회전체권한","Y",1,Arrays.asList()), - gudguidehistoryoutboxmanageRead(MenuResource.gudguidehistoryoutboxmanage,"상담이력전송함전체권한","Y",1,Arrays.asList()), - gudguidehistoryinboxmanageRead(MenuResource.gudguidehistoryinboxmanage,"상담이력수신함전체권한","Y",1,Arrays.asList()), - gudguidecontentsRead(MenuResource.gudguidecontents,"상담컨텐츠전체권한","Y",1,Arrays.asList()), - gudguidecontentslistmanageRead(MenuResource.gudguidecontentslistmanage,"상담가이드조회전체권한","Y",1,Arrays.asList()), - gudguidecontentsmanagermanageRead(MenuResource.gudguidecontentsmanagermanage,"상담가이드관리전체권한","Y",1,Arrays.asList()), - gudguidecontentscontentsAssessmentmanageRead(MenuResource.gudguidecontentscontentsAssessmentmanage,"상담가이드평가전체권한","Y",1,Arrays.asList()), - gudguidecontentscontentsAssessmentHistorymanageRead(MenuResource.gudguidecontentscontentsAssessmentHistorymanage,"상담가이드평가이력전체권한","Y",1,Arrays.asList()), - gudguideaiRead(MenuResource.gudguideai,"NLP연동전체권한","Y",1,Arrays.asList()), - gudguideainluIntentListmanageRead(MenuResource.gudguideainluIntentListmanage,"대화의도전체권한","Y",1,Arrays.asList()), - gudguideainluEntityListmanageRead(MenuResource.gudguideainluEntityListmanage,"엔티티전체권한","Y",1,Arrays.asList()), - gudguideainluLogmanageRead(MenuResource.gudguideainluLogmanage,"대화의도이력전체권한","Y",1,Arrays.asList()), - gudguideainluTrainingmanageRead(MenuResource.gudguideainluTrainingmanage,"기계학습전체권한","Y",1,Arrays.asList()), - gudguideainluIntenttestmanageRead(MenuResource.gudguideainluIntenttestmanage,"대화의도테스트전체권한","Y",1,Arrays.asList()), - gudguideaisynonymListmanageRead(MenuResource.gudguideaisynonymListmanage,"고유용어사전전체권한","Y",1,Arrays.asList()), - gudguideainluRecommendedLearningmanageRead(MenuResource.gudguideainluRecommendedLearningmanage,"학습추천전체권한","Y",1,Arrays.asList()), - - addraddrbotRead(MenuResource.addraddrbot,"주소봇전체권한","Y",1,Arrays.asList()), - addraddrbotmanageAddrSectionmanageRead(MenuResource.addraddrbotmanageAddrSectionmanage,"지명유사어관리전체권한","Y",1,Arrays.asList()), - addraddrbotmanageBuildNamemanageRead(MenuResource.addraddrbotmanageBuildNamemanage,"빌딩유사어관리전체권한","Y",1,Arrays.asList()), - addraddrbotmanageSynonymmanageRead(MenuResource.addraddrbotmanageSynonymmanage,"유의어전처리관리전체권한","Y",1,Arrays.asList()), - addraddrbotmanageBuildTypemanageRead(MenuResource.addraddrbotmanageBuildTypemanage,"발화건물유형관리전체권한","Y",1,Arrays.asList()), - addraddrbotmanageJusoUploadmanageRead(MenuResource.addraddrbotmanageJusoUploadmanage,"주소월별업데이트전체권한","Y",1,Arrays.asList()), - addraddrbotmanageAddrProcessmanageRead(MenuResource.addraddrbotmanageAddrProcessmanage,"주소봇처리내역전체권한","Y",1,Arrays.asList()), - addraddrbotaddrRealtimeListmanageRead(MenuResource.addraddrbotaddrRealtimeListmanage,"실시간처리리스트전체권한","Y",1,Arrays.asList()), - - botcomRead(MenuResource.botcom,"BOT공통관리전체권한","Y",1,Arrays.asList()), - botcommanageMentmanageRead(MenuResource.botcommanageMentmanage,"멘트관리전체권한","Y",1,Arrays.asList()), - botcommanageRead(MenuResource.botcommanage,"서비스별관리전체권한","Y",1,Arrays.asList()), - botcommanagemanageGreetMentmanageRead(MenuResource.botcommanagemanageGreetMentmanage,"요일시간대별멘트관리전체권한","Y",1,Arrays.asList()), - botcommanagemanageHolidaymanageRead(MenuResource.botcommanagemanageHolidaymanage,"휴무일관리전체권한","Y",1,Arrays.asList()), - botcommanagemanageNaturalmanageRead(MenuResource.botcommanagemanageNaturalmanage,"자연어전처리관리전체권한","Y",1,Arrays.asList()), - - rcpv1Read(MenuResource.rcpv1,"무인접수BOT전체권한","Y",1,Arrays.asList()), - rcpv1receiptListmanageRead(MenuResource.rcpv1receiptListmanage,"접수리스트전체권한","Y",1,Arrays.asList()), - rcpv1receiptRealtimeListmanageRead(MenuResource.rcpv1receiptRealtimeListmanage,"시릿간모니터링전체권한","Y",1,Arrays.asList()), - rcpv1receiptOutRealtimeListmanageRead(MenuResource.rcpv1receiptOutRealtimeListmanage,"아웃바운드모니터링전체권한","Y",1,Arrays.asList()), - rcpv1rcpReportmanageRead(MenuResource.rcpv1rcpReportmanage,"일자별통계전체권한","Y",1,Arrays.asList()), - rcpv1rcpTimeReportmanageRead(MenuResource.rcpv1rcpTimeReportmanage,"시간대별통계전체권한","Y",1,Arrays.asList()), - - vdoRead(MenuResource.vdo,"영상상담전체권한","Y",1,Arrays.asList()), - vdoincomingManageCategorymanageRead(MenuResource.vdoincomingManageCategorymanage,"컨텐츠등록관리전체권한","Y",1,Arrays.asList()), - vdoincomingCounselingListmanageRead(MenuResource.vdoincomingCounselingListmanage,"영상상담전체권한","Y",1,Arrays.asList()), - vdoincomingCounselingHistorymanageRead(MenuResource.vdoincomingCounselingHistorymanage,"상담이력조회전체권한","Y",1,Arrays.asList()), - vdoincomingMvReportmanageRead(MenuResource.vdoincomingMvReportmanage,"사용통계전체권한","Y",1,Arrays.asList()), - - botmoniRead(MenuResource.botmoni,"봇모니터링(확대형)전체권한","Y",1,Arrays.asList()), - botmoniaddrRealtimeListExpansionmanageRead(MenuResource.botmoniaddrRealtimeListExpansionmanage,"주소봇실시간처리리스트전체권한","Y",1,Arrays.asList()), - botmonireceiptRealtimeListExpansionmanageRead(MenuResource.botmonireceiptRealtimeListExpansionmanage,"무인접수봇실시간모니터링전체권한","Y",1,Arrays.asList()), - botmoniguideRealtimeListExpansionmanageRead(MenuResource.botmoniguideRealtimeListExpansionmanage,"상담가이드실시간모니터링전체권한","Y",1,Arrays.asList()), + gudguideRead(MenuResource.gudguide,"상담가이드읽기권한","Y",1,Arrays.asList()), + gudguideconsultationRealtimemanageRead(MenuResource.gudguideconsultationRealtimemanage,"실시간상담읽기권한","Y",1,Arrays.asList()), + gudguideadminMonitoringmanageRead(MenuResource.gudguideadminMonitoringmanage,"관리자모니터링읽기권한","Y",1,Arrays.asList()), + gudguidehistoryRead(MenuResource.gudguidehistory,"상담이력관리읽기권한","Y",1,Arrays.asList()), + gudguidehistoryscrchmanageRead(MenuResource.gudguidehistoryscrchmanage,"상담이력조회읽기권한","Y",1,Arrays.asList()), + gudguidehistoryoutboxmanageRead(MenuResource.gudguidehistoryoutboxmanage,"상담이력전송함읽기권한","Y",1,Arrays.asList()), + gudguidehistoryinboxmanageRead(MenuResource.gudguidehistoryinboxmanage,"상담이력수신함읽기권한","Y",1,Arrays.asList()), + gudguidecontentsRead(MenuResource.gudguidecontents,"상담컨텐츠읽기권한","Y",1,Arrays.asList()), + gudguidecontentslistmanageRead(MenuResource.gudguidecontentslistmanage,"상담가이드조회읽기권한","Y",1,Arrays.asList()), + gudguidecontentsmanagermanageRead(MenuResource.gudguidecontentsmanagermanage,"상담가이드관리읽기권한","Y",1,Arrays.asList()), + gudguidecontentscontentsAssessmentmanageRead(MenuResource.gudguidecontentscontentsAssessmentmanage,"상담가이드평가읽기권한","Y",1,Arrays.asList()), + gudguidecontentscontentsAssessmentHistorymanageRead(MenuResource.gudguidecontentscontentsAssessmentHistorymanage,"상담가이드평가이력읽기권한","Y",1,Arrays.asList()), + gudguideaiRead(MenuResource.gudguideai,"NLP연동읽기권한","Y",1,Arrays.asList()), + gudguideainluIntentListmanageRead(MenuResource.gudguideainluIntentListmanage,"대화의도읽기권한","Y",1,Arrays.asList()), + gudguideainluEntityListmanageRead(MenuResource.gudguideainluEntityListmanage,"엔티티읽기권한","Y",1,Arrays.asList()), + gudguideainluLogmanageRead(MenuResource.gudguideainluLogmanage,"대화의도이력읽기권한","Y",1,Arrays.asList()), + gudguideainluTrainingmanageRead(MenuResource.gudguideainluTrainingmanage,"기계학습읽기권한","Y",1,Arrays.asList()), + gudguideainluIntenttestmanageRead(MenuResource.gudguideainluIntenttestmanage,"대화의도테스트읽기권한","Y",1,Arrays.asList()), + gudguideaisynonymListmanageRead(MenuResource.gudguideaisynonymListmanage,"고유용어사전읽기권한","Y",1,Arrays.asList()), + gudguideainluRecommendedLearningmanageRead(MenuResource.gudguideainluRecommendedLearningmanage,"학습추천읽기권한","Y",1,Arrays.asList()), + + addraddrbotRead(MenuResource.addraddrbot,"주소봇읽기권한","Y",1,Arrays.asList()), + addraddrbotmanageAddrSectionmanageRead(MenuResource.addraddrbotmanageAddrSectionmanage,"지명유사어관리읽기권한","Y",1,Arrays.asList()), + addraddrbotmanageBuildNamemanageRead(MenuResource.addraddrbotmanageBuildNamemanage,"빌딩유사어관리읽기권한","Y",1,Arrays.asList()), + addraddrbotmanageSynonymmanageRead(MenuResource.addraddrbotmanageSynonymmanage,"유의어전처리관리읽기권한","Y",1,Arrays.asList()), + addraddrbotmanageBuildTypemanageRead(MenuResource.addraddrbotmanageBuildTypemanage,"발화건물유형관리읽기권한","Y",1,Arrays.asList()), + addraddrbotmanageJusoUploadmanageRead(MenuResource.addraddrbotmanageJusoUploadmanage,"주소월별업데이트읽기권한","Y",1,Arrays.asList()), + addraddrbotmanageAddrProcessmanageRead(MenuResource.addraddrbotmanageAddrProcessmanage,"주소봇처리내역읽기권한","Y",1,Arrays.asList()), + addraddrbotaddrRealtimeListmanageRead(MenuResource.addraddrbotaddrRealtimeListmanage,"실시간처리리스트읽기권한","Y",1,Arrays.asList()), + + botcomRead(MenuResource.botcom,"BOT공통관리읽기권한","Y",1,Arrays.asList()), + botcommanageMentmanageRead(MenuResource.botcommanageMentmanage,"멘트관리읽기권한","Y",1,Arrays.asList()), + botcommanageRead(MenuResource.botcommanage,"서비스별관리읽기권한","Y",1,Arrays.asList()), + botcommanagemanageGreetMentmanageRead(MenuResource.botcommanagemanageGreetMentmanage,"요일시간대별멘트관리읽기권한","Y",1,Arrays.asList()), + botcommanagemanageHolidaymanageRead(MenuResource.botcommanagemanageHolidaymanage,"휴무일관리읽기권한","Y",1,Arrays.asList()), + botcommanagemanageNaturalmanageRead(MenuResource.botcommanagemanageNaturalmanage,"자연어전처리관리읽기권한","Y",1,Arrays.asList()), + + rcpv1Read(MenuResource.rcpv1,"무인접수BOT읽기권한","Y",1,Arrays.asList()), + rcpv1receiptListmanageRead(MenuResource.rcpv1receiptListmanage,"접수리스트읽기권한","Y",1,Arrays.asList()), + rcpv1receiptRealtimeListmanageRead(MenuResource.rcpv1receiptRealtimeListmanage,"시릿간모니터링읽기권한","Y",1,Arrays.asList()), + rcpv1receiptOutRealtimeListmanageRead(MenuResource.rcpv1receiptOutRealtimeListmanage,"아웃바운드모니터링읽기권한","Y",1,Arrays.asList()), + rcpv1rcpReportmanageRead(MenuResource.rcpv1rcpReportmanage,"일자별통계읽기권한","Y",1,Arrays.asList()), + rcpv1rcpTimeReportmanageRead(MenuResource.rcpv1rcpTimeReportmanage,"시간대별통계읽기권한","Y",1,Arrays.asList()), + + vdoRead(MenuResource.vdo,"영상상담읽기권한","Y",1,Arrays.asList()), + vdoincomingManageCategorymanageRead(MenuResource.vdoincomingManageCategorymanage,"컨텐츠등록관리읽기권한","Y",1,Arrays.asList()), + vdoincomingCounselingListmanageRead(MenuResource.vdoincomingCounselingListmanage,"영상상담읽기권한","Y",1,Arrays.asList()), + vdoincomingCounselingHistorymanageRead(MenuResource.vdoincomingCounselingHistorymanage,"상담이력조회읽기권한","Y",1,Arrays.asList()), + vdoincomingMvReportmanageRead(MenuResource.vdoincomingMvReportmanage,"사용통계읽기권한","Y",1,Arrays.asList()), + + botmoniRead(MenuResource.botmoni,"봇모니터링(확대형)읽기권한","Y",1,Arrays.asList()), + botmoniaddrRealtimeListExpansionmanageRead(MenuResource.botmoniaddrRealtimeListExpansionmanage,"주소봇실시간처리리스트읽기권한","Y",1,Arrays.asList()), + botmonireceiptRealtimeListExpansionmanageRead(MenuResource.botmonireceiptRealtimeListExpansionmanage,"무인접수봇실시간모니터링읽기권한","Y",1,Arrays.asList()), + botmoniguideRealtimeListExpansionmanageRead(MenuResource.botmoniguideRealtimeListExpansionmanage,"상담가이드실시간모니터링읽기권한","Y",1,Arrays.asList()), @@ -138,19 +137,16 @@ public enum PolicyResource { - gudguideFull(MenuResource.gudguide,"상담가이드전체권한","Y",1,Arrays.asList()), gudguideconsultationRealtimemanageFull(MenuResource.gudguideconsultationRealtimemanage,"실시간상담전체권한","Y",1,Arrays.asList()), gudguideadminMonitoringmanageFull(MenuResource.gudguideadminMonitoringmanage,"관리자모니터링전체권한","Y",1,Arrays.asList()), gudguidehistoryFull(MenuResource.gudguidehistory,"상담이력관리전체권한","Y",1,Arrays.asList()), gudguidehistoryscrchmanageFull(MenuResource.gudguidehistoryscrchmanage,"상담이력조회전체권한","Y",1,Arrays.asList()), gudguidehistoryoutboxmanageFull(MenuResource.gudguidehistoryoutboxmanage,"상담이력전송함전체권한","Y",1,Arrays.asList()), gudguidehistoryinboxmanageFull(MenuResource.gudguidehistoryinboxmanage,"상담이력수신함전체권한","Y",1,Arrays.asList()), - gudguidecontentsFull(MenuResource.gudguidecontents,"상담컨텐츠전체권한","Y",1,Arrays.asList()), gudguidecontentslistmanageFull(MenuResource.gudguidecontentslistmanage,"상담가이드조회전체권한","Y",1,Arrays.asList()), gudguidecontentsmanagermanageFull(MenuResource.gudguidecontentsmanagermanage,"상담가이드관리전체권한","Y",1,Arrays.asList()), gudguidecontentscontentsAssessmentmanageFull(MenuResource.gudguidecontentscontentsAssessmentmanage,"상담가이드평가전체권한","Y",1,Arrays.asList()), gudguidecontentscontentsAssessmentHistorymanageFull(MenuResource.gudguidecontentscontentsAssessmentHistorymanage,"상담가이드평가이력전체권한","Y",1,Arrays.asList()), - gudguideaiFull(MenuResource.gudguideai,"NLP연동전체권한","Y",1,Arrays.asList()), gudguideainluIntentListmanageFull(MenuResource.gudguideainluIntentListmanage,"대화의도전체권한","Y",1,Arrays.asList()), gudguideainluEntityListmanageFull(MenuResource.gudguideainluEntityListmanage,"엔티티전체권한","Y",1,Arrays.asList()), gudguideainluLogmanageFull(MenuResource.gudguideainluLogmanage,"대화의도이력전체권한","Y",1,Arrays.asList()), @@ -159,7 +155,6 @@ public enum PolicyResource { gudguideaisynonymListmanageFull(MenuResource.gudguideaisynonymListmanage,"고유용어사전전체권한","Y",1,Arrays.asList()), gudguideainluRecommendedLearningmanageFull(MenuResource.gudguideainluRecommendedLearningmanage,"학습추천전체권한","Y",1,Arrays.asList()), - addraddrbotFull(MenuResource.addraddrbot,"주소봇전체권한","Y",1,Arrays.asList()), addraddrbotmanageAddrSectionmanageFull(MenuResource.addraddrbotmanageAddrSectionmanage,"지명유사어관리전체권한","Y",1,Arrays.asList()), addraddrbotmanageBuildNamemanageFull(MenuResource.addraddrbotmanageBuildNamemanage,"빌딩유사어관리전체권한","Y",1,Arrays.asList()), addraddrbotmanageSynonymmanageFull(MenuResource.addraddrbotmanageSynonymmanage,"유의어전처리관리전체권한","Y",1,Arrays.asList()), @@ -168,35 +163,29 @@ public enum PolicyResource { addraddrbotmanageAddrProcessmanageFull(MenuResource.addraddrbotmanageAddrProcessmanage,"주소봇처리내역전체권한","Y",1,Arrays.asList()), addraddrbotaddrRealtimeListmanageFull(MenuResource.addraddrbotaddrRealtimeListmanage,"실시간처리리스트전체권한","Y",1,Arrays.asList()), - botcomFull(MenuResource.botcom,"BOT공통관리전체권한","Y",1,Arrays.asList()), botcommanageMentmanageFull(MenuResource.botcommanageMentmanage,"멘트관리전체권한","Y",1,Arrays.asList()), - botcommanageFull(MenuResource.botcommanage,"서비스별관리전체권한","Y",1,Arrays.asList()), botcommanagemanageGreetMentmanageFull(MenuResource.botcommanagemanageGreetMentmanage,"요일시간대별멘트관리전체권한","Y",1,Arrays.asList()), botcommanagemanageHolidaymanageFull(MenuResource.botcommanagemanageHolidaymanage,"휴무일관리전체권한","Y",1,Arrays.asList()), botcommanagemanageNaturalmanageFull(MenuResource.botcommanagemanageNaturalmanage,"자연어전처리관리전체권한","Y",1,Arrays.asList()), - rcpv1Full(MenuResource.rcpv1,"무인접수BOT전체권한","Y",1,Arrays.asList()), rcpv1receiptListmanageFull(MenuResource.rcpv1receiptListmanage,"접수리스트전체권한","Y",1,Arrays.asList()), rcpv1receiptRealtimeListmanageFull(MenuResource.rcpv1receiptRealtimeListmanage,"시릿간모니터링전체권한","Y",1,Arrays.asList()), rcpv1receiptOutRealtimeListmanageFull(MenuResource.rcpv1receiptOutRealtimeListmanage,"아웃바운드모니터링전체권한","Y",1,Arrays.asList()), rcpv1rcpReportmanageFull(MenuResource.rcpv1rcpReportmanage,"일자별통계전체권한","Y",1,Arrays.asList()), rcpv1rcpTimeReportmanageFull(MenuResource.rcpv1rcpTimeReportmanage,"시간대별통계전체권한","Y",1,Arrays.asList()), - vdoFull(MenuResource.vdo,"영상상담전체권한","Y",1,Arrays.asList()), vdoincomingManageCategorymanageFull(MenuResource.vdoincomingManageCategorymanage,"컨텐츠등록관리전체권한","Y",1,Arrays.asList()), vdoincomingCounselingListmanageFull(MenuResource.vdoincomingCounselingListmanage,"영상상담전체권한","Y",1,Arrays.asList()), vdoincomingCounselingHistorymanageFull(MenuResource.vdoincomingCounselingHistorymanage,"상담이력조회전체권한","Y",1,Arrays.asList()), vdoincomingMvReportmanageFull(MenuResource.vdoincomingMvReportmanage,"사용통계전체권한","Y",1,Arrays.asList()), - botmoniFull(MenuResource.botmoni,"봇모니터링(확대형)전체권한","Y",1,Arrays.asList()), botmoniaddrRealtimeListExpansionmanageFull(MenuResource.botmoniaddrRealtimeListExpansionmanage,"주소봇실시간처리리스트전체권한","Y",1,Arrays.asList()), botmonireceiptRealtimeListExpansionmanageFull(MenuResource.botmonireceiptRealtimeListExpansionmanage,"무인접수봇실시간모니터링전체권한","Y",1,Arrays.asList()), botmoniguideRealtimeListExpansionmanageFull(MenuResource.botmoniguideRealtimeListExpansionmanage,"상담가이드실시간모니터링전체권한","Y",1,Arrays.asList()), - commonsystemcustmanageFull(MenuResource.commonsystemcustmanage, "고객사 관리전체권한", "Y", 1000000, Arrays.asList()), commonsystemserviceGroupmanageFull(MenuResource.commonsystemserviceGroupmanage, "서비스그룹 관리전체권한", "Y", 1000000, Arrays.asList()), commonsystemgroupAuthmanageFull(MenuResource.commonsystemgroupAuthmanage, "그룹별 권한관리전체권한", "Y", 10000, Arrays.asList()), @@ -356,19 +345,16 @@ public enum PolicyResource { rcpoprmanagettstagmanageFull, - gudguideFull, gudguideconsultationRealtimemanageFull, gudguideadminMonitoringmanageFull, gudguidehistoryFull, gudguidehistoryscrchmanageFull, gudguidehistoryoutboxmanageFull, gudguidehistoryinboxmanageFull, - gudguidecontentsFull, gudguidecontentslistmanageFull, gudguidecontentsmanagermanageFull, gudguidecontentscontentsAssessmentmanageFull, gudguidecontentscontentsAssessmentHistorymanageFull, - gudguideaiFull, gudguideainluIntentListmanageFull, gudguideainluEntityListmanageFull, gudguideainluLogmanageFull, @@ -377,7 +363,6 @@ public enum PolicyResource { gudguideaisynonymListmanageFull, gudguideainluRecommendedLearningmanageFull, - addraddrbotFull, addraddrbotmanageAddrSectionmanageFull, addraddrbotmanageBuildNamemanageFull, addraddrbotmanageSynonymmanageFull, @@ -386,27 +371,22 @@ public enum PolicyResource { addraddrbotmanageAddrProcessmanageFull, addraddrbotaddrRealtimeListmanageFull, - botcomFull, botcommanageMentmanageFull, - botcommanageFull, botcommanagemanageGreetMentmanageFull, botcommanagemanageHolidaymanageFull, botcommanagemanageNaturalmanageFull, - rcpv1Full, rcpv1receiptListmanageFull, rcpv1receiptRealtimeListmanageFull, rcpv1receiptOutRealtimeListmanageFull, rcpv1rcpReportmanageFull, rcpv1rcpTimeReportmanageFull, - vdoFull, vdoincomingManageCategorymanageFull, vdoincomingCounselingListmanageFull, vdoincomingCounselingHistorymanageFull, vdoincomingMvReportmanageFull, - botmoniFull, botmoniaddrRealtimeListExpansionmanageFull, botmonireceiptRealtimeListExpansionmanageFull, botmoniguideRealtimeListExpansionmanageFull, diff --git a/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.java b/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.java index 1ceff6f..653bcb7 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbCustPolicy.java @@ -22,7 +22,7 @@ public class TbCustPolicy { @Column(name = "SERVICE_GROUP", nullable = false, length = 20) private String serviceGroup; @Id - @Column(name = "POLICY_VAL", nullable = false, length = 50) + @Column(name = "POLICY_VAL", nullable = false, length = 100) private String policyVal; @Id @Column(name = "CUST_CODE", nullable = false, length = 20) diff --git a/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.java b/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.java index 52fb927..512e92f 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGrouop.java @@ -63,6 +63,8 @@ public class TbServiceGrouop { this.updateDate = updateDate; } + + public TbServiceGrouop toUpdateMainService(SystemCustSaveSubReq dto, UserVo uv) { if (dto.getAddServiceGroupName() != null && !dto.getAddServiceGroupName().equals("")) { this.serviceGroupName = dto.getAddServiceGroupName(); diff --git a/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.java b/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.java index 4ee464b..6a9e648 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/db/jpa/entity/system/TbServiceGroupPolicy.java @@ -26,7 +26,7 @@ public class TbServiceGroupPolicy { @Column(name = "SERVICE_GROUP", nullable = false, length = 20) private String serviceGroup; @Id - @Column(name = "POLICY_VAL", nullable = false, length = 50) + @Column(name = "POLICY_VAL", nullable = false, length = 100) private String policyVal; @Id @Column(name = "CUST_CODE", nullable = false, length = 20) diff --git a/main_vm/src/main/webapp/WEB-INF/jsp/adm/common/system/custUpdate.jsp b/main_vm/src/main/webapp/WEB-INF/jsp/adm/common/system/custUpdate.jsp index 1574aae..27f1316 100644 --- a/main_vm/src/main/webapp/WEB-INF/jsp/adm/common/system/custUpdate.jsp +++ b/main_vm/src/main/webapp/WEB-INF/jsp/adm/common/system/custUpdate.jsp @@ -112,6 +112,7 @@ $('#newCustUseYn').niceSelect('update'); var html = ''; result.responseJSON.addServiceAuthList.forEach(function (e, i) { + console.log(i); var serviceGroup = e.addServiceGroup; var serviceGroupName = e.addServiceGroupName; var serviceGroupDesc = e.addServiceGroupDesc; @@ -142,7 +143,7 @@ + ' 서비스그룹' + ' ' + '
' - + ' ' + + ' ' + '
' + ' ' + '' @@ -150,7 +151,7 @@ + ' 서비스코드' + ' ' + '
' - + ' ' + + ' ' + '
' + ' ' + '' @@ -158,14 +159,14 @@ + ' 시나리오코드' + ' ' + '
' - + ' ' + + ' ' + '
' + ' ' + '' + ' 서비스그룹설명' + ' ' + '
' - + ' ' + + ' ' + '
' + ' ' + '' @@ -296,17 +297,22 @@ var addServiceAuthList = new Array(); $(".tbl-card").children('li').each(function (i, e) { - - var addServiceGroup = $(this).find("input:eq(1)").attr("id").replaceAll("addServiceGroup", ""); + console.log('get-----'+i); + var addServiceGroup = $('#'+$(this).find("input:eq(1)").attr("id")).val(); + console.log('addServiceGroup-----'+addServiceGroup); var addServiceAuth = {}; // var addServiceGroupName = $(this).find("input:eq(0)").attr("id").replaceAll("addServiceGroupName", ""); - var addOprMngCode = $(this).find("input:eq(2)").attr("id").replaceAll("addOprMngCode", ""); + var addOprMngCode = $(this).find("input:eq(2)").attr("id"); + console.log('addOprMngCode-----'+addOprMngCode); // var addServiceGroupDesc = $(this).find("input:eq(3)").attr("id").replaceAll("addServiceGroupDesc", ""); var addServiceGroupName = $('#' + $(this).find("input:eq(0)").attr("id")).val(); + console.log('addServiceGroupName-----'+addServiceGroupName); var addServiceGroupDesc = $('#' + $(this).find("input:eq(3)").attr("id")).val(); + console.log('addServiceGroupDesc-----'+addServiceGroupDesc); var addUseYn = $('#addUseYn' + addServiceGroup + ' option:selected').val(); + console.log('addUseYn-----'+addUseYn); var authList = new Array(); // console.log(JSON.stringify(authList)); // console.log(JSON.stringify($(this)));