diff --git a/src/main/java/com/xit/biz/ctgy/CtgyConstants.java b/src/main/java/com/xit/biz/ctgy/CtgyConstants.java index 13c1771..54a43ab 100644 --- a/src/main/java/com/xit/biz/ctgy/CtgyConstants.java +++ b/src/main/java/com/xit/biz/ctgy/CtgyConstants.java @@ -21,8 +21,18 @@ public class CtgyConstants { RESULT_JUDGE_PRE("0", "심의전"), RESULT_JUDGE_NON_IMPOSE("1", "미부과"), RESULT_JUDGE_IMPOSE("2", "부과"), - RESULT_STATE_NON_IMPOSE("3", "과태료 부과여부 ‘과태료 부과하지 않음’으로 결정되었음을 알려드리며 향후 동일한 내용으로 진술시 부과 될 수 있음을 알려드립니다."), - RESULT_STATE_IMPOSE("4", "귀하께서 제출하신 의견진술 심의요청에 대하여 강남구 불법주정차 의견진술 심의위원회의 심의결과 ‘과태료 부과’로 결정되었음을 알려드립니다."), + RESULT_STATE_NON_IMPOSE("3", "귀하께서 제출하신 의견진술 심의 요청에 대하여, 강남구 불법주정차 의견진술 심의 결과, 주차장법 제9조 제3항에 " + + "의거 단속대상이나, 금번에 한하여 「가산금 부과하지 않음」으로 결정되었습니다. 이후에는 지정된 주차공간에 주차하여 " + + "원활한 교통 소통 및 시민의 안전을 위해 노력해 주시기 바랍니다."), + RESULT_STATE_IMPOSE("4", "귀하께서 제출하신 의견진술 심의 요청에 대하여, 강남구 불법주정차 의견진술 심의위원회 심의 결과, " + + "의견진술 내용은 이해가 되나, 자동차 교통을 원활케 한 시민 편의와 안전을 위하여, " + + "주차장법 제9조 제3항 및 서울특별시 강남구 주차장 설치 및 관리 조례 제6조 제1, 2항 등에 의거하여 「가산금 부과」로 결정되었습니다."), + RESULT_STATE_DISABLED_NON_IMPOSE("3", "귀하께서 제출하신 의견진술 심의 요청에 대하여, 강남구 불법주정차 의견진술 심의위원회 심의 결과, " + + "장애인등편의증진보장에관한법률 제17조 등에 의거 단속대상이나, 금번에 한하여 「과태료 부과하지 않음」으로 결정되었습니다. " + + "이후에는 지정된 주차공간에 주차하여 원활한 교통 소통 및 시민의 안전을 위해 노력해 주시기 바랍니다."), + RESULT_STATE_DISABLED_IMPOSE("4", "귀하께서 제출하신 의견진술 심의 요청에 대하여, 강남구 불법주정차 의견진술 심의위원회 심의 결과, " + + "의견진술 내용은 이해가 되나, 보행 장애인의 안전하고 편리한 시설 이용 및 접근을 위하여 장애인등편의증진보장에관한법률 제17조 등에 의거 「과태료 부과」로 결정되었습니다. " + + "심의결과에 이의가 있으시면 과태료 고지서를 받은 날로부터 60일 이내에 이의신청[문의 : 02)3423-6426]을 하실 수 있음을 알려드립니다."), // 데이타구분 DATAGB_RESIDENT("1", "거주자"), DATAGB_DISABLED("2", "장애인") diff --git a/src/main/java/com/xit/biz/ctgy/auth/MinPasswordEncoder.java b/src/main/java/com/xit/biz/ctgy/auth/MinPasswordEncoder.java index 5cdb358..432a75d 100644 --- a/src/main/java/com/xit/biz/ctgy/auth/MinPasswordEncoder.java +++ b/src/main/java/com/xit/biz/ctgy/auth/MinPasswordEncoder.java @@ -48,8 +48,9 @@ public class MinPasswordEncoder implements PasswordEncoder { this.logger.warn("Empty encoded password"); return false; } - - return Objects.equals(minUserinfoDao.queryGetPasswdEncode(rawPassword.toString()), encodedPassword); +//23.05.11 jhseo - DB 복호화 처리로 인하여 별도 암호화 하지 않고 비교 처리 +// return Objects.equals(minUserinfoDao.queryGetPasswdEncode(rawPassword.toString()), encodedPassword); + return Objects.equals(rawPassword.toString(), encodedPassword); } /** diff --git a/src/main/java/com/xit/biz/ctgy/v2/controller/ResidentAndDisabledController.java b/src/main/java/com/xit/biz/ctgy/v2/controller/ResidentAndDisabledController.java index 4fb8725..b23d724 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/controller/ResidentAndDisabledController.java +++ b/src/main/java/com/xit/biz/ctgy/v2/controller/ResidentAndDisabledController.java @@ -177,9 +177,15 @@ public class ResidentAndDisabledController { @Secured(policy = SecurityPolicy.TOKEN) @Operation(summary = "dashboard" , description = "dashboard") + @Parameters({ + @Parameter(in = ParameterIn.QUERY, name = "accesstype", description = "사용구분(001-관리자, 002-심사자)", required = true, example = " ") + }) @GetMapping(value="/dashboard", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity getDashboard() { - return RestResponse.of(service.findDashboard()); + public ResponseEntity getDashboard( + @Valid + @Parameter(hidden = true) + final MinUserinfoDto dto) { + return RestResponse.of(service.findDashboard(dto)); } //--------------------------------------------------------------------------------- // 심사자 diff --git a/src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java b/src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java index 4518a60..e16a482 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java +++ b/src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java @@ -216,8 +216,9 @@ public class ParkingDao extends BaseMpowerDaoSupport { delete(sql); } - public List findDashboardJudgeList() { + public List findDashboardJudgeList(MinUserinfoDto dto) { final String sql = QueryGenerator.createNamedQuery(NAME_SPACE, "selectDashboardJudgeList") + .setParameter("accesstype", dto.getAccesstype()) .getQueryString(); final String fieldStrs = "msEdate, msuTeam, name, jcnt, tcnt"; return selectList(DashboardJudgeListDto.class, sql, fieldStrs); diff --git a/src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java b/src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java index e00a1a3..04f7447 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java +++ b/src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java @@ -297,9 +297,10 @@ public class ResidentAndDisabledDao extends BaseMpowerDaoSupport { } - public List findDashboardJudgeList(@NotNull final String msDatagb) { + public List findDashboardJudgeList(@NotNull final String msDatagb, MinUserinfoDto dto) { final String sql = QueryGenerator.createNamedQuery(NAME_SPACE, "selectDashboardJudgeList") .setParameter("msDatagb", msDatagb) + .setParameter("accesstype", dto.getAccesstype()) .getQueryString(); final String fieldStrs = "msEdate, msuTeam, name, jcnt, tcnt"; return selectList(DashboardJudgeListDto.class, sql, fieldStrs); diff --git a/src/main/java/com/xit/biz/ctgy/v2/repository/UserDao.java b/src/main/java/com/xit/biz/ctgy/v2/repository/UserDao.java index 2a4b92b..096963e 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/repository/UserDao.java +++ b/src/main/java/com/xit/biz/ctgy/v2/repository/UserDao.java @@ -111,7 +111,7 @@ public class UserDao extends BaseMpowerDaoSupport { .setParameter("email", dto.getEmail()) .setParameter("mphone", dto.getMphone()) .setParameter("name", dto.getName()) - //.setParameter("passwd", dto.getPasswd()) + .setParameter("passwd", dto.getPasswd()) .setParameter("team", dto.getTeam()) .getQueryString(); update(sql); diff --git a/src/main/java/com/xit/biz/ctgy/v2/repository/UserSubDao.java b/src/main/java/com/xit/biz/ctgy/v2/repository/UserSubDao.java index 861f173..014065a 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/repository/UserSubDao.java +++ b/src/main/java/com/xit/biz/ctgy/v2/repository/UserSubDao.java @@ -46,7 +46,7 @@ public class UserSubDao extends BaseMpowerDaoSupport { .setParameter("email", dto.getEmail()) .setParameter("mphone", dto.getMphone()) .setParameter("name", dto.getName()) - //.setParameter("passwd", dto.getPasswd()) + .setParameter("passwd", dto.getPasswd()) .setParameter("team", dto.getTeam()) .getQueryString(); update(sql); diff --git a/src/main/java/com/xit/biz/ctgy/v2/service/IResidentAndDisabledService.java b/src/main/java/com/xit/biz/ctgy/v2/service/IResidentAndDisabledService.java index 8522c0c..d15fe83 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/service/IResidentAndDisabledService.java +++ b/src/main/java/com/xit/biz/ctgy/v2/service/IResidentAndDisabledService.java @@ -77,7 +77,7 @@ public interface IResidentAndDisabledService { void saveJudgeStds(final JudgeStdDto dto); - Map findDashboard(); + Map findDashboard(MinUserinfoDto dto); //--------------------------------------------------------------------------------- // 심사자 diff --git a/src/main/java/com/xit/biz/ctgy/v2/service/impl/MinUserService.java b/src/main/java/com/xit/biz/ctgy/v2/service/impl/MinUserService.java index 32e524d..e5662e8 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/service/impl/MinUserService.java +++ b/src/main/java/com/xit/biz/ctgy/v2/service/impl/MinUserService.java @@ -63,7 +63,10 @@ public class MinUserService implements IMinUserService { @Override //@Transactional public void removeMinUser(MinUserinfoDto dto) { - dto.setIsenable("0"); + if("0".equals(dto.getIsenable())) + dto.setIsenable("1"); + else + dto.setIsenable("0"); userDao.removeMinUserinfo(dto); userSubDao.removeMinUserinfo(dto); } diff --git a/src/main/java/com/xit/biz/ctgy/v2/service/impl/ResidentAndDisabledService.java b/src/main/java/com/xit/biz/ctgy/v2/service/impl/ResidentAndDisabledService.java index 1dc5509..8644dd9 100644 --- a/src/main/java/com/xit/biz/ctgy/v2/service/impl/ResidentAndDisabledService.java +++ b/src/main/java/com/xit/biz/ctgy/v2/service/impl/ResidentAndDisabledService.java @@ -274,11 +274,21 @@ public class ResidentAndDisabledService implements IResidentAndDisabledService { String scState = ""; String scAnswer = ""; if("1".equals(msResult)){ - scState = CtgyConstants.Judge.RESULT_STATE_NON_IMPOSE.getCode(); - scAnswer = CtgyConstants.Judge.RESULT_STATE_NON_IMPOSE.getDesc(); + if("2".equals(dto.getDataGb())){ + scState = CtgyConstants.Judge.RESULT_STATE_DISABLED_NON_IMPOSE.getCode(); + scAnswer = CtgyConstants.Judge.RESULT_STATE_DISABLED_NON_IMPOSE.getDesc(); + }else{ + scState = CtgyConstants.Judge.RESULT_STATE_NON_IMPOSE.getCode(); + scAnswer = CtgyConstants.Judge.RESULT_STATE_NON_IMPOSE.getDesc(); + } }else if("2".equals(msResult)){ - scState = CtgyConstants.Judge.RESULT_STATE_IMPOSE.getCode(); - scAnswer = CtgyConstants.Judge.RESULT_STATE_IMPOSE.getDesc(); + if("2".equals(dto.getDataGb())){ + scState = CtgyConstants.Judge.RESULT_STATE_DISABLED_IMPOSE.getCode(); + scAnswer = CtgyConstants.Judge.RESULT_STATE_DISABLED_IMPOSE.getDesc(); + }else{ + scState = CtgyConstants.Judge.RESULT_STATE_IMPOSE.getCode(); + scAnswer = CtgyConstants.Judge.RESULT_STATE_IMPOSE.getDesc(); + } } residentAndDisabledDao.updateState(msMaincode, msSeq, scState, scAnswer); } @@ -286,13 +296,13 @@ public class ResidentAndDisabledService implements IResidentAndDisabledService { } //@Transactional(readOnly = true) - public Map findDashboard(){ + public Map findDashboard(MinUserinfoDto dto){ Map resultMap = new HashMap<>(); resultMap.put("pBoardList", publicBoardDao.findAll(new MinInfoBoard680Dto(), PageRequest.of(0, 7))); - resultMap.put("parkJudgeList", parkingDao.findDashboardJudgeList()); - resultMap.put("residentJudgeList", residentAndDisabledDao.findDashboardJudgeList(CtgyConstants.Judge.DATAGB_RESIDENT.getCode())); - resultMap.put("disabledJudgeList", residentAndDisabledDao.findDashboardJudgeList(CtgyConstants.Judge.DATAGB_DISABLED.getCode())); + resultMap.put("parkJudgeList", parkingDao.findDashboardJudgeList(dto)); + resultMap.put("residentJudgeList", residentAndDisabledDao.findDashboardJudgeList(CtgyConstants.Judge.DATAGB_RESIDENT.getCode(), dto)); + resultMap.put("disabledJudgeList", residentAndDisabledDao.findDashboardJudgeList(CtgyConstants.Judge.DATAGB_DISABLED.getCode(), dto)); return resultMap; } diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index ef7ebfb..8d6847f 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ spring: name: xit-framework #description: XIT api for development profiles: - active: local + active: prod include: oauth main: # bean name 중복 허용 - junit 사용시 true?? diff --git a/src/main/resources/sql/minuserinfo-mapper.xml b/src/main/resources/sql/minuserinfo-mapper.xml index b024893..94ad11b 100644 --- a/src/main/resources/sql/minuserinfo-mapper.xml +++ b/src/main/resources/sql/minuserinfo-mapper.xml @@ -4,7 +4,7 @@ /* minuserinfo-mapper|selectUserInfo|julim */ SELECT userid, - passwd, + TRAFFIC.ECL_DECRYPT(passwd) AS passwd, name, regnum, mphone, @@ -38,7 +38,7 @@ , gu , isenable , mphone - , passwd + , TRAFFIC.ECL_DECRYPT(passwd) AS passwd , regdate , regnum , team @@ -57,7 +57,7 @@ , isenable , mphone , name - , passwd + , TRAFFIC.ECL_DECRYPT(passwd) AS passwd , regdate , regnum , team @@ -138,6 +138,7 @@ , name = #{name} , mphone = #{mphone} , email = #{email} + , passwd = #{passwd} WHERE userid= #{userid} diff --git a/src/main/resources/sql/minusersubinfo-mapper.xml b/src/main/resources/sql/minusersubinfo-mapper.xml index 3a7d3c4..fe3e90e 100644 --- a/src/main/resources/sql/minusersubinfo-mapper.xml +++ b/src/main/resources/sql/minusersubinfo-mapper.xml @@ -37,6 +37,7 @@ , name = #{name} , mphone = #{mphone} , email = #{email} + , passwd = #{passwd} WHERE userid= #{userid} diff --git a/src/main/resources/sql/parking-mapper.xml b/src/main/resources/sql/parking-mapper.xml index ed1be3a..fff28f5 100644 --- a/src/main/resources/sql/parking-mapper.xml +++ b/src/main/resources/sql/parking-mapper.xml @@ -326,7 +326,7 @@ /* parking-mapper|selectDashboardJudgeList|julim */ SELECT MS.ms_edate , MSU.msu_team - , MU.name + , DECODE(#{accesstype}, '001', MU.name, '002', REGEXP_REPLACE(MU.name, '.', '*', 2)) name , SUM(DECODE(MSU.msu_result, '1', 1, '2', 1, 0)) jcnt , COUNT(*) tcnt FROM min_simsa680 MS @@ -350,7 +350,7 @@ /* parking-mapper|selectByUserJudgeList|julim */ SELECT MS.ms_maincode , MS.ms_seq - , MS.ms_carnum + , REGEXP_REPLACE(MS.ms_carnum, '.', '*', 4) as ms_carnum , DECODE(MS.ms_result, '1', '1', '2', '2', '0') as msResult , MS.ms_year , MS.ms_chasu diff --git a/src/main/resources/sql/residentAndDisabled-mapper.xml b/src/main/resources/sql/residentAndDisabled-mapper.xml index a799ded..3670291 100644 --- a/src/main/resources/sql/residentAndDisabled-mapper.xml +++ b/src/main/resources/sql/residentAndDisabled-mapper.xml @@ -170,7 +170,7 @@ sc_state ) VALUES ( gn_recall_sc_seq.NEXTVAL, - (SELECT RPAD(NVL(MAX(e.sc_seq), '2022'), 10, '0') + 1 + (SELECT RPAD(NVL(MAX(e.sc_seq), #{curYear}), 10, '0') + 1 FROM gn_recall_sc e WHERE e.sc_datagb = #{scDatagb} AND e.sc_seq LIKE #{curYear} ||'%'), @@ -585,7 +585,7 @@ /* residentAndDisabled-mapper|selectDashboardJudgeList|julim */ SELECT MS.ms_edate , MSU.msu_team - , MU.name + , DECODE(#{accesstype}, '001', MU.name, '002', REGEXP_REPLACE(MU.name, '.', '*', 2)) name , SUM(DECODE(MSU.msu_result, '1', 1, '2', 1, 0)) jcnt , COUNT(*) tcnt FROM min_simsa680_sc MS @@ -611,7 +611,7 @@ /* residentAndDisabled-mapper|selectByUserJudgeList|julim */ SELECT MS.ms_maincode , MS.ms_seq - , MS.ms_carnum + , REGEXP_REPLACE(MS.ms_carnum, '.', '*', 4) as ms_carnum , DECODE(MS.ms_result, '1', '1', '2', '2', '0') as msResult , MS.ms_year , MS.ms_chasu