앰버전관리 테스트 전 소스 커밋

src/main/java/com/oqpo/api/config/WebMvcConfig.java

@@ -42,6 +42,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
                         .excludePathPatterns("/api/pop/info-pop")
                         .excludePathPatterns("/api/member/find-id")
                         .excludePathPatterns("/api/member/find-pw")
+                        .excludePathPatterns("/api/verinfo/info-lastver")
                         .excludePathPatterns("/api/file/download/**");
             }
 

src/main/java/com/oqpo/api/entity/system/VerInfoEntity.java

@@ -0,0 +1,27 @@
+package com.oqpo.api.entity.system;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class VerInfoEntity implements Serializable {
+    private static final long serialVersionUID = -921350664624919620L;
+
+    private String appNo;
+    private String devTpCd;
+    private String devTpNm;
+    private String appVer;
+    private String desVer;
+    private String appVerDt;
+    private String delYn;
+    private String addDt;
+    private String addId;
+    private String chgDt;
+    private String chgId;
+
+}

src/main/java/com/oqpo/api/mapper/system/VerInfoMapper.java

@@ -0,0 +1,20 @@
+package com.oqpo.api.mapper.system;
+
+import com.oqpo.api.entity.system.VerInfoEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface VerInfoMapper {
+
+    List<VerInfoEntity> selectVerAppGridList(GridRequest gridRequest) throws Exception;
+    int selectVerAppGridCnt() throws Exception;
+    int insertVerInfo(@Param("userId") String userId, VerInfoEntity entity) throws Exception;
+    int updateDelVerInfo(@Param("userId") String userId, @Param("appNo") String  appNo) throws Exception;
+    VerInfoEntity selectVerAppInfo( @Param("appNo") String  appNo) throws Exception;
+    String selectLastVerInfo() throws Exception;
+
+}

src/main/java/com/oqpo/api/service/system/VerInfoService.java

