FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-07-13 17:16:52 +08:00
parent df3848e2a4 fb8d1d62ec
commit 1924844c38
7 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java
+5 -1
View File
@@ -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<AskQuestionsDao, AskQue
wrapper.like(StringUtils.isNotBlank(askQuestions.getAppendixName()),"APPENDIX_NAME",askQuestions.getAppendixName());
wrapper.like(StringUtils.isNotBlank(askQuestions.getProblemDescription()),"PROBLEM_DESCRIPTION",askQuestions.getProblemDescription());
wrapper.eq(StringUtils.isNotBlank(askQuestions.getQuestioner()),"QUESTIONER",askQuestions.getQuestioner());
wrapper.like(StringUtils.isNotBlank(askQuestions.getStandardEncdoing()),"STANDARD_ENCDOING",askQuestions.getStandardEncdoing());
if (StringUtils.isNotBlank(askQuestions.getStandardEncdoing())) {
wrapper.and(Q -> 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");
adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
+22 -2
View File
@@ -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<FileMaterial> {
@Autowired
IFileMaterialService iFileMaterialService;
@Autowired
IZlTreeDataService iZlTreeService;
@PostMapping
@ApiOperation("新增文件资料组")
public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){
@@ -50,6 +55,12 @@ public class FileMaterialController extends BaseController<FileMaterial> {
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<FileMaterial> {
public ResponseMessage deleteMaterial(String id){
List<String> idList = Arrays.asList(id.split(","));
boolean b = iFileMaterialService.removeByIds(idList);
if (null!= idList && idList.size()>0) {
QueryWrapper<ZlTreeData> wrapper = new QueryWrapper<>();
wrapper.in("data_id", idList);
iZlTreeService.remove(wrapper);
}
return Result.success(b);
}
@@ -80,7 +95,12 @@ public class FileMaterialController extends BaseController<FileMaterial> {
@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<ZlTreeData> wrapper=new QueryWrapper<>();
wrapper.eq("data_id",fileMaterial.getId());
iZlTreeService.update(zlTreeData,wrapper);
return Result.success(b);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java
+4
View File
@@ -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;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+1 -6
View File
@@ -56,7 +56,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
resource.setTreeType("sarMs");
QueryWrapper<SarMenuStandard> 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<SarMenuStandard> children=dao.selectList(TsResourceQueryWrapper);
resource.setChildren(recursionGetListChildrenStand((resource),(children)));
@@ -83,9 +83,4 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
return tsResources;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+13 -5
View File
@@ -1977,14 +1977,22 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
// 发布稿
List<String> fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(","))
.map(String::trim).collect(Collectors.toList());
List<String> fbgNew = new ArrayList<>();
if(newMap!=null && newMap.containsKey("FBGBJBD")){
fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(","))
.map(String::trim).collect(Collectors.toList());
}
List<String> fbgOld = new ArrayList<>();
if(oldMap!=null && oldMap.containsKey("FBGBJBD")){
fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(","))
.map(String::trim).collect(Collectors.toList());
}
List<String> fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(","))
.map(String::trim).collect(Collectors.toList());
// 取差集 判断是否有新的发布稿
List<String> finalFbgOld = fbgOld;
List<String> filterDisunityFbg = fbgNew.stream()
.filter(item -> !new ArrayList<>(fbgOld)
.filter(item -> !new ArrayList<>(finalFbgOld)
.contains(item))
.collect(Collectors.toList());
adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
+4 -1
View File
@@ -18,7 +18,7 @@
</update>
<select id="getFileMaterialPage" resultType="com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial">
SELECT
fm.*
fm.*,zd.id as treeId
FROM
file_material fm
LEFT JOIN zl_data zd ON zd.data_id=fm.id
@@ -27,6 +27,9 @@
<if test="flieM.treeId != null and flieM.treeId != ''">
and zd.id=#{flieM.treeId}
</if>
<if test="flieM.id != null and flieM.id != ''">
and fm.id=#{flieM.id}
</if>
<if test="flieM.dataType != null and flieM.dataType != ''">
AND fm.data_type like concat('%',#{flieM.dataType},'%')
</if>
doc/sql/20220713_数据.sql
+23
View File
@@ -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';