From f38b96fc92db83bdedef08ba868d49f59ff0bad7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 5 May 2022 13:45:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=20sort=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E9=81=BF=E5=85=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoMapper.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 3c390666..c57b8f47 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -635,7 +635,7 @@ left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -964,7 +964,7 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -1130,7 +1130,7 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -1160,7 +1160,7 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status AND dicstandTextStatus.dic_id IS NOT NULL @@ -1531,7 +1531,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') where SAR_STANDARDS_INFO.valid_flag = 0 @@ -1668,7 +1668,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -1725,7 +1725,7 @@ SAR_STAND_ATTR_INFO.XCXSSRQ as allPutTime from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) + dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME!=#{stateName} and SAR_STAND_ATTR_INFO.XCXSSRQ != '' @@ -1736,7 +1736,7 @@ ,dicstandState.DIC_TYPE_NAME as standStateShow,SAR_STAND_ATTR_INFO.DTBJH as replace_stand_num from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) + dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME != '' and SAR_STAND_ATTR_INFO.DTBJH != '' @@ -1749,7 +1749,7 @@ concat(SAR_STAND_ATTR_INFO.XCXSSRQ,',',SAR_STAND_ATTR_INFO.ZCCSSRQ) as allPutTime from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) + dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where SAR_STANDARDS_INFO.valid_flag=0 and SAR_STAND_ATTR_INFO.DTBJH != '' @@ -1794,7 +1794,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id From e222598ce3342aa3674ad531985e6c4a3b07f0b5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 5 May 2022 15:30:43 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/activiti/ActSarItemsEO.xml | 8 ++++---- .../mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml | 4 ++-- .../sarBussionessStand/SarBussionessStandMapper.xml | 10 +++++----- .../SarLawsAttrDetailedListMapper.xml | 5 +++-- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- .../mapper/standardSplit/SarStandardsInfoEOMapper.xml | 8 ++++---- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml b/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml index 14af3b87..b59257d8 100644 --- a/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml +++ b/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml @@ -79,7 +79,7 @@ 'BUSINESS_STAND' AS resFlag FROM SAR_BUSSIONESS_STAND - left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandSort.valid_flag=0 and dicstandSort.dic_id is not null) + left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandSort.valid_flag=0 and dicstandSort.dic_id is not null AND dicstandSort.dic_id = 'NGETEMDJDI') WHERE SAR_BUSSIONESS_STAND.VALID_FLAG=0 ) @@ -167,7 +167,7 @@ FROM SAR_BUSSIONESS_STAND left join TS_ORG on SAR_BUSSIONESS_STAND.RESPONSIBLE_UNIT = TS_ORG.ID left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and - dicstandSort.valid_flag = 0) + dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) WHERE SAR_BUSSIONESS_STAND.VALID_FLAG=0 @@ -232,7 +232,7 @@ FROM SAR_BUSSIONESS_STAND left join TS_ORG on SAR_BUSSIONESS_STAND.RESPONSIBLE_UNIT = TS_ORG.ID left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and - dicstandSort.valid_flag = 0) + dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI' ) WHERE SAR_BUSSIONESS_STAND.VALID_FLAG=0 ) @@ -379,7 +379,7 @@ LEFT JOIN SAR_BUSS_STAND_VAL valapp ON ( SAR_BUSSIONESS_STAND.id = valapp.stand_id AND valapp.PROPERTY_TYPE = 'APPLY_ARCTIC' ) LEFT JOIN SAR_BUSS_STAND_VAL valeng ON ( SAR_BUSSIONESS_STAND.id = valeng.stand_id AND valeng.PROPERTY_TYPE = 'ENERGY_KIND' ) left join TS_ORG on SAR_BUSSIONESS_STAND.RESPONSIBLE_UNIT = TS_ORG.ID - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') WHERE SAR_SAR_ACCESS_INFO.VALID_FLAG=0 and SAR_BUSSIONESS_STAND.VALID_FLAG=0 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml index 5074bece..f4ffcda1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml @@ -142,7 +142,7 @@ SAR_BUSSIONESS_STAND LEFT JOIN SAR_BUSS_STAND_VAL ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_VAL.stand_id LEFT JOIN TS_DICTYPE dicstandState ON ( dicstandState.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandState.dic_id IS NOT NULL AND dicstandState.valid_flag = 0 ) - left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null) left join TS_ORG on SAR_BUSSIONESS_STAND.responsible_unit = TS_ORG.id + left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null and dicstandsort.dic_id = 'NGETEMDJDI' ) left join TS_ORG on SAR_BUSSIONESS_STAND.responsible_unit = TS_ORG.id WHERE SAR_BUSSIONESS_STAND.valid_flag = 0 ) @@ -354,7 +354,7 @@ SAR_BUSSIONESS_STAND LEFT JOIN SAR_BUSS_STAND_VAL ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_VAL.stand_id LEFT JOIN TS_DICTYPE dicstandState ON ( dicstandState.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandState.dic_id IS NOT NULL AND dicstandState.valid_flag = 0 ) - left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null) + left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null and dicstandsort.dic_id = 'NGETEMDJDI') left join TS_ORG on SAR_BUSSIONESS_STAND.responsible_unit = TS_ORG.id left join SAR_BUSS_STAND_MENU on SAR_BUSS_STAND_MENU.BUSS_STAND_ID = SAR_BUSSIONESS_STAND.id WHERE diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index d5098d86..4470935c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -713,7 +713,7 @@ left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL AND dicstandSort.dic_id = 'NGETEMDJDI' and dicstandSort.valid_flag = 0) left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id @@ -796,7 +796,7 @@ left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id @@ -920,7 +920,7 @@ from SAR_BUSSIONESS_STAND left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join TS_DICTYPE dictextstatus ON ( dictextstatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandSort.dic_id IS NOT NULL and dictextstatus.valid_flag = 0) left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id @@ -966,7 +966,7 @@ SAR_BUSSIONESS_STAND.id, 'BUSINESS_STAND' as typeShow from SAR_BUSSIONESS_STAND - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') where SAR_BUSSIONESS_STAND.valid_flag = '0' and ( 1=1 and STAND_SORT = #{standSort} @@ -1010,7 +1010,7 @@ SAR_BUSSIONESS_STAND.id, 'BUSINESS_STAND' as typeShow from SAR_BUSSIONESS_STAND - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id = 'NGETEMDJDI' AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) where SAR_BUSSIONESS_STAND.valid_flag = '0' and ( or stand_name like concat(concat('%',#{standName}),'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index d489ec67..e64b06c1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -9,7 +9,7 @@ FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null AND dicstandSort.dic_id = 'JKSADFH564S') (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') @@ -75,6 +75,7 @@ AND dicstandSort.dic_id IS NOT NULL AND dicstandSort.valid_flag = 0 AND dicstandSort.PARENT_ID IS NULL + AND dicstandSort.dic_id = 'NGETEMDJDI' ) a.ID IN @@ -132,7 +133,7 @@ a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null AND dicstandSort.dic_id = 'JKSADFH564S') a.ID IN diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index c57b8f47..638144cb 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -459,7 +459,7 @@ left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml index cc1ca549..add74de3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml @@ -360,7 +360,7 @@ left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is not null and dicountry.valid_flag = 0) left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.dic_id ='JKSADFH564S' and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and @@ -604,7 +604,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') where SAR_STANDARDS_INFO.valid_flag = 0 @@ -700,7 +700,7 @@ left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is not null and dicountry.valid_flag = 0) left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and @@ -818,7 +818,7 @@ left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is not null and dicountry.valid_flag = 0) left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and From 4347f9d2090ccb91d32ee37f92c8f76558d44103 Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 6 May 2022 14:55:28 +0800 Subject: [PATCH 3/8] =?UTF-8?q?update:awc=E5=AF=B9=E6=8E=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=AE=BF=E9=97=AE=E9=93=BE=E6=8E=A5=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/regulations/service/impl/StandDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java index a07b2742..9a892684 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java @@ -42,7 +42,7 @@ public class StandDataServiceImpl extends ServiceImpl i standDataQuery.stream().peek(standData -> { FileResult fileResult = new FileResult(); fileResult.setDocumentName(verifyObj(standData.getStandSort(),standData.getStandNumber(),standData.getStandName())); - fileResult.setDocumentUrl(webUrl+"?userName="+encode(searchStandContext.getUserName())+"&dataId="+standData.getStandId()+"&datatype="+standData.getStandType()); + fileResult.setDocumentUrl(webUrl+"?dataId="+standData.getStandId()+"&datatype="+standData.getStandType()); fileResultList.add(fileResult); }).collect(Collectors.toList()); } From 5cb0f2990dfaf3fc7d116771a54498580d9c8231 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 May 2022 21:16:52 +0800 Subject: [PATCH 4/8] feat: There is no way the,not null --- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index c6aa555f..99d10e56 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -139,7 +139,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { } if("stand".equals(attrInfoMap.get("type"))){ // 标准全文 - fullTextSearchEO.put("title",attrInfoMap.get("numbershow")+" "+attrInfoMap.get("nameshow")); + fullTextSearchEO.put("title",attrInfoMap.get("numbershow")+" "+attrInfoMap.getOrDefault("nameshow","")); for (String key : attrInfoMap.keySet()) { if (null == attrInfoMap.get(key) || "".equals(attrInfoMap.get(key))){ @@ -253,7 +253,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } - fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.get("lawsNumber")+" "+attrInfoMap.get("lawsName")); + fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.getOrDefault("lawsNumber","")+" "+attrInfoMap.getOrDefault("lawsName","")); StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append(" "); contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append(" "); @@ -321,7 +321,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } - fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+" "+attrInfoMap.get("stand_name")); + fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+" "+attrInfoMap.getOrDefault("stand_name","")); StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); From e01952afc24d8254955f323b67d4d680a37ba453 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 7 May 2022 16:29:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4=E6=9B=B4=E6=96=B0=20?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/mq/CreateStandardMQService.java | 34 +++ .../com/adc/da/mq/SendQdUpdateMQService.java | 72 ++++++ .../com/adc/da/scheduled/ScheduledJob.java | 224 +++++++++++++----- .../slrs/sarQaInfo/entity/SarQaInfoPage.java | 79 ++++++ .../SarStandardsInfoController.java | 2 +- .../dao/SarStandardsInfoDao.java | 3 + .../entity/DSarStandardDTO.java | 29 +++ .../SarStandardsInfoMapper.xml | 16 ++ doc/sql/数据库改动.sql | 2 + 9 files changed, 407 insertions(+), 54 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandardMQService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarQaInfo/entity/SarQaInfoPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/DSarStandardDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandardMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandardMQService.java new file mode 100644 index 00000000..305a4bd1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandardMQService.java @@ -0,0 +1,34 @@ +package com.adc.da.mq; + +import com.adc.da.slrs.sarStandardsInfo.entity.DSarStandardDTO; +import org.springframework.amqp.core.AmqpTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +@Component +public class CreateStandardMQService { + @Autowired + private AmqpTemplate rabbitTemplate; + + /** + * @Author yuezhihang + * @Description 创建消息队列 + * Date 2018/8/24 13:59 + * @Param [convert, convertType] + * @return int + **/ + public void sendMQ(List changeJJSS, List changeXXYX ){ + Map map=new HashMap<>(); + map.put("changeJJSS",changeJJSS); + map.put("changeXXYX",changeXXYX); +// map.put("map",hashMap); + //发送消息队列 + this.rabbitTemplate.convertAndSend("standard-exchange_updateText_RELEASE", "standard-key_updateText_RELEASE", map); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendQdUpdateMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendQdUpdateMQService.java index cc11fb36..9a111c17 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendQdUpdateMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendQdUpdateMQService.java @@ -4,6 +4,7 @@ import com.adc.da.slrs.sarLawsAttrInfo.service.ISarLawsAttrInfoService; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; import com.adc.da.slrs.sarLawsStandInfo.service.ISarLawsStandInfoService; import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService; +import com.adc.da.slrs.sarStandardsInfo.entity.DSarStandardDTO; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.sys.service.IDicTypeEOService; @@ -201,6 +202,77 @@ public class SendQdUpdateMQService { }); + } + + @RabbitListener(bindings = @QueueBinding( + value = @Queue(value = "createMQ_Standard_updateText_RELEASE", durable = "true"), + exchange = @Exchange(value = "standard-exchange_updateText_RELEASE", ignoreDeclarationExceptions = "true"), + key = "standard-key_updateText_RELEASE")) + public void createStandardMQ(Map bussMap, Message message, Channel channel) throws Exception { + + //数据字典数据组装 + //数据字典数据组装 + Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); + Map map = new HashMap<>(); + List> arr = (List>) dicTypeEO.get("WBZTCLASS"); + arr.forEach(stringStringMap -> { + map.put(stringStringMap.get("label"), stringStringMap.get("value")); + }); + + + List changeJJSS= (List) bussMap.get("changeJJSS"); + List changeXXYX= (List) bussMap.get("changeXXYX"); + + + + //写修改逻辑 + Thread.sleep(5000); + for (DSarStandardDTO jjss : changeJJSS) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("ID", jjss.getId()); + List infos = sarStandardsInfoService.list(wrapper); + if (null != infos && infos.size() > 0) { + SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); + sarStandardsInfo.setId(jjss.getId()); + sarStandardsInfo.setModifyTime(new Date()); + sarStandardsInfo.setTextStatus(map.get("即将实施")); + Map bussAttrInfoMap = iSarStandAttrInfoService.getBussAttrInfo(jjss.getId()); + if (bussAttrInfoMap != null) { + sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(bussAttrInfoMap)); + } + try { + + sarStandardsInfoService.updateSarStandardsInfo(sarStandardsInfo); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + for (DSarStandardDTO jjss : changeXXYX) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("ID", jjss.getId()); + List infos = sarStandardsInfoService.list(wrapper); + if (null != infos && infos.size() > 0) { + SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); + sarStandardsInfo.setId(jjss.getId()); + sarStandardsInfo.setModifyTime(new Date()); + sarStandardsInfo.setTextStatus(map.get("现行有效")); + Map bussAttrInfoMap = iSarStandAttrInfoService.getBussAttrInfo(jjss.getId()); + if (bussAttrInfoMap != null) { + sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(bussAttrInfoMap)); + } + try { + sarStandardsInfoService.updateSarStandardsInfo(sarStandardsInfo); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + + + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index efb72999..51daf309 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -1,11 +1,13 @@ package com.adc.da.scheduled; +import com.adc.da.mq.CreateStandardMQService; import com.adc.da.scheduled.dao.SarStandardInfoDao; import com.adc.da.scheduled.dao.SarStandardItemDao; import com.adc.da.scheduled.dao.SarStandardWarningDao; import com.adc.da.scheduled.entity.TermDTO; import com.adc.da.slrs.ActivityDatas.entity.DataList; +import com.adc.da.slrs.processModel.utils.TrainFormDate; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; @@ -13,8 +15,10 @@ import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.DSarStandardDTO; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -35,6 +39,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; import java.lang.reflect.InvocationTargetException; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; import java.util.regex.Matcher; @@ -73,7 +79,13 @@ public class ScheduledJob { @Autowired private IWarningDateService iWarningDateService;// 预警日期 -// @PostConstruct //程序启动时执行一次 + @Autowired + CreateStandardMQService createStandardMQService; + + @Autowired + private IDicTypeEOService dicTypeEOService; + + // @PostConstruct //程序启动时执行一次 // @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") // @Scheduled(fixedDelay = 120000) @@ -121,7 +133,7 @@ public class ScheduledJob { logger.info("========================================================================================================"); //删除不在预警范围的标准 int remove = sarStandardWarningDao.autoCancelWarning(); - logger.info("取消"+remove+"条预警"); + logger.info("取消" + remove + "条预警"); //预警期限(当前日期至3个月后) TermDTO term = new TermDTO(); @@ -129,7 +141,7 @@ public class ScheduledJob { List warningDateList = sarStandardWarningDao.getWarningDate(term); ArrayList data = new ArrayList<>(); - warningDateList.forEach(item->{ + warningDateList.forEach(item -> { for (String s : item.getSSRQ().split(",")) { @@ -157,16 +169,16 @@ public class ScheduledJob { //联接标准的日期子表 和分解单表 查询符合预警期限的标准和分解项 List warningList = sarStandardWarningDao.getWarningId(term); - warningList.forEach(item->{ + warningList.forEach(item -> { item.setId(UUIDUtils.randomUUID20()); }); //持久化至预警表 忽略标准id和标志位都一样的数据 - if (warningList.size()!=0){ + if (warningList.size() != 0) { //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 int count = sarStandardWarningDao.ignoreInsert(warningList); logger.info("==================================预警结束======================================"); logger.info("==================================预警结束======================================"); - logger.info("已预警"+ count+"条标准或条款!!"); + logger.info("已预警" + count + "条标准或条款!!"); logger.info("==================================预警结束======================================"); logger.info("==================================预警结束======================================"); @@ -174,10 +186,6 @@ public class ScheduledJob { } - - - - @Autowired private ISarUpdLogService sarUpdLogEOService; @@ -205,11 +213,11 @@ public class ScheduledJob { *实施日期是当前系统时间的标准文本状态变为'现行有效' */ QueryWrapper columnsAndCondition = new QueryWrapper<>(); - columnsAndCondition.select("STAND_ID").like("SSRQ",LocalDate.now()); - List> effectiveList=sarStandAttrInfoDao.selectMaps(columnsAndCondition); + columnsAndCondition.select("STAND_ID").like("SSRQ", LocalDate.now()); + List> effectiveList = sarStandAttrInfoDao.selectMaps(columnsAndCondition); // List effectiveList = sarStandardInfoDao.selectWithinTerm(data, "SSRQ"); - effectiveList.forEach(item->{ + effectiveList.forEach(item -> { try { SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); sarStandardsInfo.setId(item.get("STAND_ID").toString()); @@ -218,8 +226,8 @@ public class ScheduledJob { sarStandardsInfoDao.updateById(sarStandardsInfo); // sarStandardInfoDao.updateStandardInfo(item.getStandId(),"vsaga7nwub"); - }catch (Exception e){ - System.out.println("标准id为=="+item.get("STAND_ID").toString()+"==文本状态更新失败"); + } catch (Exception e) { + System.out.println("标准id为==" + item.get("STAND_ID").toString() + "==文本状态更新失败"); } }); @@ -230,8 +238,8 @@ public class ScheduledJob { QueryWrapper columnForDTBJH = new QueryWrapper<>(); columnForDTBJH.select("DTBJH") - .eq("VALID_FLAG","0") - .ne("DTBJH",""); + .eq("VALID_FLAG", "0") + .ne("DTBJH", ""); //查询代替标准字段得到一个 被代替了的标准的id的键值对列表 List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); HashMap replaceIdCountMap = new HashMap<>(); @@ -242,15 +250,15 @@ public class ScheduledJob { * 国内外表准号格式不统一 */ // Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); - replaceStandIdMaps.forEach(item->{ - if (item!=null){ - //此标准代替的标准的标准号的数组 - String DTBJHStr = item.get("DTBJH").toString(); + replaceStandIdMaps.forEach(item -> { + if (item != null) { + //此标准代替的标准的标准号的数组 + String DTBJHStr = item.get("DTBJH").toString(); - //数据格式: (GB 123-2000,GB 4233434-2021,GB 423423423-2021) - if (!DTBJHStr.equals("")) { - String[] DTBJHArray = DTBJHStr.split(","); - for (String DTBJH : DTBJHArray) { + //数据格式: (GB 123-2000,GB 4233434-2021,GB 423423423-2021) + if (!DTBJHStr.equals("")) { + String[] DTBJHArray = DTBJHStr.split(","); + for (String DTBJH : DTBJHArray) { // if (!pattern.matcher(DTBJH).matches()){ // continue; @@ -268,45 +276,43 @@ public class ScheduledJob { // .eq("STAND_YEAR", year); - List standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH); - if (standId.size() > 0) { - boolean b = replaceIdCountMap.containsKey(standId.get(0)); - //如果代替标准id已存在则映射为2不存在则添加并映射为1 - if (b) { - replaceIdCountMap.replace(standId.get(0), 2); - } else { - replaceIdCountMap.put(standId.get(0), 1); - } + List standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH); + if (standId.size() > 0) { + boolean b = replaceIdCountMap.containsKey(standId.get(0)); + //如果代替标准id已存在则映射为2不存在则添加并映射为1 + if (b) { + replaceIdCountMap.replace(standId.get(0), 2); + } else { + replaceIdCountMap.put(standId.get(0), 1); } - - } } + + } + } - }); - - + }); //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态 for (String key : replaceIdCountMap.keySet()) { SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); - String reasonMsg=""; - switch (replaceIdCountMap.get(key)){ - case 1 : + String reasonMsg = ""; + switch (replaceIdCountMap.get(key)) { + case 1: //废止状态 sarStandardsInfo.setTextStatus("chblaarg77"); sarStandardsInfo.setId(key); - reasonMsg="该标准被一个标准代替"; + reasonMsg = "该标准被一个标准代替"; break; - case 2 : + case 2: //被代替状态 sarStandardsInfo.setTextStatus("qke0ckro2p"); sarStandardsInfo.setId(key); - reasonMsg="该标准被一个以上标准代替"; + reasonMsg = "该标准被一个以上标准代替"; break; default: break; @@ -321,11 +327,11 @@ public class ScheduledJob { sarStandardsInfo.setStandNumber(beforeSarStandardsInfoEO.getStandNumber()); sarStandardsInfo.setStandYear(beforeSarStandardsInfoEO.getStandYear()); sarStandardsInfo.setStandName(beforeSarStandardsInfoEO.getStandName()); - saveUpdateLog(sarStandardsInfo,beforeSarStandardsInfoEO,reasonMsg); + saveUpdateLog(sarStandardsInfo, beforeSarStandardsInfoEO, reasonMsg); //更新日志 sarStandardsInfoDao.updateById(sarStandardsInfo); - }catch (Exception e){ - System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败"); + } catch (Exception e) { + System.out.println("代替标准状态更新:id为" + key + "文本状态更新失败"); } } logger.info("==================================更新文本状态结束======================================"); @@ -334,22 +340,134 @@ public class ScheduledJob { } - - public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO, SarStandardsInfo beforeSarStandardsInfo,String reasonMsg) throws Exception { + public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO, SarStandardsInfo beforeSarStandardsInfo, String reasonMsg) throws Exception { Map newMap = new HashMap<>(); Map oldMap = new HashMap<>(); String attrStr = sarStandardsInfoEO.getSarStandAttrEOStr(); if (StringUtils.isNotBlank(attrStr)) { newMap = JSONObject.fromObject(attrStr); } - newMap.put("textStatus",sarStandardsInfoEO.getTextStatus()); - oldMap.put("textStatus",beforeSarStandardsInfo.getTextStatus()); + newMap.put("textStatus", sarStandardsInfoEO.getTextStatus()); + oldMap.put("textStatus", beforeSarStandardsInfo.getTextStatus()); // 增加关联事件 String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber(); if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) { number += "-" + sarStandardsInfoEO.getStandYear(); } - String content ="==定时任务执行修改==:" + number + " 《" + sarStandardsInfoEO.getStandName() + "》"+reasonMsg; + String content = "==定时任务执行修改==:" + number + " 《" + sarStandardsInfoEO.getStandName() + "》" + reasonMsg; sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content); } + + + // @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron = "*/30 * * * * ?") + @Async + public void TextStatusUpdateStandard() { + Logger logger = LoggerFactory.getLogger(ScheduledJob.class); + logger.info("=======================================开始更新文本状态======================================"); + //第一步 查询满足条件的数据 第一步只能查询 需要的标准id和日期 + //查询出两组数据 + Map map = new HashMap<>(); + List types = new ArrayList<>(); + types.add("WBZTCLASS"); + Map dicTypeEO = dicTypeEOService.getDicTypeListCodeByType(types); + List> arr = (List>) dicTypeEO.get("WBZTCLASS"); + arr.forEach(stringStringMap -> { + stringStringMap.keySet().forEach(s -> { + map.put(stringStringMap.get("label"), stringStringMap.get("value")); + }); + }); + //只针对国内标准 INLAND + +// 查询国标 实施日期 晚于现在 +// 标准状态属于发布 +// 标准状态改为即将实施 + List changeJJSS = new ArrayList<>(); + List strings = new ArrayList<>(); + strings.add(map.get("发布")); + List sarStandardsInfos = sarStandardsInfoDao.dealWithDS("INLAND", strings); + //判定时间 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + if (null != sarStandardsInfos && sarStandardsInfos.size() > 0) { + for (DSarStandardDTO s : sarStandardsInfos) { + if (null != s.getSSRQ()) { + if (s.getSSRQ().contains(",")) { + //多个日期拆分 一个满足就都满足 + if (findFirstTime(s.getSSRQ()).compareTo(new Date()) >= 0 && !changeJJSS.contains(s)) { + changeJJSS.add(s); + } + } else { + Date date = null; + try { + date = dateFormat.parse(TrainFormDate.dealWithTimeZoneyyyy(s.getSSRQ(), "yyyy-MM-dd")); + } catch (ParseException e) { + e.printStackTrace(); + } + logger.info("时间为:" + date); + //与现在时间进行比较 + if (date.compareTo(new Date()) >= 0 && !changeJJSS.contains(s)) { + changeJJSS.add(s); + } + } + } + } + + +// 标桩状态 属于即将实施 或 发布 +// 实施日期 在今天之前 +// 标准状态 改为现行有效 + List changeXXYX = new ArrayList<>(); + List strings2 = new ArrayList<>(); + strings2.add(map.get("即将实施")); + strings2.add(map.get("发布")); + List sarStandardsInfos1 = sarStandardsInfoDao.dealWithDS("INLAND", strings2); + if (null != sarStandardsInfos1 && sarStandardsInfos1.size() > 0) { + for (DSarStandardDTO s : sarStandardsInfos1) { + if (null != s.getSSRQ()) { + if (s.getSSRQ().contains(",")) { + //多个日期拆分 一个满足就都满足 + if (findFirstTime(s.getSSRQ()).compareTo(new Date()) < 0 && !changeXXYX.contains(s)) { + changeXXYX.add(s); + } + } else { + Date date = null; + try { + date = dateFormat.parse(TrainFormDate.dealWithTimeZoneyyyy(s.getSSRQ(), "yyyy-MM-dd")); + } catch (ParseException e) { + e.printStackTrace(); + } + logger.info("时间为:" + date); + //与现在时间进行比较 + if (date.compareTo(new Date()) < 0 && !changeXXYX.contains(s)) { + changeXXYX.add(s); + } + } + } + } + } + logger.info("改为即将实施的有" + changeJJSS.size() + "条"); + logger.info("改为现行有效的有" + changeXXYX.size() + "条"); + logger.info("============================="); + createStandardMQService.sendMQ(changeJJSS,changeXXYX); + } + } + + private Date findFirstTime(String ssrq) { + String[] as = ssrq.split(","); + List dates = new ArrayList<>(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + for (String s : as) { + Date date = null; + try { + date = dateFormat.parse(TrainFormDate.dealWithTimeZoneyyyy(s, "yyyy-MM-dd")); + } catch (ParseException e) { + e.printStackTrace(); + } + dates.add(date); + } + dates.sort(Comparator.comparing(date -> date)); + return dates.get(0); + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarQaInfo/entity/SarQaInfoPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarQaInfo/entity/SarQaInfoPage.java new file mode 100644 index 00000000..3f0a7d1f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarQaInfo/entity/SarQaInfoPage.java @@ -0,0 +1,79 @@ +package com.adc.da.slrs.sarQaInfo.entity; + +import com.adc.da.base.page.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * 标准法规问答信息表 + *

+ * + * @author yzh + * @since 2022-05-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarQaInfo对象", description="标准法规问答信息表") +public class SarQaInfoPage extends BasePage { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "资源类型-标准、法规、企标") + @TableField("RES_TYPE") + private String resType; + + @ApiModelProperty(value = "资源ID") + @TableField("RES_ID") + private String resId; + + @TableField("QUE_USER") + private String queUser; + + @TableField("ANSWER_USER") + private String answerUser; + + @TableField("RE_ANSWER_USER") + private String reAnswerUser; + + @ApiModelProperty(value = "提问时间") + @TableField("QUE_TIME") + private LocalDateTime queTime; + + @ApiModelProperty(value = "是否解答") + @TableField("ANSWER_FLAG") + private BigDecimal answerFlag; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private BigDecimal validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATED_TIME") + private LocalDateTime createdTime; + + @TableField("CREATED_USER") + private String createdUser; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + private LocalDateTime modifyTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index ca3b8371..6f8bd84a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -829,7 +829,7 @@ public class SarStandardsInfoController extends BaseController return "1"; } - + //处理 代替被代替数据 关系 @ApiOperation(value = "国内海外数据处理接口") @GetMapping("/replaceBdtbzhforDtbzh") public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 8b1a30a6..a0e17aa1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandardsInfo.dao; +import com.adc.da.slrs.sarStandardsInfo.entity.DSarStandardDTO; import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; @@ -84,4 +85,6 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectIdFormDTBZH(String DTBZHCode); + List dealWithDS(@Param("type") String standType, @Param("status")List strings); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/DSarStandardDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/DSarStandardDTO.java new file mode 100644 index 00000000..f1c31ab1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/DSarStandardDTO.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.sarStandardsInfo.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DSarStandardDTO implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @TableField(exist = false) + private String SSRQ; + + // 新添加字段 + @ApiModelProperty(value = "文本状态") + @TableField("TEXT_STATUS") + private String textStatus; + + + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 638144cb..f088607f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1844,5 +1844,21 @@ ) = REPLACE ( #{DTBZHCode},' ', '') ) + diff --git a/doc/sql/数据库改动.sql b/doc/sql/数据库改动.sql index d8068724..97b510d1 100644 --- a/doc/sql/数据库改动.sql +++ b/doc/sql/数据库改动.sql @@ -1,2 +1,4 @@ 4.13------------------ INSERT INTO `foton_slrs_test2`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('asdzcfgk', NULL, '政策法规库', NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL); +5-7 新增文本状态----- +INSERT INTO `foton_slrs`.`ts_dictype`(`ID`, `DIC_ID`, `DIC_TYPE_NAME`, `DIC_TYPE_CODE`, `DESCRIBES`, `SHOW_INDEX`, `PARENT_ID`, `TREE_PID`, `OTHERS`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`) VALUES ('gycree7258tly7fhrs1n', 'd1c9oygu5yvrtj8qt6w2', '发布', 'hc99551723c', '', 10, NULL, NULL, NULL, 'WY8J26MH23', '0', '2022-05-7 08:08:48', '2022-05-7 08:08:48'); \ No newline at end of file From c7bd02d01754c5ef71ed483fbb9b537af7a963bd Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 May 2022 10:18:24 +0800 Subject: [PATCH 6/8] feat: There is no way the, @Async --- .../service/impl/SarStandardsInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index f605e2b0..1f6fc791 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -111,6 +111,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -2996,6 +2997,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap) { Set keys = attrInfoMap.keySet(); @@ -3073,6 +3075,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap) { Set keys = attrInfoMap.keySet(); From 276a83937eb1c849a8e804e2f0498e497df49395 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 May 2022 11:23:43 +0800 Subject: [PATCH 7/8] feat: There is no way the, @Async --- .../service/impl/SarStandardsInfoServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 1f6fc791..b4fcfcfc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -2997,7 +2997,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap) { Set keys = attrInfoMap.keySet(); @@ -3009,6 +3008,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap){ // 根据文件attid 读取文件内容 if (StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) { String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , "); @@ -3075,7 +3079,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap) { Set keys = attrInfoMap.keySet(); @@ -3087,6 +3090,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap){ // 根据文件attid 读取文件内容 if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) { String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(","); From 5337c11a21211d617654d67c8e8f6c0a7db7e23e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 May 2022 11:31:09 +0800 Subject: [PATCH 8/8] feat: There is no way the, --- .../service/impl/SarStandardsInfoServiceImpl.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index b4fcfcfc..f605e2b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -111,7 +111,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -3008,11 +3007,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap){ // 根据文件attid 读取文件内容 if (StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) { String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , "); @@ -3090,13 +3084,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap){ // 根据文件attid 读取文件内容 if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) { String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(",");