From 91c24401f25c61aa6c855670133034f5d9c2b71b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 13 Jul 2022 11:24:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml index 42baff8a..00eefb83 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -27,6 +27,9 @@ and zd.id=#{flieM.treeId} + + and fm.id=#{flieM.id} + AND fm.data_type like concat('%',#{flieM.dataType},'%') From 560625f6e1bcd13765ce9937590617867ac7a270 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 13 Jul 2022 11:25:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardQA/service/impl/AskQuestionsServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java index 44d486ad..c3574e69 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.sf.jsqlparser.statement.replace.Replace; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,7 +46,10 @@ public class AskQuestionsServiceImpl extends ServiceImpl wrapper.like("STANDARD_ENCDOING", askQuestions.getStandardEncdoing().replace(" ", " ")) + .or().like("STANDARD_ENCDOING", askQuestions.getStandardEncdoing())); + } wrapper.like(StringUtils.isNotBlank(askQuestions.getStandardName()),"STANDARD_NAME",askQuestions.getStandardName()); wrapper.eq(StringUtils.isNotBlank(askQuestions.getStandardId()),"STANDARD_ID",askQuestions.getStandardId()); wrapper.orderByDesc("QUESTION_TIME"); From ffa12e73574f17f08ee6bb79ccad09345ac8d92e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 13 Jul 2022 14:13:30 +0800 Subject: [PATCH 3/5] sql --- doc/sql/20220713_数据.sql | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/sql/20220713_数据.sql diff --git a/doc/sql/20220713_数据.sql b/doc/sql/20220713_数据.sql new file mode 100644 index 00000000..fb2ecf89 --- /dev/null +++ b/doc/sql/20220713_数据.sql @@ -0,0 +1,23 @@ + +====新增的菜单数据==== + +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('07ba9d907841a62a18267198da3873b1', NULL, '左侧树删除', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('0b95246d8ad2da6c54381deffa3d0fa2', NULL, '左侧树修改', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('1cae70abf414bacc33f3ed794cdfa903', NULL, '资料中心删除', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('32143ffassgabyabayg', NULL, '资料中心', NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('39784f04404cdf50891e9d033f6373c3', NULL, '资料中心查询', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('45db41d367f474e10a7ae5dbe8cb0f6e', NULL, '资料中心新增', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('d9698737e801822ab8f96dbcd47b7d62', NULL, '资料中心修改', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('e9e80920563325fa7f6e91213ee98466', NULL, '左侧树新增', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL); + + + + +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '左侧树删除', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '07ba9d907841a62a18267198da3873b1'; +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '左侧树修改', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '0b95246d8ad2da6c54381deffa3d0fa2'; +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心删除', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '1cae70abf414bacc33f3ed794cdfa903'; +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心', `PARENT_ID` = NULL, `PARENT_IDS` = NULL, `LEVEL` = 1, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '32143ffassgabyabayg'; +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心查询', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '39784f04404cdf50891e9d033f6373c3'; +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心新增', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '45db41d367f474e10a7ae5dbe8cb0f6e'; +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心修改', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = 'd9698737e801822ab8f96dbcd47b7d62'; +UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '左侧树新增', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = 'e9e80920563325fa7f6e91213ee98466'; From e42fbce67e12b55315de476abcd75fdca77a1773 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Wed, 13 Jul 2022 14:44:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarMenuStandardNewServiceNewImpl.java | 7 +------ .../impl/SarStandardsInfoServiceImpl.java | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 175233dd..26015f7a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -56,7 +56,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl TsResourceQueryWrapper=new QueryWrapper<>(); TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); - TsResourceQueryWrapper.in(null!=access,"ID",access); + TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access); TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List children=dao.selectList(TsResourceQueryWrapper); resource.setChildren(recursionGetListChildrenStand((resource),(children))); @@ -83,9 +83,4 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(",")) - .map(String::trim).collect(Collectors.toList()); + List fbgNew = new ArrayList<>(); + if(newMap!=null && newMap.containsKey("FBGBJBD")){ + fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(",")) + .map(String::trim).collect(Collectors.toList()); + } + + List fbgOld = new ArrayList<>(); + if(oldMap!=null && oldMap.containsKey("FBGBJBD")){ + fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(",")) + .map(String::trim).collect(Collectors.toList()); + } - List fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(",")) - .map(String::trim).collect(Collectors.toList()); // 取差集 判断是否有新的发布稿 + List finalFbgOld = fbgOld; List filterDisunityFbg = fbgNew.stream() - .filter(item -> !new ArrayList<>(fbgOld) + .filter(item -> !new ArrayList<>(finalFbgOld) .contains(item)) .collect(Collectors.toList()); From 9b3ea0596380998a6f68ed8609b0df6e64ad6790 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 13 Jul 2022 17:11:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileMaterialController.java | 24 +++++++++++++++++-- .../entity/FileMaterial.java | 4 ++++ .../fileMaterialCenter/FileMaterialMapper.xml | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index 8fa350fa..c79f845c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -5,6 +5,8 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.adc.da.slrs.zlTree.entity.ZlTreeData; +import com.adc.da.slrs.zlTree.service.IZlTreeDataService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,6 +41,9 @@ public class FileMaterialController extends BaseController { @Autowired IFileMaterialService iFileMaterialService; + @Autowired + IZlTreeDataService iZlTreeService; + @PostMapping @ApiOperation("新增文件资料组") public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){ @@ -50,6 +55,12 @@ public class FileMaterialController extends BaseController { material.setId(UUIDUtils.randomUUID20()); material.setDataUploadTime(new Date()); material.setDelFlag("0"); + + ZlTreeData zlTreeData=new ZlTreeData(); + zlTreeData.setId(material.getTreeId()); + zlTreeData.setDataId(material.getId()); + iZlTreeService.save(zlTreeData); + boolean save = iFileMaterialService.save(material); return Result.success(save); @@ -61,7 +72,11 @@ public class FileMaterialController extends BaseController { public ResponseMessage deleteMaterial(String id){ List idList = Arrays.asList(id.split(",")); boolean b = iFileMaterialService.removeByIds(idList); - + if (null!= idList && idList.size()>0) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in("data_id", idList); + iZlTreeService.remove(wrapper); + } return Result.success(b); } @@ -80,7 +95,12 @@ public class FileMaterialController extends BaseController { @ApiOperation("修改文件资料组") public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){ boolean b = iFileMaterialService.updateById(fileMaterial); - + ZlTreeData zlTreeData=new ZlTreeData(); + zlTreeData.setId(fileMaterial.getTreeId()); + zlTreeData.setDataId(fileMaterial.getId()); + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq("data_id",fileMaterial.getId()); + iZlTreeService.update(zlTreeData,wrapper); return Result.success(b); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java index a78643c7..636a2766 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -71,4 +71,8 @@ public class FileMaterial extends BaseEntity { @ApiModelProperty(value = "删除标志") @TableField("is_show") private String isShow; + + @ApiModelProperty(value = "树id") + @TableField(exist = false) + private String treeId; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml index 00eefb83..c4fa2869 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -18,7 +18,7 @@