fix:

-Dashboard 심사자 이름 *로 변경
-심의 목록 차량번호 뒤 4자리 *로 변경
-관리자 사용자관리 비활성 계정 복구 및 패스워드 변경 기능 추가

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);
     }
 
     /**

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<? extends IRestResponse> getDashboard() {
-        return RestResponse.of(service.findDashboard());
+    public ResponseEntity<? extends IRestResponse> getDashboard(
+            @Valid
+            @Parameter(hidden = true)
+            final MinUserinfoDto dto) {
+        return RestResponse.of(service.findDashboard(dto));
     }
     //---------------------------------------------------------------------------------
     // 심사자

src/main/java/com/xit/biz/ctgy/v2/repository/ParkingDao.java

@@ -216,8 +216,9 @@ public class ParkingDao extends BaseMpowerDaoSupport {
         delete(sql);
     }
 
-    public List<DashboardJudgeListDto> findDashboardJudgeList() {
+    public List<DashboardJudgeListDto> 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);

src/main/java/com/xit/biz/ctgy/v2/repository/ResidentAndDisabledDao.java

@@ -297,9 +297,10 @@ public class ResidentAndDisabledDao extends BaseMpowerDaoSupport {
 
     }
 
-    public List<DashboardJudgeListDto> findDashboardJudgeList(@NotNull final String msDatagb) {
+    public List<DashboardJudgeListDto> 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);

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);

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);

src/main/java/com/xit/biz/ctgy/v2/service/IResidentAndDisabledService.java

@@ -77,7 +77,7 @@ public interface IResidentAndDisabledService {
 
     void saveJudgeStds(final JudgeStdDto dto);
 
-    Map<String,Object> findDashboard();
+    Map<String,Object> findDashboard(MinUserinfoDto dto);
 
     //---------------------------------------------------------------------------------
     // 심사자

src/main/java/com/xit/biz/ctgy/v2/service/impl/MinUserService.java

@@ -63,6 +63,9 @@ public class MinUserService implements IMinUserService {
     @Override
     //@Transactional
     public void removeMinUser(MinUserinfoDto dto) {
+        if("0".equals(dto.getIsenable()))
+            dto.setIsenable("1");
+        else
             dto.setIsenable("0");
         userDao.removeMinUserinfo(dto);
         userSubDao.removeMinUserinfo(dto);

src/main/java/com/xit/biz/ctgy/v2/service/impl/ResidentAndDisabledService.java

@@ -286,13 +286,13 @@ public class ResidentAndDisabledService implements IResidentAndDisabledService {
     }
 
     //@Transactional(readOnly = true)
-    public Map<String,Object> findDashboard(){
+    public Map<String,Object> findDashboard(MinUserinfoDto dto){
         Map<String, Object> 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;
     }

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??

src/main/resources/sql/minuserinfo-mapper.xml

@@ -4,7 +4,7 @@
     <native-query id="selectUserInfo">
         /* 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}
     </native-query>
 

src/main/resources/sql/minusersubinfo-mapper.xml

@@ -37,6 +37,7 @@
              , name = #{name}
              , mphone = #{mphone}
              , email = #{email}
+             , passwd = #{passwd}
          WHERE userid= #{userid}
     </native-query>
 

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

src/main/resources/sql/residentAndDisabled-mapper.xml

@@ -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