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

Merge remote-tracking branch 'origin/develop_3' into develop_3

Browse Source 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-18 16:42:28 +08:00
parent 150e2c96d2 5251cfdb71
commit 01d0da14e8
25 changed files with 1120 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/mq/dao/OtConvertEODao.java
+2
View File
@@ -2,7 +2,9 @@ package com.adc.da.mq.dao;
import com.adc.da.common.ConvertMqEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
@Repository
public interface OtConvertEODao extends BaseMapper<ConvertMqEO> {
int deleteByAttId(String value);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java
+16
View File
@@ -20,6 +20,22 @@ import java.util.Map;
@Repository
public interface SarBussStandAttrInfoDao extends BaseMapper<SarBussStandAttrInfo> {
void alterStandAttr(@Param("fieldInfo") String fieldInfo);
void deleteStandAttr(@Param("fieldInfo") String fieldInfo);
void updateAttrLen(@Param("fieldInfo") String fieldInfo);
Integer selectStandAttrColumn(@Param("columnName") String columnName);
int insertStandAttr(@Param("fieldInfo") String fieldInfo,@Param("fieldValue") String fieldValue);
int deleteStandAttrByStandId(@Param("standId") String standId);
int updateStandInfo(@Param("standId") String standId,@Param("field") String field,@Param("value") String value);
String selectFieldValByStandId(@Param("field") String field, @Param("standId") String standId);
List<SarBussStandAttrInfo> queryByList(SarBussStandAttrInfoEOPage page);
List<SarBussStandAttrInfo> queryByPage(SarBussStandAttrInfoEOPage page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java
+17
View File
@@ -2,6 +2,9 @@ package com.adc.da.slrs.sarBussStandFile.dao;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
@@ -11,6 +14,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author super_liu
* @since 2021-07-25
*/
@Repository
public interface SarBussStandFileDao extends BaseMapper<SarBussStandFile> {
List<SarBussStandFile> selectFileByStandId(String lawsId);
List<SarBussStandFile> selectFileByStandIdAndId(SarBussStandFile laws);
List<SarBussStandFile> selectFileByAttId(String attId);
List<SarBussStandFile> selectFileMsgByAttId(String attId);
List<SarBussStandFile> selectFileByResId(SarBussStandFile sarBussStandFileEO);
int deleteByStandId(String standId);
int insertForeach(List<SarBussStandFile> list); //批量新增
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/entity/SarBussStandFile.java
+11 -2
View File
@@ -2,7 +2,12 @@ package com.adc.da.slrs.sarBussStandFile.entity;
import com.adc.da.base.entity.BaseEntity;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -66,15 +71,19 @@ public class SarBussStandFile extends BaseEntity {
@ApiModelProperty(value = "创建时间")
@TableField("CREATION_TIME")
private LocalDateTime creationTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date creationTime;
@ApiModelProperty(value = "修改时间")
@TableField("MODIFY_TIME")
private LocalDateTime modifyTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
@ApiModelProperty(value = "转换原文件id")
@TableField("ORI_ATT_ID")
private String oriAttId;
@TableField(exist = false)
private List<String> idList = new ArrayList<>();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java
+8
View File
@@ -2,6 +2,9 @@ package com.adc.da.slrs.sarBussStandVal.dao;
import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
@@ -11,6 +14,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author super_liu
* @since 2021-07-25
*/
@Repository
public interface SarBussStandValDao extends BaseMapper<SarBussStandVal> {
//通过标准id删除表中数据
int deleteDataByStandId(String standId);
int insertForeach(List<SarBussStandVal> list); //批量新增
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/entity/SarBussStandVal.java
+8 -3
View File
@@ -4,7 +4,10 @@ import com.adc.da.base.entity.BaseEntity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,13 +43,15 @@ public class SarBussStandVal extends BaseEntity {
private String propertyValue;
@TableField("VALID_FLAG")
private BigDecimal validFlag;
private Integer validFlag;
@TableField("CREATION_TIME")
private LocalDateTime creationTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date creationTime;
@TableField("MODIFY_TIME")
private LocalDateTime modifyTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+66
View File
@@ -8,6 +8,8 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.sys.entity.DicTypeEO;
import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.sys.util.LoginUserUtil;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
@@ -23,6 +25,7 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import java.util.Date;
import java.util.List;
/**
@@ -51,6 +54,69 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@Autowired
private ITsUserService tsUserService;
@Autowired
private IDicTypeEOService dicTypeEOService;
@ApiOperation(value = "|SarBussionessStandEO|企业标准修改")
@PostMapping(value = "/updateSarBussionessStand")
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarBussionessStand:updateSarBussionessStand")
public ResponseMessage<SarBussionessStand> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception {
sarBussionessStandEO.setModifyTime(new Date());
sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO);
return Result.success("","修改成功",sarBussionessStandEO);
}
/**
* 新增过程中验证标准号
*
* @param page
* @return
* @author gaoyan
* date 2018-11-13
*/
@ApiOperation(value = "|SarBussionessStandEO|验证输入的标准号")
@PostMapping("/validateStandNumber")
//@RequiresPermissions("lawss:sarStandardsInfo:selectReplaceStandNum")
public ResponseMessage validateStandNumber(SarBussionessStandEOPage page) throws Exception {
String sortName = "";
String standNumShow = "";
List<DicTypeEO> getDicCode = dicTypeEOService.getDicEOByDicTypeCode(page.getStandSort());
if(getDicCode!= null && getDicCode.size()>0){
sortName = getDicCode.get(0).getDicTypeName();
}
if (StringUtils.isNotEmpty(page.getStandCode()) && StringUtils.isNotEmpty(page.getStandSort())) {
String standnumber = "";
if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){
standnumber = page.getStandSort() + " " + page.getStandCode() + "-" + page.getStandYear();
standNumShow = sortName + " " + page.getStandCode() + "-" + page.getStandYear();
} else {
standnumber = page.getStandSort() + " " + page.getStandCode();
standNumShow = sortName + " " + page.getStandCode();
}
List<SarBussionessStand> standlist = sarBussionessStandEOService.selectStandardsByStandNumber(standnumber);
if (standlist.size() > 0) {
if (StringUtils.isNotEmpty(page.getId())) {
// 如果是修改，判断id是否一样
for (int i = 0; i < standlist.size(); i++) {
if (standlist.get(i).getId().equals(page.getId())) {
continue;
} else {
return Result.error(standNumShow + "标准号已存在");
}
}
return Result.success();
} else {
return Result.error(standNumShow + "标准号已存在");
}
} else {
return Result.success();
}
} else {
return Result.success();
}
}
/**
* 根据id查询标准详情
*
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+4
View File
@@ -18,6 +18,10 @@ import java.util.List;
@Repository
public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
SarBussionessStand selectByPrimaryKey(String standId);
List<SarBussionessStand> selectStandardsByStandNumber(SarBussionessStand sarBussionessStand);
List<SarBussionessStand> selectStandardsInfoByKey(String id);
List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+5
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.sarBussionessStand.service;
import com.adc.da.search.entity.SarBussionessStandEO;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +17,10 @@ import java.util.List;
*/
public interface ISarBussionessStandService extends IService<SarBussionessStand> {
SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception;
List<SarBussionessStand> selectStandardsByStandNumber(String replaceStandNum);
SarBussionessStand selectStandardsInfoByKey(String id) throws Exception;
SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+260
View File
@@ -2,25 +2,41 @@ package com.adc.da.slrs.sarBussionessStand.service.impl;
import com.adc.da.att.entity.AttFileEO;
import com.adc.da.att.service.IAttFileEOService;
import com.adc.da.common.ConvertMqEO;
import com.adc.da.common.SarTypeEnum;
import com.adc.da.common.SelectionTypeEnum;
import com.adc.da.common.UseModuleEnum;
import com.adc.da.mq.dao.OtConvertEODao;
import com.adc.da.mq.service.CreateMQService;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao;
import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao;
import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussStandMenuEO;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.sys.constant.ValueStateEnum;
import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.sys.util.LoginUserUtil;
import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.FieldConvertUtil;
import com.adc.da.utils.util.InitStandAttrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,9 +76,253 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired
private IPersonCollectEOService personCollectEOService;
@Autowired
private OtConvertEODao otConvertEODao;
@Autowired
private CreateMQService convertMq;
@Autowired
private SarBussStandValDao sarBussStandValEODao;
@Autowired
private SarBussStandFileDao sarBussStandFileEODao;
@Autowired
private SarStandardsInfoDao sarStandardsInfoEODao;
@Autowired
private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;
public SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception {
String standId = sarBussionessStandEO.getId();
SarBussionessStand beforeStandEO = this.baseMapper.selectByPrimaryKey(standId);
if(beforeStandEO!=null){
attrInfoDetails(beforeStandEO);
}
//规范性引用文件，如有数据，删除以前关联
int resultCount = this.baseMapper.updateById(sarBussionessStandEO);
if (resultCount >= 1) {
// 修改属性表数据
sarBussStandAttrInfoEODao.deleteStandAttrByStandId(standId);
sarBussStandValEODao.deleteDataByStandId(standId);
//删除文件详情表数据
sarBussStandFileEODao.deleteByStandId(standId);
SarBussStandFile sarBussStandFileEO = new SarBussStandFile();
sarBussStandFileEO.setStandId(standId);
sarBussStandFileEO.setIdList(null);
List<SarBussStandFile> listFile = sarBussStandFileEODao.selectFileByStandIdAndId(sarBussStandFileEO);
if (listFile != null) {
if (!listFile.isEmpty()) {
for (int f = 0; f < listFile.size(); f++) {
//删除文件信息表数据
// sarFileInfoEODao.deleteByfileId(listFile.get(f).getId());
//删除转换表ot_convert数据
otConvertEODao.deleteByAttId(listFile.get(f).getAttId());
}
}
}
createStandAttrInfo(sarBussionessStandEO);
// 根据代替标准号 ，修改代替标准号标准中的，被代替标准号
// updateReplaceConnect(sarBussionessStandEO);
// //修改收藏分享编号名称
// updateCollectAndShare(sarBussionessStandEO);
// // 记录修改日志
// saveUpdateLog(sarBussionessStandEO,beforeStandEO);
// if (elasflag) {
// createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update");
// }
}
return sarBussionessStandEO;
}
/***
* @Description: 新增属性表数据
* @Author: yangxuenan
* @Date: 2020/9/8 9:53
* @Param: [sarStandardsInfoEO]
* @Return: void
*/
public void createStandAttrInfo (SarBussionessStand sarBussionessStandEO) throws Exception {
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
String mustFields = FieldConvertUtil.mustFields;
String mustValues = FieldConvertUtil.mustValues(sarBussionessStandEO.getId());
// 将字符串转为map进行解析
Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
StringBuilder fieldsBuilder = new StringBuilder();
StringBuilder valuesBuilder = new StringBuilder();
Map<String,String> selectionMap = new HashMap<>();
Map<String,String> fileMap = new HashMap<>();
Map<String,String> multiTimeMap = new HashMap<>();
String fileIds = "";
for (Map.Entry<String,String> entry : sarStandAttrMap.entrySet()) {
String attrKey = entry.getKey();
String attrValue = entry.getValue();
if (InitStandAttrUtil.queryFieldListBuss != null && !InitStandAttrUtil.queryFieldListBuss.isEmpty()) {
if (InitStandAttrUtil.queryFieldListBuss.contains(attrKey)) {
fieldsBuilder.append("," + attrKey);
// 多选项，文件类型需要单独处理 向子表添加数据
if (InitStandAttrUtil.selectionFieldListBuss.contains(attrKey)) {
selectionMap.put(attrKey,attrValue);
} else if (InitStandAttrUtil.fileFieldListBuss.contains(attrKey)) {
fileMap.put(attrKey,attrValue);
fileIds += attrValue + ",";
} else if (InitStandAttrUtil.multiTimeFieldList.contains(attrKey)) {
multiTimeMap.put(attrKey,attrValue);
}
// 不同类型存储数据需单独处理值
if (InitStandAttrUtil.numFieldListBuss.contains(attrKey)) {
if (StringUtils.isBlank(attrValue)) {
attrValue = "null";
}
} else if (InitStandAttrUtil.timeFieldListBuss.contains(attrKey)) {
attrValue = FieldConvertUtil.changeTimeValue(attrValue);
} else {
attrValue = "'" + attrValue + "'";
}
valuesBuilder.append("," + attrValue);
sarBussionessStandEO.setFileIds(fileIds);
}
}
}
String insertField = mustFields + fieldsBuilder.toString();
String insertValue = mustValues + valuesBuilder.toString();
int insertRes = sarBussStandAttrInfoEODao.insertStandAttr(insertField,insertValue);
if (insertRes > 0) {
// 多选项处理
createStandVal(sarBussionessStandEO.getId(),selectionMap);
// 文件处理
createStandFile(sarBussionessStandEO.getId(),fileMap);
// 多时间处理
// createStandPutTime(sarBussionessStandEO.getId(),multiTimeMap);
}
}
/***
* @Description: 多选项处理
* @Author: yangxuenan
* @Date: 2020/9/8 14:37
* @Param: [sarStandardsInfoEO, selectionMap]
* @Return: void
*/
public void createStandVal (String standId,Map<String,String> selectionMap) {
if (selectionMap != null && selectionMap.size() > 0) {
List<SarBussStandVal> standValList = new ArrayList<>();
for (Map.Entry<String,String> entry : selectionMap.entrySet()) {
String value = entry.getValue();
String field = entry.getKey();
if (StringUtils.isNotBlank(value)) {
String[] valArr = value.trim().split(",");
for (String val : valArr) {
SarBussStandVal sarStandValEO = new SarBussStandVal();
sarStandValEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarStandValEO.setCreationTime(new Date());
sarStandValEO.setModifyTime(new Date());
sarStandValEO.setStandId(standId);
sarStandValEO.setId(com.adc.da.sys.util.UUIDUtils.randomUUID20());
sarStandValEO.setPropertyType(field);
sarStandValEO.setPropertyValue(val);
standValList.add(sarStandValEO);
}
}
}
if (standValList != null && !standValList.isEmpty()) {
sarBussStandValEODao.insertForeach(standValList);
}
}
}
/***
* @Description: 文件处理
* @Author: yangxuenan
* @Date: 2020/9/8 15:01
* @Param: [standId, fileMap]
* @Return: void
*/
public void createStandFile (String standId,Map<String,String> fileMap) throws Exception {
if (fileMap != null && fileMap.size() > 0) {
List<SarBussStandFile> standFileList = new ArrayList<>();
for (Map.Entry<String,String> entry : fileMap.entrySet()) {
String value = entry.getValue();
String field = entry.getKey();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(value);
if (fileList != null && !fileList.isEmpty()) {
createStandFileAppend(standId,field,fileList,standFileList);
}
}
}
if (standFileList != null && !standFileList.isEmpty()) {
sarBussStandFileEODao.insertForeach(standFileList);
}
}
}
public void createStandFileAppend (String standId,String field,List<AttFileEO> fileList,List<SarBussStandFile> standFileList) throws Exception {
for (AttFileEO fileInfo : fileList) {
SarBussStandFile sarStandFileEO = new SarBussStandFile();
sarStandFileEO.setCreationUser(LoginUserUtil.getUserId());
sarStandFileEO.setCreationTime(new Date());
sarStandFileEO.setModifyTime(new Date());
sarStandFileEO.setValidFlag("0");
sarStandFileEO.setStandId(standId); //标准ID
sarStandFileEO.setUseModel(UseModuleEnum.SOURCE_FILE.getValue()); //文件使用模式
sarStandFileEO.setId(com.adc.da.sys.util.UUIDUtils.randomUUID20());
sarStandFileEO.setAttId(fileInfo.getId()); //文件ID
sarStandFileEO.setStandFileClassify(field); //文件分类
sarStandFileEO.setFileName(fileInfo.getOldFileName());
sarStandFileEO.setFileSuffix(fileInfo.getFileSuffix());
sarStandFileEO.setOriAttId(fileInfo.getId());
standFileList.add(sarStandFileEO);
//文档转换
if ("pdf".equals(fileInfo.getFileSuffix()) || "PDF".equals(fileInfo.getFileSuffix())) {
SarBussStandFile newFileEO = new SarBussStandFile();
newFileEO.setCreationUser(LoginUserUtil.getUserId());
newFileEO.setCreationTime(new Date());
newFileEO.setModifyTime(new Date());
newFileEO.setValidFlag("0");
newFileEO.setStandId(standId); //标准ID
newFileEO.setId(com.adc.da.sys.util.UUIDUtils.randomUUID20());
newFileEO.setAttId(fileInfo.getId()); //文件ID
newFileEO.setStandFileClassify(field); //文件分类
newFileEO.setFileName(fileInfo.getOldFileName());
newFileEO.setFileSuffix(fileInfo.getFileSuffix());
newFileEO.setUseModel(UseModuleEnum.WEB_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改
newFileEO.setOriAttId(fileInfo.getId());
standFileList.add(newFileEO);
} else {
String filePath = fileInfo.getFilePath() + fileInfo.getFileName();
ConvertMqEO convert = new ConvertMqEO();
convert.setLawsId(standId);
convert.setAttId(fileInfo.getId());
convert.setFilePath(filePath);
convert.setAddOrUp("0");
convert.setFileSuffix(fileInfo.getFileSuffix());
convert.setStandFileClassify(field);
convert.setConvertType(SarTypeEnum.BUSINESS.getValue());
convertMq.sendMQ(convert);
}
}
}
public List<SarBussionessStand> selectStandardsByStandNumber(String replaceStandNum) {
/*if(replaceStandNum.indexOf(" ")!=-1){
String dicName = replaceStandNum.substring(0,replaceStandNum.indexOf(" "));
DicTypeEO dicTypeEO = new DicTypeEO();
dicTypeEO.setDicTypeName(dicName);
dicTypeEO.setDicTypeCode("BUSSSTANDCLASS");
List<DicTypeEO> getDicCode = dicTypeEODao.getDicTypeByDicTypeName(dicTypeEO);
if(getDicCode!= null && getDicCode.size()>0){
replaceStandNum = replaceStandNum.replace(dicName,getDicCode.get(0).getDicTypeCode());
}
}*/
SarBussionessStand sarStandardsInfoEO = new SarBussionessStand();
sarStandardsInfoEO.setStandCode(replaceStandNum);
return this.baseMapper.selectStandardsByStandNumber(sarStandardsInfoEO);
}
@Override
public SarBussionessStand selectStandardsInfoByKey(String id) throws Exception{
List<SarBussionessStand> sarBussionessStandlist = this.baseMapper.selectStandardsInfoByKey(id);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java
+5 -1
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandAttrDetails.service.impl;
import com.adc.da.common.SarTypeEnum;
import com.adc.da.common.StandAttrTypeEnum;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarLawsAttrInfo.dao.SarLawsAttrInfoDao;
import com.adc.da.slrs.sarLawsInfo.dao.SarLawsInfoDao;
import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails;
@@ -45,6 +46,9 @@ public class SarStandAttrDetailsServiceImpl extends ServiceImpl<SarStandAttrDeta
@Autowired
private SarLawsInfoDao sarLawsInfoEODao;
@Autowired
private SarBussStandAttrInfoDao sarBussStandAttrInfoDao;
@Autowired
private SarStandardsInfoDao sarStandardsInfoDao;
@@ -111,7 +115,7 @@ public class SarStandAttrDetailsServiceImpl extends ServiceImpl<SarStandAttrDeta
} else if (lawsTypeList.contains(sarType)) {
sarLawsAttrInfoDao.alterLawsAttr(fieldInfo);
} else if (SarTypeEnum.BUSS.getValue().equals(sarType)) {
// dao.alterStandAttr(fieldInfo);
sarBussStandAttrInfoDao.alterStandAttr(fieldInfo);
}
}
//向属性详细信息表添加数据
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+5 -2
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarStandItems.controller;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
@@ -55,9 +56,11 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
@ApiOperation(value = "分解单查询")
@GetMapping("/querySarItemAndInterpretation")
public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
List<SarStandItems> rows = ServiceImpl.querySarItemAndInterpretation(page);
return Result.success("200",sarItemVOS);
PageInfo<SarStandItems> pageInfo = getPageInfo(page.getPager(), rows);
return Result.success(pageInfo);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java
+4 -1
View File
@@ -24,7 +24,10 @@ import java.util.Set;
@Repository
public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
Integer sarItemCount(FindSarItemsPageReqDTO page);
List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
+1 -1
View File
@@ -10,7 +10,7 @@ import java.util.Date;
@Data
public class FindSarItemsPageReqDTO {
public class FindSarItemsPageReqDTO extends BasePage {
private static final long serialVersionUID = 1L;
private Integer page = 1;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
+2 -4
View File
@@ -27,8 +27,6 @@ public class SarItemVO extends BaseEntity {
@ApiModelProperty(value = "条款名称")
private String itemsName;
@ApiModelProperty(value = "条款内容(未使用)")
private String itemsTitle;
@ApiModelProperty(value = "条款内容--条款要求")
private String termsConditions;
@@ -67,6 +65,6 @@ public class SarItemVO extends BaseEntity {
@ApiModelProperty(value = "解读内容--核心技术要点")
private String interpretationContent;
@ApiModelProperty(value = "解读内容")
private String readContent;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
+9
View File
@@ -132,6 +132,15 @@ public class SarStandItems extends BaseEntity {
@TableField("ZCCSSRQ")
private Date zccssrq;
@ApiModelProperty(value = "符合性要求-符合性状态")
@TableField("COMPLIANCE_REQUIR")
private String complianceRequire;
@ApiModelProperty(value = "解读内容--核心技术要点")
@TableField("core_technical_requirement")
private String interpretationContent;
@TableField(exist = false)
private String emergyKindShow;
@TableField(exist = false)
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+11 -2
View File
@@ -11,6 +11,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
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;
@@ -191,7 +192,15 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
}
public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
return dao.querySarItemAndInterpretation(page);
public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
Integer count=dao.sarItemCount(page);
page.getPager().setRowCount(count);
List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
return sarStandItems;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+2
View File
@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.List;
@@ -17,6 +18,7 @@ import java.util.List;
* @author super_liu
* @since 2021-05-31
*/
@Repository
public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+20 -10
View File
@@ -267,13 +267,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
*/
public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
//查询当前登录人角色拥有权限的菜单
if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
if(page.getMenuId() != null ){
QueryWrapper<TsResource> qw = new QueryWrapper<>();
qw.eq("ID",page.getMenuId());
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
@@ -599,10 +599,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
pageInfo.setStandId(sarStandardsInfoEO.getId());
pageInfo.setFileType("FBGBJBD");
List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
/**
* SarItemVO换为sarItemVOS
* List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
* .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
*/
List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
if(!sarItemVOS.isEmpty()){
Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
.collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions));
.collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName));
sarStandardsInfoEO.setMapItems(collectMap);
}
createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
@@ -1179,10 +1186,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
pageInfo.setStandId(sarStandardsInfoEO.getId());
pageInfo.setFileType("FBGBJBD");
List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
/**
* SarItemVO换为SarItemVOS
* List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
* .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
*/
List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
if(!sarItemVOS.isEmpty()){
Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
.collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions));
.collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName));
sarStandardsInfoEO.setMapItems(collectMap);
}
createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
@@ -1349,10 +1362,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
page = (SarStandardsInfoEOPage) JSONObject.toBean(jsonObject, SarStandardsInfoEOPage.class);
page.setStandType(standardsInfoExcelVO.getStandType());
//查询当前登录人角色拥有权限的菜单
List<String> getMenuIdList = new ArrayList<>();
if(standardsInfoExcelVO.getUserId() != null){
getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId());
}
List<String> getMenuIdList=tsUserService.getResourceId(new TsResource());
// List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);