From e68c9e35dac6ae42fff6febeb0114e44735b09e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 28 Dec 2022 15:30:07 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20ajp=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EC=9D=B8=EC=82=AC=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/BaseController.java | 30 +- .../dbnt/faisp/config/KwmsDatabaseConfig.java | 80 +-- .../faisp/config/TomcatConfiguration.java | 12 +- .../com/dbnt/faisp/kwms/KwmsController.java | 89 ++- .../com/dbnt/faisp/kwms/model/VEmployee.java | 54 +- .../kwms/repository/VEmployeeRepository.java | 5 +- .../dbnt/faisp/kwms/service/KwmsService.java | 103 ++-- .../faisp/main/userInfo/MyInfoController.java | 10 +- .../faisp/main/userInfo/PoliceController.java | 14 +- .../main/userInfo/UserMgtController.java | 14 +- .../resources/application-prod.properties | 6 +- .../static/Crosseditor/config/xmls/Config.xml | 2 +- src/main/resources/static/js/common.js | 2 +- src/main/resources/static/js/login/login.js | 10 +- .../resources/static/js/police/careerMgt.js | 4 +- .../internationalCrimeArrestViewModal.html | 562 +++++++++--------- .../resources/templates/login/dashboard.html | 160 ++++- .../resources/templates/login/joinForm.html | 162 +---- src/main/resources/templates/user/myInfo.html | 2 +- 19 files changed, 652 insertions(+), 669 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index a3b4b113..d21362ab 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -1,8 +1,14 @@ package com.dbnt.faisp.config; import com.dbnt.faisp.main.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.faRpt.model.FaRptBoard; +import com.dbnt.faisp.main.faRpt.service.FaRptService; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; +import com.dbnt.faisp.main.publicBoard.model.PublicBoard; +import com.dbnt.faisp.main.publicBoard.service.PublicBoardService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; @@ -25,6 +31,9 @@ public class BaseController { private final CodeMgtService codeMgtService; private final OrganConfigService organConfigService; private final MenuMgtService menuMgtService; + private final PublicBoardService publicBoardService; + private final FaRptService faRptService; + private final AffairService affairService; @GetMapping("/") public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) { @@ -57,8 +66,27 @@ public class BaseController { } @GetMapping("/dashboard") - public ModelAndView dashboard() { + public ModelAndView dashboard(@AuthenticationPrincipal UserInfo loginUser) { ModelAndView mav = new ModelAndView("login/dashboard"); + PublicBoard noticeParams = new PublicBoard(); + noticeParams.setPublicType("PLB001"); + noticeParams.setRowCnt(5); + noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList()); + noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList()); + mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams)); + FaRptBoard faRpt = new FaRptBoard(); + faRpt.setActiveTab("receive"); + faRpt.setRowCnt(5); + faRpt.setStatus("DST007"); + faRpt.setReceiveUserSeq(loginUser.getUserSeq()); + mav.addObject("faRptList", faRptService.selectFaRptList(faRpt)); + AffairBoard affair = new AffairBoard(); + affair.setAffairCategory("CAT215"); + affair.setRatingOrgan(loginUser.getOgCd()); + affair.setRowCnt(5); + mav.addObject("affair1List", affairService.selectAffairBoardList(affair)); + affair.setAffairCategory("CAT216"); + mav.addObject("affair2List", affairService.selectAffairBoardList(affair)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java b/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java index 4ee35453..28cfe66b 100644 --- a/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java +++ b/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java @@ -15,45 +15,45 @@ import org.springframework.transaction.PlatformTransactionManager; import javax.sql.DataSource; import java.util.HashMap; -//@Configuration -//@EnableJpaRepositories( -// basePackages = "com.dbnt.faisp.kwms.repository", -// entityManagerFactoryRef = "kwmsEntityManager", -// transactionManagerRef = "kwmsTransactionManager" -//) +@Configuration +@EnableJpaRepositories( + basePackages = "com.dbnt.faisp.kwms.repository", + entityManagerFactoryRef = "kwmsEntityManager", + transactionManagerRef = "kwmsTransactionManager" +) public class KwmsDatabaseConfig { -// @Autowired -// private Environment env; -// -// @Bean -// public LocalContainerEntityManagerFactoryBean kwmsEntityManager(){ -// LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); -// em.setDataSource(kwmsDataSource()); -// -// //Entity 패키지 경로 -// em.setPackagesToScan(new String[] { "com.dbnt.faisp.kwms.model" }); -// -// HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); -// em.setJpaVendorAdapter(vendorAdapter); -// -// //Hibernate 설정 -// HashMap properties = new HashMap<>(); -// properties.put("hibernate.hbm2ddl.auto", "none"); -// properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect"); -// em.setJpaPropertyMap(properties); -// return em; -// } -// -// @Bean -// @ConfigurationProperties(prefix="spring.datasource-kwms") -// public DataSource kwmsDataSource() { -// return DataSourceBuilder.create().build(); -// } -// -// @Bean -// public PlatformTransactionManager kwmsTransactionManager() { -// JpaTransactionManager transactionManager = new JpaTransactionManager(); -// transactionManager.setEntityManagerFactory(kwmsEntityManager().getObject()); -// return transactionManager; -// } + @Autowired + private Environment env; + + @Bean + public LocalContainerEntityManagerFactoryBean kwmsEntityManager(){ + LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(kwmsDataSource()); + + //Entity 패키지 경로 + em.setPackagesToScan(new String[] { "com.dbnt.faisp.kwms.model" }); + + HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + em.setJpaVendorAdapter(vendorAdapter); + + //Hibernate 설정 + HashMap properties = new HashMap<>(); + properties.put("hibernate.hbm2ddl.auto", "none"); + properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect"); + em.setJpaPropertyMap(properties); + return em; + } + + @Bean + @ConfigurationProperties(prefix="spring.datasource-kwms") + public DataSource kwmsDataSource() { + return DataSourceBuilder.create().build(); + } + + @Bean + public PlatformTransactionManager kwmsTransactionManager() { + JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(kwmsEntityManager().getObject()); + return transactionManager; + } } diff --git a/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java b/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java index aa5934c5..6fd4d114 100644 --- a/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java +++ b/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java @@ -1,13 +1,17 @@ package com.dbnt.faisp.config; import org.apache.catalina.connector.Connector; +import org.apache.coyote.ProtocolHandler; +import org.apache.coyote.ajp.AbstractAjpProtocol; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -//@Configuration +import java.net.InetAddress; + +@Configuration public class TomcatConfiguration { @Value("${tomcat.ajp.protocol}") @@ -26,6 +30,12 @@ public class TomcatConfiguration { ajpConnector.setSecure(false); ajpConnector.setAllowTrace(false); ajpConnector.setScheme("http"); + ajpConnector.setProperty("address", "0.0.0.0"); + ajpConnector.setProperty("allowedRequestAttributesPattern", ".*"); + if(protocol.contains("AJP")){ + ((AbstractAjpProtocol)ajpConnector.getProtocolHandler()).setSecretRequired(false); + } return ajpConnector; } + } \ No newline at end of file diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index 1858be26..a57e0ac8 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -23,63 +23,54 @@ public class KwmsController { @GetMapping("/getEmpInfoToJoinForm") public ModelAndView getEmpInfo(VEmployee empInfo){ ModelAndView mav = new ModelAndView("login/joinForm"); -// if(userInfoService.selectUserInfoToDicCode(empInfo.getDicCode()) == null){ -// UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDicCode()); -// if(userInfo==null){ -// mav.addObject("joinFlag", "F"); -// mav.addObject("userInfo", empInfo); -// mav.addObject("msg", "검색 결과가 없습니다."); -// }else{ + if(userInfoService.selectUserInfoToDicCode(empInfo.getDic()) == null){ + UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDic()); + if(userInfo==null){ + mav.addObject("joinFlag", "F"); + mav.addObject("userInfo", empInfo); + mav.addObject("msg", "검색 결과가 없습니다."); + }else{ mav.addObject("joinFlag", "T"); -// mav.addObject("userInfo", userInfo); - mav.addObject("userInfo", new UserInfo()); + mav.addObject("userInfo", userInfo); mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); -// } -// }else{ -// mav.addObject("joinFlag", "F"); -// mav.addObject("userInfo", empInfo); -// mav.addObject("msg", "이미 가입된 식별번호입니다."); -// } + } + }else{ + mav.addObject("joinFlag", "F"); + mav.addObject("userInfo", empInfo); + mav.addObject("msg", "이미 가입된 식별번호입니다."); + } return mav; } -// @GetMapping("/updateUserInfoToKwms") -// public ModelAndView updateUserInfoToKwms(VEmployee empInfo){ -// ModelAndView mav = new ModelAndView("login/joinForm"); -// if(userInfoService.selectUserInfoToDicCode(empInfo.getDicCode()) == null){ -// UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDicCode()); -// if(userInfo==null){ -// mav.addObject("joinFlag", "F"); -// mav.addObject("userInfo", empInfo); -// mav.addObject("msg", "검색 결과가 없습니다."); -// }else{ -// mav.addObject("joinFlag", "T"); -// mav.addObject("userInfo", userInfo); -// mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); -// mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); -// mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); -// mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); -// mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); -// mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); -// } -// }else{ -// mav.addObject("joinFlag", "F"); -// mav.addObject("userInfo", empInfo); -// mav.addObject("msg", "이미 가입된 식별번호입니다."); -// } -// return mav; -// } -// -// @GetMapping("/kwmsCareerModal") -// public ModelAndView kwmsCareerModal(Integer userSeq, String dicCode){ -// ModelAndView mav = new ModelAndView("faisp/career/kwmsCareerModal"); -// mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC")); -// mav.addObject("careerList", kwmsService.selectUserCareerList(userSeq, dicCode)); -// return mav; -// } + @GetMapping("/updateUserInfoToKwms") + public ModelAndView updateUserInfoToKwms(VEmployee empInfo){ + ModelAndView mav = new ModelAndView("login/joinForm"); + if(userInfoService.selectUserInfoToDicCode(empInfo.getDic()) == null){ + UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDic()); + if(userInfo==null){ + mav.addObject("joinFlag", "F"); + mav.addObject("userInfo", empInfo); + mav.addObject("msg", "검색 결과가 없습니다."); + }else{ + mav.addObject("joinFlag", "T"); + mav.addObject("userInfo", userInfo); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); + } + }else{ + mav.addObject("joinFlag", "F"); + mav.addObject("userInfo", empInfo); + mav.addObject("msg", "이미 가입된 식별번호입니다."); + } + return mav; + } } diff --git a/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java index caae87b1..083dfcb9 100644 --- a/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java +++ b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java @@ -13,32 +13,34 @@ import javax.persistence.*; @Setter @Entity @NoArgsConstructor -//@DynamicInsert -//@DynamicUpdate -//@Table(name = "V_EMPLOYEE") +@DynamicInsert +@DynamicUpdate +@Table(name = "V_EMPLOYEE_EDU") public class VEmployee { -// @Id -// @Column(name = "DIC_CODE") -// private String dicCode; -// @Column(name = "EMP_NM") -// private String empNm; -// @Column(name = "BIRTH_DATE") -// private String birthDate; -// @Column(name = "SEX") -// private String sex; -// @Column(name = "POLICE_BMNG_IL") -// private String policeBmngIl; -// @Column(name = "JIKGEUP") -// private String jikgeup; -// @Column(name = "HN_JIKGEUP_IMYNGIL") -// private String hnJikgeupImyngil; -// @Column(name = "CALL_BUSEO_NM") -// private String callBuseoNm; -// @Column(name = "SAYONG_YN") -// private String sayongYn; -// @Column(name = "GYUNGGWA") -// private String gyunggwa; -// @Column(name = "JIKBYUL") -// private String jikbyul; + @Id + @Column(name = "DIC") + private String dic; + @Column(name = "USERID") + private String userid; + @Column(name = "NAME") + private String name; + @Column(name = "SEXCD") + private String sexcd; + @Column(name = "BIRTHDT") + private String birthdt; + @Column(name = "LDEPTNM") + private String ldeptnm; + @Column(name = "JIKGUBNM") + private String jikgubnm; + @Column(name = "STATUSCD") + private String statuscd; + @Column(name = "BMNGDT") + private String bmngdt; + @Column(name = "JIKGUBDT") + private String jikgubdt; + @Column(name = "BUSEODT") + private String buseodt; + @Column(name = "KYUNGGWA") + private String kyunggwa; } diff --git a/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java b/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java index fed8fb52..f38e1428 100644 --- a/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java +++ b/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java @@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; -//public interface VEmployeeRepository extends JpaRepository { -public interface VEmployeeRepository { -// Optional findByDicCode(String dicCode); +public interface VEmployeeRepository extends JpaRepository { + Optional findByDic(String dicCode); } diff --git a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java index a19bbdd6..36b11726 100644 --- a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java +++ b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java @@ -1,9 +1,7 @@ package com.dbnt.faisp.kwms.service; import com.dbnt.faisp.kwms.model.VEmployee; -import com.dbnt.faisp.kwms.model.VHordYundongStat; import com.dbnt.faisp.kwms.repository.VEmployeeRepository; -import com.dbnt.faisp.kwms.repository.VHordYundongStatRepository; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.userInfo.model.UserCareer; import com.dbnt.faisp.main.userInfo.model.UserInfo; @@ -20,68 +18,41 @@ import java.util.List; @Service @RequiredArgsConstructor public class KwmsService { -// private final VEmployeeRepository vEmployeeRepository; -// private final VHordYundongStatRepository vHordRepository; -// private final CodeMgtService codeMgtService; -// private final UserCareerRepository careerRepository; -// -// public UserInfo selectEmpInfo(String dicCode){ -// VEmployee empInfo = vEmployeeRepository.findByDicCode(dicCode).orElse(null); -// if(empInfo==null){ -// return null; -// }else{ -// return convertVEmployeeToUserInfo(empInfo); -// } -// } -// -// private UserInfo convertVEmployeeToUserInfo(VEmployee empInfo){ -// UserInfo userInfo = new UserInfo(); -// userInfo.setDicCode(empInfo.getDicCode()); -// userInfo.setUserNm(empInfo.getEmpNm()); -// userInfo.setSex(empInfo.getSex().strip().equals("F")?"SEX001":"SEX002"); -// String[] positionAry = empInfo.getCallBuseoNm().split(" "); -// userInfo.setOgCd(codeMgtService.searchCodeToCategoryAndValue("OG", positionAry[0])); -// if (positionAry.length>1){ -// userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue("OFC", positionAry[1])); -// } -// userInfo.setTitleCd(codeMgtService.searchCodeToCategoryAndValue("JT", empInfo.getJikgeup())); -// userInfo.setOutturnCd(codeMgtService.searchCodeToCategoryAndValue("OTC", empInfo.getGyunggwa())); -// userInfo.setSeriesCd(codeMgtService.searchCodeToCategoryAndValue("SRC", empInfo.getJikbyul())); -// -// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); -// empInfo.setBirthDate( -// (Integer.parseInt(empInfo.getBirthDate().substring(0,2))>60?"19":"20")+empInfo.getBirthDate()); -// userInfo.setBirthDate(LocalDate.parse(empInfo.getBirthDate(), formatter)); -// userInfo.setPoliceInDate(LocalDate.parse(empInfo.getPoliceBmngIl(), formatter)); -// userInfo.setTitleInDate(LocalDate.parse(empInfo.getHnJikgeupImyngil(), formatter)); -// return userInfo; -// } -// -// public List selectUserCareerList(Integer userSeq, String dicCode) { -// List statList = vHordRepository.findByDicCodeOrderByStartDateDesc(dicCode); -// List savedList = careerRepository.findByUserSeqOrderByStartDateDesc(userSeq); -// List careerList = new ArrayList<>(); -// for(VHordYundongStat stat: statList){ -// boolean savedFlag = false; -// for(UserCareer savedCareer: savedList){ -// if (stat.getHordYundongCd().equals(savedCareer.getHordCd())) { -// savedFlag = true; -// break; -// } -// } -// if(!savedFlag){ -// UserCareer career = new UserCareer(); -// career.setDesignationCd(codeMgtService.searchCodeToCategoryAndValue("DSN", stat.getImyongGubunNm())); -// career.setWorkPositionStr(stat.getImyongbuseoChongching()); -// career.setWorkTitle(codeMgtService.searchCodeToCategoryAndValue("JT", stat.getImyongJikgeupNm())); -// career.setStartDate(stat.getStartDate()); -// career.setEndDate(stat.getEndDate()); -// career.setWorkDay(stat.getWorkDay()==null?0:stat.getWorkDay()); -// career.setWorkMonth(stat.getWorkMonth()==null?0:stat.getWorkMonth()); -// career.setHordCd(stat.getHordYundongCd()); -// careerList.add(career); -// } -// } -// return careerList; -// } + private final VEmployeeRepository vEmployeeRepository; + private final CodeMgtService codeMgtService; + private final UserCareerRepository careerRepository; + + public UserInfo selectEmpInfo(String dicCode){ + VEmployee empInfo = vEmployeeRepository.findByDic(dicCode).orElse(null); + if(empInfo==null){ + return null; + }else{ + return convertVEmployeeToUserInfo(empInfo); + } + } + + private UserInfo convertVEmployeeToUserInfo(VEmployee empInfo){ + UserInfo userInfo = new UserInfo(); + userInfo.setDicCode(empInfo.getDic()); + userInfo.setUserId(empInfo.getUserid()); + userInfo.setUserNm(empInfo.getName()); + userInfo.setSex(empInfo.getSexcd().strip().equals("F")?"SEX001":"SEX002"); + String[] positionAry = empInfo.getLdeptnm().split(" "); + userInfo.setOgCd(codeMgtService.searchCodeToCategoryAndValue("OG", positionAry[0])); + if (positionAry.length>1){ + userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue("OFC", positionAry[1])); + } + userInfo.setTitleCd(codeMgtService.searchCodeToCategoryAndValue("JT", empInfo.getJikgubnm())); + userInfo.setOutturnCd(codeMgtService.searchCodeToCategoryAndValue("OTC", empInfo.getKyunggwa())); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); + empInfo.setBirthdt( + (Integer.parseInt(empInfo.getBirthdt().substring(0,2))>60?"19":"20")+empInfo.getBirthdt()); + userInfo.setBirthDate(LocalDate.parse(empInfo.getBirthdt(), formatter)); + userInfo.setPoliceInDate(LocalDate.parse(empInfo.getBmngdt(), formatter)); + userInfo.setOfcInDate(LocalDate.parse(empInfo.getBuseodt(), formatter)); + userInfo.setTitleInDate(LocalDate.parse(empInfo.getJikgubdt(), formatter)); + return userInfo; + } + } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java index 036b7c68..4619bb54 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java @@ -70,11 +70,11 @@ public class MyInfoController { @PostMapping("/syncSelfToKwms") public void syncSelfToKwms(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) { -// UserInfo kwmsInfo = kwmsService.selectEmpInfo(userInfo.getDicCode()); -// if(kwmsInfo!= null){ -// kwmsInfo.setUserSeq(loginUser.getUserSeq()); -// userInfoService.updateUserInfo(loginUser,kwmsInfo); -// } + UserInfo kwmsInfo = kwmsService.selectEmpInfo(userInfo.getDicCode()); + if(kwmsInfo!= null){ + kwmsInfo.setUserSeq(loginUser.getUserSeq()); + userInfoService.updateUserInfo(loginUser,kwmsInfo); + } } @GetMapping("/moveAlarmBoard") public ModelAndView moveAlarmBoard(UserAlarm alarm){ diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java index 5986eae0..580dde38 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java @@ -133,13 +133,13 @@ public class PoliceController { @PostMapping("/syncUserInfoToKwms") @ResponseBody public String syncUserInfoToKwms(@AuthenticationPrincipal UserInfo loginUser,@RequestBody List infoList){ -// for(UserInfo info: infoList){ -// UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode()); -// if(kwmsInfo!=null){ -// kwmsInfo.setUserSeq(info.getUserSeq()); -// userInfoService.updateUserInfo(loginUser,kwmsInfo); -// } -// } + for(UserInfo info: infoList){ + UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode()); + if(kwmsInfo!=null){ + kwmsInfo.setUserSeq(info.getUserSeq()); + userInfoService.updateUserInfo(loginUser,kwmsInfo); + } + } if(infoList.size()==1){ return infoList.get(0).getUserSeq().toString(); }else{ diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java index 1cd5cb02..cfadcb95 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java @@ -90,13 +90,13 @@ public class UserMgtController { @PostMapping("/syncUserInfoToKwms") @ResponseBody public String syncUserInfoToKwms(@AuthenticationPrincipal UserInfo loginUser,@RequestBody List infoList){ -// for(UserInfo info: infoList){ -// UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode()); -// if(kwmsInfo!=null){ -// kwmsInfo.setUserSeq(info.getUserSeq()); -// userInfoService.updateUserInfo(loginUser,kwmsInfo); -// } -// } + for(UserInfo info: infoList){ + UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode()); + if(kwmsInfo!=null){ + kwmsInfo.setUserSeq(info.getUserSeq()); + userInfoService.updateUserInfo(loginUser,kwmsInfo); + } + } if(infoList.size()==1){ return infoList.get(0).getUserSeq().toString(); }else{ diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 8c4a1a91..063984fc 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,15 +1,15 @@ -#tomcat.ajp.protocol=HTTP/1.1 +tomcat.ajp.protocol=AJP/1.3 #server.port=80 #file upload -spring.servlet.multipart.location=/home/jboss/faisp/uploadFiles +spring.servlet.multipart.location=/backup/faisp/uploadFiles spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=500MB site.domain=10.187.58.46:8080 #file -file.dir=C:\\faispUploadFiles +file.dir=/backup/faisp/uploadFiles file.dir.vulnerable=/vulnerable file.dir.part=/part file.dir.equip=/equip diff --git a/src/main/resources/static/Crosseditor/config/xmls/Config.xml b/src/main/resources/static/Crosseditor/config/xmls/Config.xml index 46bbab87..21e4e1c1 100644 --- a/src/main/resources/static/Crosseditor/config/xmls/Config.xml +++ b/src/main/resources/static/Crosseditor/config/xmls/Config.xml @@ -102,7 +102,7 @@ 1.0.0.23 1.0.0.3 1.0.0.19 - 1 + 0 diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index f42700e1..91ae98aa 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -194,7 +194,7 @@ function setEditor(divId, editorHeight){ CrossEditor.params.NewToolbar = true; CrossEditor.params.UploadFileExecutePath = "/Crosseditor/uploadImg"; CrossEditor.params.FullScreen = false; - $("#editor").show(); + $("#"+divId).show(); CrossEditor.EditorStart(); } diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index d0f55497..56ea2c53 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -1,9 +1,9 @@ $(document).on('click', '#dicCodeSearchBtn', function (){ const dicCode = $("#dicCode").val(); - //if(dicCode!==''){ + if(dicCode!==''){ $.ajax({ url: '/kwms/getEmpInfoToJoinForm', - data: {dicCode: dicCode}, + data: {dic: dicCode}, type: 'GET', dataType:"html", success: function(html){ @@ -18,9 +18,9 @@ $(document).on('click', '#dicCodeSearchBtn', function (){ } }); - //}else{ - // alert("공무원식별번호를 입력해주세요.") - //} + }else{ + alert("공무원식별번호를 입력해주세요.") + } }) $(document).on('click', '#saveBtn', function (){ diff --git a/src/main/resources/static/js/police/careerMgt.js b/src/main/resources/static/js/police/careerMgt.js index 2b49123c..7ce23783 100644 --- a/src/main/resources/static/js/police/careerMgt.js +++ b/src/main/resources/static/js/police/careerMgt.js @@ -178,7 +178,7 @@ function getCareerModal(userSeq, careerCd){ }); } function getKwmsCareerModal(userSeq, dicCode){ - $.ajax({ + /*$.ajax({ url: '/kwms/kwmsCareerModal', data: {userSeq: userSeq, dicCode: dicCode}, type: 'GET', @@ -190,7 +190,7 @@ function getKwmsCareerModal(userSeq, dicCode){ error:function(){ } - }); + });*/ } function checkValue(){ let flag = true; diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index df4db2d9..2abe81cf 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -4,142 +4,148 @@
국제범죄검거 현황
-
-
- - +
- - - - -
- -
- +
+ + +
+
+ + + + +
+
+
+ + + + + +
+
+ + +
+ +
+
+ + + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+
-
- -
- -
- -
- -
+ +
+
-
-
- -
- -
- -
- -
- -
-
- -
- + +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
-
- -
-
- - -
- - -
- -
- -
- -
- -
- -
- -
- -
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
-
- + + +
@@ -147,193 +153,161 @@
- - + - +
-
- - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - -
-
-
-
- - - -
-
- - -
- + +
+
- -
- -
- -
- +
+ + +
+
+
+
+ + + +
+
+ + +
+
+ + +
+ +
+ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ +
+
+ +
+ + +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+ + + +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
- -
- - -
- -
- - -
- - -
- -
- -
- -
- - -
- -
- -
-
-
- -
- -
- -
- -
-
- - - -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
- - -
- -
- -
+
+
+ +
+
-
- -
-
-
-
- +
diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index c3ad2b9c..d5c4dcdb 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -3,30 +3,174 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +

대시보드

- 대시보드 편집 +
-
-
-
-
-
-
+
+ + +
+
+
+
공지사항
+
+
+
+
+ + + + + + + + + + + + + + + + +
제목작성자작성일시
+ + +
+
+
+
+ +
+ +
+
+
+
외사정보보고 수신문서
+
+
+
+
+ + + + + + + + + + + + + + +
제목작성일시
+
+
+
+
+ +
+
+
+
외사경찰 견문관리
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
제목작성일시상태
+
+
+
+
+
+
+
+
외사첩보망 견문관리
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
제목작성일시상태
+
+
+
+ + + + + +
\ No newline at end of file diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index 657e16c3..c05afeb8 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -5,7 +5,7 @@
사용자 신청
- -
- -
-
- -
- -
- -
-
- -
- - -
- -
- -
-
-
- -
- - -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
-
-
+
diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html index c786627e..8e69b256 100644 --- a/src/main/resources/templates/user/myInfo.html +++ b/src/main/resources/templates/user/myInfo.html @@ -25,7 +25,7 @@