xit-app
/
external-system-test
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor : 단속 테이블 수정

Browse Source
main
이범준 1 year ago
parent f83b1d4a95
commit 5af5b78517
13 changed files with 33 additions and 118 deletions
Show Stats Download Patch File Download Diff File

23
src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java
Unescape Escape View File

@ -191,17 +191,7 @@ public class NtriDTO {
*/
@NotEmpty
@Size(min = 3, max = 3, message = "사진갯수")
private String imageNmrs;
/**
* 사진구분: 1
* FimsConst.SendNtriPhotoInterfaceId.PARK_FILE_NAME
* FimsConst.SendNtriPhotoInterfaceId.BUS_ONLY_FILE_NAME
*/
@NotEmpty
@Size(min = 1, max = 1, message = "사진구분")
private String imageSeCode;
private String atchFileCnt;
/**
* 확장자: 4
@ -273,12 +263,8 @@ public class NtriDTO {
this.vhrnoY = StringUtils.rightPad(nvl(vhrnoY), 10, " ");
}
public void setImageNmrs(String imageNmrs) {
this.imageNmrs = StringUtils.rightPad(nvl(imageNmrs), 3, " ");
}
public void setImageSeCode(String imageSeCode) {
this.imageSeCode = StringUtils.rightPad(nvl(imageSeCode), 1, " ");
public void setAtchFileCnt(String atchFileCnt) {
this.atchFileCnt = StringUtils.rightPad(nvl(atchFileCnt), 3, " ");
}
public void setFileExtsn(String fileExtsn) {
@ -336,13 +322,12 @@ public class NtriDTO {
if(SendNtriPhotoInterfaceId.PARK_INTO_FILE.getCode().equals(ifId)
|| SendNtriPhotoInterfaceId.BUS_ONLY_INTO_FILE.getCode().equals(ifId)
){
sb.append(imageNmrs).append('|');
sb.append(atchFileCnt).append('|');
}
if(SendNtriPhotoInterfaceId.PARK_FILE_NAME.getCode().equals(ifId)
|| SendNtriPhotoInterfaceId.BUS_ONLY_FILE_NAME.getCode().equals(ifId)
){
sb.append(imageSeCode).append('|');
sb.append(fileExtsn).append('|');
}
return sb.toString();

10
src/main/java/kr/xit/fims/biz/rt/RtDTO.java
Unescape Escape View File

@ -98,15 +98,7 @@ public class RtDTO {
/**
* 이미지 매수
*/
private long imageNmrs;
/**
* 이미지 구분 코드
*/
private String imageSeCode;
/**
* 동영상 파일명
*/
private String mvpFilenm;
private long atchFileCnt;
/**
* 차량 번호
*/

2
src/main/java/kr/xit/fims/framework/biz/util/ExtnlInterfaceUtils.java
Unescape Escape View File

@ -260,7 +260,7 @@ public class ExtnlInterfaceUtils {
if(isFileCreate) {
// TODO : 연계정보 생성 구체화
layoutDTO.setImageNmrs(String.valueOf(fileList.size()));
layoutDTO.setAtchFileCnt(String.valueOf(fileList.size()));
String layoutString = layoutDTO.toString(interfaceId);
byte[] bytes = layoutString.getBytes();

9
src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml
Unescape Escape View File

@ -25,8 +25,7 @@
, trr.gps_y
, trr.towng_yn -- 견인여부 코드
, trr.crdn_sn -- 스티커 번호
, trr.image_se_code -- 이미지구분코드
, trr.image_nmrs -- 이미지매수
, trr.atch_file_cnt -- 이미지매수
, trr.redution_amount -- 감경금액
, trr.redution_aft_amount -- 감경후 금액
, trr.rciv_amount -- 수납금액
@ -195,8 +194,7 @@
, sys_se_cd = IF(sys_se_cd = #{sysSeCd}, sys_se_cd, #{sysSeCd})
, crdn_ymd = IF(crdn_ymd = REPLACE(#{crdnYmd}, '-', ''), crdn_ymd, REPLACE(#{crdnYmd}, '-', ''))
, crdn_bgng_tm = IF(crdn_bgng_tm = REPLACE(#{crdnBgngTm}, ':', ''), crdn_bgng_tm, REPLACE(#{crdnBgngTm}, ':', ''))
, image_se_code = IF(image_se_code = #{imageSeCode}, image_se_code, #{imageSeCode})
, image_nmrs = IF(image_nmrs = #{imageNmrs}, image_nmrs, #{imageNmrs})
, atch_file_cnt = IF(atch_file_cnt = #{atchFileCnt}, atch_file_cnt, #{atchFileCnt})
, crdn_plc = IF(crdn_plc = #{crdnPlc}, crdn_plc, #{crdnPlc})
, violt_stdg_cd = IF(violt_stdg_cd = #{violtStdgCd}, violt_stdg_cd, #{violtStdgCd})
, vhrno = IF(vhrno = #{vhrno}, vhrno, #{vhrno})
@ -477,8 +475,7 @@
, trr.gps_y
, '' AS vhclNoX -- 자동차등록번호판위치 X축
, '' AS vhrnoY -- 자동차등록번호판위치 Y축
, trr.image_nmrs -- 사진갯수
, trr.image_se_code -- 이미지구분
, trr.atch_file_cnt -- 사진갯수
, 'jpg' AS fileExtsn -- 확장자
FROM tb_rt_reglt trr
JOIN tb_ec_extrl_reglt_cntc teerc

12
src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml
Unescape Escape View File

@ -224,9 +224,7 @@
, gps_x
, gps_y
, towng_yn
, image_se_code
, mvp_filenm
, image_nmrs
, atch_file_cnt
, vhrno
, crdn_stts_cd
, crdn_reg_se_cd
@ -257,14 +255,6 @@
, ecsd.gps_x
, ecsd.gps_y
, 'N' -- 견인 여부 코드
, (SELECT IF(count(*) = 0, '1', '2')
FROM tb_cmm_file_mastr tcfm
JOIN tb_cmm_file_detail tcfd
ON tcfm.job_se_code = #{jobSeCode}
AND tcfm.file_job_id = CONCAT(#{interfaceSeqN}, #{ctznSttemntDetailSn})
AND tcfm.file_mastr_id = tcfd.file_mastr_id
AND INSTR('jpg,png', SUBSTRING_INDEX(tcfd.orginl_file_nm, '.', -1)) = 0)
, '' -- 동영상 파일명
, (SELECT COUNT(tcfd.file_id) - 1
FROM tb_cmm_file_mastr tcfm
JOIN tb_cmm_file_detail tcfd

4
src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml
Unescape Escape View File

@ -156,9 +156,7 @@
, gps_x
, gps_y
, towng_yn
, image_se_code
, mvp_filenm
, image_nmrs
, atch_file_cnt
, vhrno
, crdn_stts_cd
, crdn_reg_se_cd

2
src/main/resources/sql/mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml
Unescape Escape View File

@ -26,7 +26,7 @@
, trr.gps_y
, trr.towng_yn -- 견인여부 코드
, trr.crdn_sn -- 스티커 번호
, trr.image_nmrs -- 이미지매수
, trr.atch_file_cnt -- 이미지매수
, trr.redution_amount -- 감경금액
, trr.redution_aft_amount -- 감경후 금액
, trr.rciv_amount -- 수납금액

4
src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp
Unescape Escape View File

@ -33,9 +33,7 @@ Date Author Description
.bg_red_color {
background-color: darkred;
}
select[name=imageSeCode] {
width: 68%;
}
select[name=ffnlcCarmdlCd] {
width: 30%;
}

24
src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
Unescape Escape View File

@ -61,6 +61,12 @@ Date Author Description
<col style="width: 39%;"/>
</colgroup>
<tbody>
<tr>
<th>시스템구분</th>
<td>
<code:select id="sysSeCd" name="sysSeCd" grpId="FIM001" title="시스템구분" cls="form-select" alt="시스템구분" disabled="true"/>
</td>
</tr>
<tr>
<th>등록구분</th>
<td>
@ -85,15 +91,10 @@ Date Author Description
</td>
</tr>
<tr>
<th>시스템구분</th>
<td>
<code:select id="sysSeCd" name="sysSeCd" grpId="FIM001" title="시스템구분" cls="form-select" alt="시스템구분" disabled="true"/>
</td>
<th>영상매체</th>
<th>사진건수</th>
<td>
<div class="d-flex gap-1">
<code:select id="imageSeCode" name="imageSeCode" grpId="FIM027" title="영상매체" cls="form-select" alt="영상매체"/>
<input type="text" name="imageNmrs" data-fmt-type="number" class="w-px-50" />
<input type="text" name="atchFileCnt" data-fmt-type="number" class="w-px-50" />
</div>
</td>
</tr>
@ -526,8 +527,7 @@ Date Author Description
,crdnYmd: $('input[name=crdnYmd]').val().replaceAll('-','')
,crdnBgngTm: $('input[name=crdnBgngTm]').val()
,sysSeCd: $('select[name=sysSeCd]').val()
,imageSeCode: $('select[name=imageSeCode]').val()
,imageNmrs: $('input[name=imageNmrs]').val()
,atchFileCnt: $('input[name=atchFileCnt]').val()
,crdnPlc: $('input[name=crdnPlc]').val()
//시군군 추가
@ -614,14 +614,14 @@ Date Author Description
/*if (!fnBiz.validate()) return;*/
cmmBizAjax('modify', {
url: '<c:url value="/cmm/fimsPopup/update.do"/>'
url: fimsApiUrl.MODIFY_RT_REGLT
,data: $("#frmSearch").serialize()
});
}
,remove: () => {
$("input[name=useYn]").val('N');
cmmBizAjax('remove', {
url: '<c:url value="/cmm/fimsPopup/remove.do"/>'
url: fimsApiUrl.REMOVE_RT_REGLT
,data: $("#frmSearch").serialize()
});
}
@ -786,6 +786,8 @@ Date Author Description
$("#crdnRegSeCd").attr("disabled","disabled");
$("#crdnSeCd").removeAttr("disabled");
$("#sysSeCd").removeAttr("disabled");
}
});

4
src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmImposePopup.jsp
Unescape Escape View File

@ -33,9 +33,7 @@ Date Author Description
.bg_red_color {
background-color: darkred;
}
select[name=imageSeCode] {
width: 68%;
}
select[name=ffnlcCarmdlCd] {
width: 30%;
}

19
src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp
Unescape Escape View File

@ -646,23 +646,8 @@ Date Author Description
}
},
{
header: '첨부',
name: 'imageSeCode',
minWidth: 40,
sortable: false,
align: 'center',
formatter: 'listItemText',
disabled: true,
editor: {
type: "select",
options: {
listItems: ComboCodeData.imageSeCode
}
}
},
{
header: '사진',
name: 'imageNmrs',
header: '사진건수',
name: 'atchFileCnt',
minWidth: 40,
sortable: false,
align: 'center'

19
src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp
Unescape Escape View File

@ -721,23 +721,8 @@ Date Author Description
}
},
{
header: '첨부',
name: 'imageSeCode',
minWidth: 40,
sortable: false,
align: 'center',
formatter: 'listItemText',
disabled: true,
editor: {
type: "select",
options: {
listItems: ComboCodeData.imageSeCode
}
},
},
{
header: '사진',
name: 'imageNmrs',
header: '사진건수',
name: 'atchFileCnt',
minWidth: 40,
sortable: false,
align: 'center',

19
src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
Unescape Escape View File

@ -633,23 +633,8 @@ Date Author Description
}
},
{
header: '첨부',
name: 'imageSeCode',
minWidth: 40,
sortable: false,
align: 'center',
formatter: 'listItemText',
disabled: true,
editor: {
type: "select",
options: {
listItems: ComboCodeData.imageSeCode
}
}
},
{
header: '사진',
name: 'imageNmrs',
header: '사진건수',
name: 'atchFileCnt',
minWidth: 40,
sortable: false,
align: 'center'

Write Preview
Loading…
Cancel
Save