@@ -0,0 +1,101 @@
+package com.oqpo.api.service.system;
+
+
+import com.oqpo.api.entity.system.VerInfoEntity;
+import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.system.VerInfoMapper;
+import com.oqpo.api.service.CommonService;
+import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.VerInfo.SaveVerInfoRequest;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.ver.VerInfoResponse;
+import com.oqpo.api.web.dto.response.ver.VerInfoSearchResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class VerInfoService extends CommonService {
+    @Autowired
+    private VerInfoMapper verInfoMapper;
+
+    /*
+     버전 그리드 리스트 조회
+    */
+    public GridResponse appVerGridList(GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+        int gridRecords = verInfoMapper.selectVerAppGridCnt();
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<VerInfoEntity> entities = verInfoMapper.selectVerAppGridList(gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> VerInfoSearchResponse.builder()
+                        .viewCd("R")
+                        .appNo((m.getAppNo()))
+                        .appVer(m.getAppVer())
+                        .desVer(m.getDesVer())
+                        .appVerDt(m.getAppVerDt())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+
+    /*
+      앱버전정보 - 저장
+     */
+    @Transactional
+    public void saveAppVer(String userId, SaveVerInfoRequest entity) throws Exception {
+        try {
+            VerInfoEntity vientity = new VerInfoEntity();
+            vientity.setAppVer(entity.getAppVer());
+            vientity.setDesVer(entity.getDesVer());
+            verInfoMapper.insertVerInfo(userId, vientity) ;
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+    /*
+      앱버전정보 - 삭제
+     */
+    @Transactional
+    public void delAppVer(String userId, String appNo) throws Exception {
+        try {
+            verInfoMapper.updateDelVerInfo(userId, appNo) ;
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+    /*
+    버전 최신버전값 전송
+    */
+    public VerInfoResponse selectLastVerInfo( ) throws Exception {
+        String appNo = verInfoMapper.selectLastVerInfo();
+        VerInfoEntity entity = verInfoMapper.selectVerAppInfo(appNo);
+        return VerInfoResponse.toDTO(entity );
+    }
+
+    /* 버전 정보*/
+    public VerInfoResponse selectVerAppInfo(String appNo) throws Exception {
+
+        VerInfoEntity entity = verInfoMapper.selectVerAppInfo(appNo);
+        return VerInfoResponse.toDTO(entity );
+    }
+
+
+}

src/main/java/com/oqpo/api/web/controller/system/VerInfoController.java

@@ -0,0 +1,122 @@
+package com.oqpo.api.web.controller.system;
+
+import com.oqpo.api.enums.DataMessageCode;
+import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.mapper.system.VerInfoMapper;
+import com.oqpo.api.service.system.JobService;
+import com.oqpo.api.service.system.VerInfoService;
+import com.oqpo.api.web.dto.request.VerInfo.SaveVerInfoRequest;
+import com.oqpo.api.web.dto.request.VerInfo.VerInfoGridRequest;
+import com.oqpo.api.web.dto.request.code.SaveCodeRequest;
+import com.oqpo.api.web.dto.request.job.JobGridRequest;
+import com.oqpo.api.web.dto.response.DataResponse;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.SaveResponse;
+import com.oqpo.api.web.dto.response.stinfo.store.StoreInfoResponse;
+import com.oqpo.api.web.dto.response.ver.VerInfoResponse;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/verinfo")
+public class VerInfoController {
+    @Autowired
+    private VerInfoService verInfoService;
+
+    /**
+     * 설명 : 앱버전 상세 그리드 리스트
+     *
+     * @param verInfoGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "앱버전 그리드 리스트")
+    @PostMapping("/detail-grid-list")
+    public ResponseEntity<GridResponse> appVerGridList(@RequestBody @Valid VerInfoGridRequest verInfoGridRequest) throws Exception {
+        return ResponseEntity.ok(verInfoService.appVerGridList( verInfoGridRequest.toDTO(verInfoGridRequest)));
+    }
+
+
+    /**
+     * 설명 : 앱버전정보 저장
+     *
+     * @param userId
+     * @param saveVerInfoRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "앱버전정보 저장")
+    @PostMapping("/save-verinfo")
+    public ResponseEntity<SaveResponse> saveVerInfo(@ApiIgnore String userId, @RequestBody @Valid SaveVerInfoRequest saveVerInfoRequest) throws Exception {
+        verInfoService.saveAppVer(userId, saveVerInfoRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+
+    /**
+     * 설명 : 앱버전  정보
+     *
+     * @param appNo
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "appNo", value = "앱버전번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "앱버전 정보")
+    @GetMapping("/info-verinfo")
+    public ResponseEntity<VerInfoResponse> infoVerInfo(@RequestParam(value = "appNo") String appNo) throws Exception {
+        return ResponseEntity.ok(verInfoService.selectVerAppInfo(appNo));
+    }
+
+
+    /**
+     * 설명 : 앱버전정보 삭제
+     *
+     * @param userId
+     * @param appNo
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "appNo", value = "앱버전번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "앱버전정보 삭제")
+    @PostMapping("/del-verinfo")
+    public ResponseEntity<SaveResponse> delVerInfo(@ApiIgnore String userId,@RequestParam(value = "appNo") String appNo ) throws Exception {
+        verInfoService.delAppVer(userId, appNo);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.DELETE_OK));
+    }
+
+    /**
+     * 설명 : 앱 최신버전정보
+     *
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation(value = "앱 최신버전정보")
+    @GetMapping("/info-lastver")
+    public ResponseEntity<VerInfoResponse> selectLastVer() throws Exception {
+        return ResponseEntity.ok(verInfoService.selectLastVerInfo());
+    }
+
+
+}

src/main/java/com/oqpo/api/web/dto/request/VerInfo/SaveVerInfoRequest.java

@@ -0,0 +1,23 @@
+package com.oqpo.api.web.dto.request.VerInfo;
+
+import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class SaveVerInfoRequest {
+    @NotBlank
+    @ApiModelProperty(value = "C")
+    private String viewCd;
+
+    @ApiModelProperty(value = "APP버전")
+    private String appVer;
+
+    @ApiModelProperty(value = "버전설명")
+    private String desVer;
+}

src/main/java/com/oqpo/api/web/dto/request/VerInfo/VerInfoGridRequest.java

@@ -0,0 +1,16 @@
+package com.oqpo.api.web.dto.request.VerInfo;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class VerInfoGridRequest extends GridRequest {
+
+    protected VerInfoGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/request/oper/ntice/SaveNticeRequest.java

@@ -38,7 +38,6 @@ public class SaveNticeRequest {
     @ApiModelProperty(value = "공지내용")
     private String nticeDesc;
 
-    @NotBlank
     @ApiModelProperty(value = "삭제여부")
     private String delYn;
 

src/main/java/com/oqpo/api/web/dto/response/ver/VerInfoResponse.java

@@ -0,0 +1,44 @@
+package com.oqpo.api.web.dto.response.ver;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.AfflEntity;
+import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
+import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.entity.system.VerInfoEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class VerInfoResponse {
+
+    @ApiModelProperty(value = "앱버전번호")
+    private String appNo;
+
+    @ApiModelProperty(value = "APP버전")
+    private String appVer;
+
+    @ApiModelProperty(value = "버전설명")
+    private String desVer;
+
+    @ApiModelProperty(value = "버전생성일")
+    private String appVerDt;
+
+    public static VerInfoResponse toDTO(VerInfoEntity entity) {
+        if (entity == null) return null;
+        return VerInfoResponse.builder()
+                .appNo(entity.getAppNo())
+                .appVer(entity.getAppVer())
+                .desVer(entity.getDesVer())
+                .appVerDt(entity.getAppVerDt())
+                .build();
+    }
+
+
+}

src/main/java/com/oqpo/api/web/dto/response/ver/VerInfoSearchResponse.java

@@ -0,0 +1,28 @@
+package com.oqpo.api.web.dto.response.ver;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class VerInfoSearchResponse {
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "앱버전번호")
+    private String appNo;
+
+    @ApiModelProperty(value = "APP버전")
+    private String appVer;
+
+    @ApiModelProperty(value = "버전설명")
+    private String desVer;
+
+    @ApiModelProperty(value = "버전생성일")
+    private String appVerDt;
+
+}

src/main/resources/mybatis/sqlmaps/system/VerInfo.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.system.VerInfoMapper">
+
+    <select id="selectVerAppGridList" resultType="com.oqpo.api.entity.system.VerInfoEntity">
+        SELECT /* selectVerAppGridList */
+                app_no, devi_tp_cd, fn_code_nm('DEVI_TP_CD', devi_tp_cd) as devi_tp_nm, app_ver, des_ver, date_format(app_ver_dt,'%Y.%m.%d %H:%i:%s') AS app_ver_dt
+                , del_yn, date_format(add_dt,'%Y.%m.%d %H:%i:%s') AS  add_dt, add_id
+        FROM np_ver_info
+        WHERE del_yn = 'N'
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'job_no'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by app_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by app_no desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by app_no desc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectVerAppGridCnt" resultType="int">
+        select count(*)
+        FROM np_ver_info
+        WHERE del_yn = 'N'
+    </select>
+
+
+    <insert id="insertVerInfo" >
+        insert into np_ver_info
+        (app_no, devi_tp_cd, app_ver, des_ver, app_ver_dt, del_yn, add_dt, add_id, chg_dt, chg_id)
+        values
+        (fn_get_key_no(35), 'SA', #{entity.appVer}, #{entity.desVer}, now(), 'N', now(), #{userId}, now(), #{userId})
+    </insert>
+
+    <update id="updateDelVerInfo" >
+        UPDATE np_ver_info SET
+                del_yn = 'Y',
+                chg_dt = now(),
+                chg_id = #{userId}
+         WHERE app_no = #{appNo}
+    </update>
+
+    <select id="selectLastVerInfo" resultType="String">
+        SELECT /* selectLastVerInfo */
+                nvl(max(app_no),'0.0.0') as app_no
+        FROM np_ver_info
+        WHERE del_yn = 'N'
+    </select>
+
+    <select id="selectVerAppInfo" resultType="com.oqpo.api.entity.system.VerInfoEntity">
+        SELECT /* selectVerAppInfo */
+                app_no, app_ver, des_ver
+        FROM np_ver_info
+        WHERE app_no = #{appNo}
+    </select>
+</mapper>