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

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

Browse Source
This commit is contained in:
gaojiabao
2023-03-16 09:02:57 +08:00
parent 5f466027b1 57e01dff10
commit 0e28163281
14 changed files with 79 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
+2 -2
View File
@@ -106,7 +106,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
private String qcrbuss;
//发布日期
private Date issueTime;
private String issueTime;
//标准编号
private String standCode;
@@ -115,7 +115,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
private String standEnName;
//实施日期
private Date putTime;
private String putTime;
//企标制修订状态
private String revisionStatus;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+1 -5
View File
@@ -418,12 +418,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@PostMapping("/importSarBussionessStandFile")
public ResponseMessage<SarBussionessStand> importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{
ResponseMessage<SarBussionessStand> message = sarBussionessStandEOService.importSarBussionessStandFile(file);
if (message != null && ! message.equals("")){
sarBussionessStandEOService.importSarBussionessStandFile(file);
return Result.success();
}else {
return Result.error("导入失败,导入的文件为空");
}
}
@ApiOperation(value = "|SarBussionessStand|判断原文译文")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+1 -1
View File
@@ -58,7 +58,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
ResponseMessage emptyFileAnewStorage(String type);
ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file);
ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file)throws Exception;
ResponseMessage repetitionFile();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+14 -104
View File
@@ -2017,7 +2017,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
* @throws Exception
*/
@Override
public ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file) {
public ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file)throws Exception {
//给出头部信息
String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"};
@@ -2042,7 +2042,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
saveDirectory.mkdir();
}
//将文件写入到指定路径中
//FileUtils.copyInputStreamToFile(file.getInputStream(),new File(path + "/" + fileNameStr));
FileUtils.copyInputStreamToFile(file.getInputStream(),new File(path + "/" + fileNameStr));
try {
//解压缩
String zipEntryName = FileUnZip.unZipFiles(path + "/" + fileNameStr, path);
@@ -2134,7 +2134,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
Date issueTime = sdfs.parse( rowList.get("发布日期"));
String issueTimeStr = sdfs.format(issueTime);
if (StringUtils.isNotBlank(issueTimeStr)){
sarBussStandAttrInfo.setIssueTime(issueTime);
sarBussStandAttrInfo.setIssueTime(issueTimeStr);
}else {
return Result.error("发布日期不能为空");
}
@@ -2143,7 +2143,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
Date putTime = sdfs.parse(rowList.get("企标实施日期"));
String putTimeStr = sdfs.format(putTime);
if (StringUtils.isNotBlank(putTimeStr)){
sarBussStandAttrInfo.setPutTime(putTime);
sarBussStandAttrInfo.setPutTime(putTimeStr);
}else {
return Result.error("企标实施日期不能为空");
}
@@ -2332,43 +2332,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
standMap = com.alibaba.fastjson.JSONObject.parseObject(standJson);
String bussId = "";
if (standMap != null && !standMap.isEmpty()) {
// String standCode = String.valueOf(standMap.get("standCode"));
// String standName = String.valueOf(standMap.get("standName"));
// String standEnName = String.valueOf(standMap.get("standEnName"));
// String textStatusBuss = String.valueOf(standMap.get("textStatusBuss"));
// String issueTime = String.valueOf(standMap.get("issueTime"));
// String putTime = String.valueOf(standMap.get("putTime"));
// String revisionStatus = String.valueOf(standMap.get("revisionStatus"));
// String qcdw = String.valueOf(standMap.get("qcdw"));
// String fzrqbuss = String.valueOf(standMap.get("fzrqbuss"));
// String dtqbbhbuss = String.valueOf(standMap.get("dtqbbhbuss"));
// String fsrqbuss = String.valueOf(standMap.get("fsrqbuss"));
// String qcrbuss = String.valueOf(standMap.get("qcrbuss"));
// String bdtqbbhbuss = String.valueOf(standMap.get("bdtqbbhbuss"));
// String wjscrybuss = String.valueOf(standMap.get("wjscrybuss"));
// String sycxclass = String.valueOf(standMap.get("sycxclass"));
// String nylxclass = String.valueOf(standMap.get("nylxclass"));
// String sycpxclass = String.valueOf(standMap.get("sycpxclass"));
// String xcsjbuss = String.valueOf(standMap.get("xcsjbuss"));
// String txlbbuss = String.valueOf(standMap.get("txlbbuss"));
// String fbgBuss = String.valueOf(standMap.get("fbgBuss"));
// String standSort = String.valueOf(standMap.get("standSort"));
// String standYear = String.valueOf(standMap.get("standYear"));
SarBussionessStand sarBussionessStand = new SarBussionessStand();
// if(standMap.containsKey("standId")) {
// if (standMap.get("standId") != null && !standMap.get("standId").toString().equals("")) {
// String resId = standMap.get("standId").toString();
// //此处说明是带入的形式
// sarStandardsInfoEO.setId(resId);
// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId);
// if (assessInfoByResId != null) {
// assessInfoByResId.setProcessState("2");
// sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId);
// }
// }
// }
Map<String,Object> attInfoMap = new HashMap<>();
List<String> jsonArray = new ArrayList<>();
@@ -2397,9 +2362,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
createStandBaseField(sarBussionessStand,entry.getKey(),value);
}
}
//处理文件
//此处需要处理之前的文件信息，防止文件丢失
// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarBussionessStand.setSarStandAttrEOStr(resData);
// 根据标准号判断数据是否已存在
@@ -2417,12 +2379,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
standCode = sarBussionessStand.getStandCode();
}
List<SarBussionessStand> lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode);
// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
// sarStandardsInfoEO.setCountry("CN");
// } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) {
// sarStandardsInfoEO.setMenuId("22179d54d4e640098e29");
// }
//此处判断是否是带入的标准
if(StringUtils.isNotBlank(sarBussionessStand.getId())) {
bussId = sarBussionessStand.getId();
@@ -2431,29 +2388,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
iSarBussionessStandService.attrInfoDetails(query);
Map<String, Object> attrInfoMap = query.getAttrInfoMap();
if(attInfoMap!=null && !attInfoMap.isEmpty()){
// updateStandFileFieldData(attInfoMap,attrInfoMap);
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarBussionessStand.setSarStandAttrEOStr(resData);
}
// 查询原相关流程
// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId());
// if (StringUtils.isNotBlank(relatePro)) {
// String[] processSplit = relatePro.split(",");
// Set<String> processSet = new HashSet<>();
// for(String sData:processSplit){
// processSet.add(sData);
// }
// //processSet.add(prcNum);
// relatePro = StringUtils.join(processSet.toArray(), ",");
// }// else {
// relatePro = prcNum;
// }
// 编辑标准
iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand);
// 编辑相关流程
// sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro);
// String content = "新增一条相关流程:" +standName;
// sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,standName);
}else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况
String standId = lawsList.get(0).getId();
bussId = lawsList.get(0).getId();
@@ -2466,57 +2407,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarBussionessStand.setSarStandAttrEOStr(resData);
}
// 查询原相关流程
// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",standId);
// if (StringUtils.isNotBlank(relatePro)) {
// String[] processSplit = relatePro.split(",");
// Set<String> processSet = new HashSet<>();
// for(String sData:processSplit){
// processSet.add(sData);
// }
// //processSet.add(prcNum);
// relatePro = StringUtils.join(processSet.toArray(), ",");
// }// else {
// relatePro = prcNum;
// }
// 编辑标准
sarBussionessStand.setId(standId);
iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand);
// 编辑相关流程
// sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro);
// String content = "新增一条相关流程:" +standName;
// sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,standName);
} else {//标准号、ID都不存在的情况
// 新增方法
sarBussionessStand.setStandCode(standCode);
// sarBussionessStand.setStandNumber("");
// sarBussionessStand.setStandSn("");
// sarBussionessStand.setReviseStatus("");
ResponseMessage<SarBussionessStand> responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand);
if(responseMessage.isOk()){
SarBussionessStand bussionessStand = responseMessage.getData();
bussId = bussionessStand.getId() == null ? "":bussionessStand.getId();
}
// 编辑相关流程
//sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",standName);
}
List<SarStandItems> allItems = new ArrayList<>();
//开始处理条款数据，从去重后的结果中直接处理即可
// if(itemData!=null && !itemData.isEmpty()){
// // allItems =
// saveStandItemsData(itemData, sarStandardsInfoEO);
// }
//技术评估结果入库 重构技术评估结果入库内容
// if ("0".equals(isJudge)) {
// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
// }
// List<BusProcessEvaluationHis> evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid);
List<BusProcessEvaluationHis> evaluationHis = new ArrayList<>();
Map<String, List<BusProcessEvaluationHis>> listMap = new TreeMap<>();
// 按 相同数据分组
// listMap = evaluationHisFilter.stream().collect(
// Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId())));
List<QualityEvaluation> evaluations = new ArrayList<>();
if(!listMap.isEmpty()){
SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
@@ -2612,8 +2522,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//查询字典表,形成Hash映射提升速度
List<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name");
Map<String, String> dicMap = dicInfo.stream()
.filter(item-> !item.getDicTypeCode().isEmpty())
.collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2));
.filter(item-> !item.getDicTypeName().isEmpty())
.collect(Collectors.toMap(DicTypeEO::getDicTypeName,DicTypeEO::getDicTypeCode,(value1, value2 )->value2));
for(SarBussStandAttrInfoExecl row : sarlist){
attrInfoDetailsImport(row);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java
+5
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarRole.dao;
import com.adc.da.slrs.sarRole.entity.TsRole;
import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
@@ -105,4 +106,8 @@ public interface TsRoleDao extends BaseMapper<TsRole> {
@Select("select ROLE_ID from ts_user_role where USER_ID = #{userId}")
List<String> getRoleByUserId(@Param("userId") String userId);
@Select("select role_id from ts_role_resource where resource_id =#{oldResourceIds}")
List<String> getResourceId(String oldResourceIds);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java
+6
View File
@@ -14,6 +14,8 @@ import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO;
import com.adc.da.slrs.sarRole.enums.MenuEnum;
import com.adc.da.slrs.sarRole.service.ITsRoleService;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.slrs.zlTree.dao.ZlTreeDao;
import com.adc.da.slrs.zlTree.entity.ZlTree;
import com.adc.da.utils.util.ListUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,6 +26,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,6 +49,9 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
@Lazy
private ISarUserPersonalMenuService sarUserPersonalMenuService;
@Autowired
private ZlTreeDao zlTreeDao;
@Autowired
private ITsResourceService tsResourceService;
/**
adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java
+4
View File
@@ -2,6 +2,8 @@ package com.adc.da.slrs.tsRoleMeunData.dao;
import com.adc.da.slrs.tsRoleMeunData.entity.TsRoleMenuData;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TsRoleMenuDataDao extends BaseMapper<TsRoleMenuData> {
@Insert("insert into ts_role_menu_data (role_id,menu_id) values (#{roleId},#{id})")
void save(@Param("roleId") String roleId,@Param("id") String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java
+2
View File
@@ -46,6 +46,8 @@ public class ZlTreeController extends BaseController<ZlTree> {
public ResponseMessage addFileMaterial(@RequestBody ZlTree material){
material.setId(String.valueOf(UUID.randomUUID()));
boolean save = iZlTreeService.save(material);
//新增后给所有角色配置权限
iZlTreeService.setResource(material);
return Result.success(save);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java
+5
View File
@@ -2,7 +2,11 @@ package com.adc.da.slrs.zlTree.dao;
import com.adc.da.slrs.zlTree.entity.ZlTree;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* <p>
@@ -16,4 +20,5 @@ public interface ZlTreeDao extends BaseMapper<ZlTree> {
int topping(@Param("id") String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java
+3
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.zlTree.service;
import com.adc.da.http.ResponseMessage;
import com.adc.da.slrs.zlTree.entity.TreeData;
import com.adc.da.slrs.zlTree.entity.ZlTree;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -54,4 +55,6 @@ public interface IZlTreeService extends IService<ZlTree> {
ZlTree queryTree(String treeId);
void subordinateTreeNodes(List<String> treeIds,String parentTreeId);
void setResource(ZlTree material);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java
+27
View File
@@ -1,9 +1,15 @@
package com.adc.da.slrs.zlTree.service.impl;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarPosition.service.ITsPositionService;
import com.adc.da.slrs.sarRole.dao.TsRoleDao;
import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO;
import com.adc.da.slrs.sarRole.service.ITsRoleService;
import com.adc.da.slrs.sarUser.dao.TsUserDao;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.slrs.tsRoleMeunData.dao.TsRoleMenuDataDao;
import com.adc.da.slrs.tsRoleMeunData.service.impl.TsRoleMenuDataServiceImpl;
import com.adc.da.slrs.zlTree.dao.ZlTreeDao;
import com.adc.da.slrs.zlTree.entity.TreeData;
import com.adc.da.slrs.zlTree.entity.ZlTree;
@@ -40,6 +46,12 @@ public class ZlTreeServiceImpl extends ServiceImpl<ZlTreeDao, ZlTree> implements
@Autowired
private ITsUserService tsUserService;
@Autowired
private TsRoleDao tsRoleDao;
@Autowired
TsRoleMenuDataDao tsRoleMenuDataDao;
@Override
public List<TreeData> getLeftTree() {
// 获取当前登录人
@@ -173,4 +185,19 @@ public class ZlTreeServiceImpl extends ServiceImpl<ZlTreeDao, ZlTree> implements
}
}
}
/**
* 新增后给所有角色配置权限
* @param material
*/
@Override
public void setResource(ZlTree material) {
//获取pid
String pId = material.getParentId();
List<String> roleIds = tsRoleDao.getResourceId(pId);
for (String roleId : roleIds){
tsRoleDao.addResource(roleId,material.getId());
tsRoleMenuDataDao.save(roleId,material.getId());
}
}
}
adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
+2 -2
View File
@@ -43,10 +43,10 @@ public class PersonCollectEOController extends BaseController<TsPersonCollect> {
**/
@ApiOperation(value = "|PersonCollectEO|分页查询")
@GetMapping("/page")
public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) throws Exception {
public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) throws Exception {
return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId);
return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId,validFlag);
}
adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java
+1 -1
View File
@@ -28,7 +28,7 @@ public interface IPersonCollectEOService extends IService<TsPersonCollect> {
int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception;
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId);
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId,Integer validFlag);
/**
* 通过标准号和用户id查询是否收藏此标准
adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+6 -1
View File
@@ -133,7 +133,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
@Override
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) {
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) {
BasePage basePage = new BasePage();
QueryWrapper<TsPersonCollect> wrapper = new QueryWrapper<>();
wrapper.eq("user_id",userId);
@@ -144,6 +144,11 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
List<String> ids = new ArrayList<>(Arrays.asList(modeType.split(",")));
wrapper.in("collect_type",ids);
}
if (validFlag != null && !validFlag.equals("") && validFlag == 0){
wrapper.eq("valid_flag",validFlag);
}else if (validFlag != null && !validFlag.equals("") && validFlag == 1){
wrapper.eq("valid_flag",validFlag);
}
wrapper.orderByDesc("creation_Time");
if (pageNo != null) {