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'

Browse Source 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
This commit is contained in:
高嵩
2023-03-26 16:53:41 +08:00
parent 6a683aed12 2434fc3f05
commit 98cc554faa
51 changed files with 2079 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
+13 -11
View File
@@ -14,18 +14,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import oracle.ucp.proxy.annotation.Post;
import net.sf.json.JSONArray;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* @Author: qk
@@ -177,7 +171,15 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
//添加问题分配人员
askUserService.saveBatch(askUserList);
if(askQuestionsService.save(askQuestions)){
return Result.success("200","添加成功",null);
Map<Object, Object> objectObjectHashMap = new HashMap<>();
List<String> askUserListUser = new ArrayList<>();
for (AskUser user: askUserList){
askUserListUser.add(user.getUsid());
}
JSONArray jsonArray = JSONArray.fromObject(askUserListUser);
objectObjectHashMap.put("questioner",jsonArray);
objectObjectHashMap.put("askQuestions",askQuestions);
return Result.success("200","添加成功",objectObjectHashMap);
}else {
return Result.error("-1","添加失败",null);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java
+13 -1
View File
@@ -58,7 +58,7 @@ public class ReplyController extends BaseController<Reply> {
return Result.error("-1","添加失败");
}
}
@PostMapping("/updateReply")
//@PostMapping("/updateReply")
public ResponseMessage updateReply(String id){
if(StringUtils.isEmpty(id)){
return Result.error("-1","请选择要归档的回答");
@@ -78,4 +78,16 @@ public class ReplyController extends BaseController<Reply> {
public ResponseMessage updateReply(@RequestBody ReplyPage reply){
return Result.success(replyService.listByPage(reply));
}
@PostMapping("/updateReply")
public ResponseMessage updateReplyInfo(@RequestBody List<Reply> replyList){
if (replyList.isEmpty()){
return Result.error("-1","编辑失败",null);
}
for(Reply reply: replyList){
reply.setState("yes");
}
replyService.updateBatchById(replyList);
return Result.success("200","编辑成功",null);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+7
View File
@@ -18,6 +18,7 @@ import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -182,4 +183,10 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
return Result.success(iEsRevisePlanService.delPlans(ids));
}
@ApiOperation(value = "OA时间添加")
@GetMapping("/oaUpdatePlans")
public ResponseMessage<Object> oaUpdatePlans(@RequestParam("esId")String esId, @RequestParam("date") Date date, @RequestParam("s") String s){
return Result.success(iEsRevisePlanService.oaUpdatePlans(esId,date,s));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+10
View File
@@ -159,4 +159,14 @@ public class EsRevisePlan extends BasePage {
@TableField(exist = false)
private String logType;
@ApiModelProperty(value = "OA发送时间记录")
@TableField("OA_DATETIME")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date oaDateIime;
@ApiModelProperty(value = "OA是否已经发送")
@TableField("OA_IS_SEND")
private String oaIsSend;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
+3
View File
@@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Date;
import java.util.List;
/**
@@ -28,4 +29,6 @@ public interface IEsRevisePlanService extends IService<EsRevisePlan> {
List<EsRevisePlan> getDataByName(EsRevisePlan esRevisePlan);
List<EsRevisePlan> getAllPlansByWk(String esName);
Object oaUpdatePlans(String esId, Date date, String s);//Ao时间 发送次数 修改
}
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+10
View File
@@ -229,4 +229,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
return esRevisePlanDao.selectList(queryWrapper);
}
@Override
public Object oaUpdatePlans(String esId, Date date, String s) {
EsRevisePlan esRevisePlan = new EsRevisePlan();
esRevisePlan.setId(esId);
esRevisePlan.setOaDateIime(date);
esRevisePlan.setOaIsSend(s);
esRevisePlanDao.updateById(esRevisePlan);
return null;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java
+1 -1
View File
@@ -44,7 +44,7 @@ public interface SarBussStandAttrInfoDao extends BaseMapper<SarBussStandAttrInfo
Map<String, Object> selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId);
void updateFSQR(@Param("id") String id,@Param("time") String time);
String selectInfoStandId(@Param("standId") String standId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java
+84
View File
@@ -0,0 +1,84 @@
package com.adc.da.slrs.sarBussStandAttrInfo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="BusProcessEvaluationHis对象", description="流程评分历史表")
public class BusProcessEvaluationHis implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "主键")
@TableId(value = "ID", type = IdType.UUID)
private String id;
@ApiModelProperty(value = "标准id")
@TableField("STAND_ID")
private String standId;
@ApiModelProperty(value = "处理人")
@TableField("USER_ID")
private String userId;
@ApiModelProperty(value = "信息")
@TableField("MESG")
private String mesg;
@ApiModelProperty(value = "节点信息")
@TableField("TASK_INFO")
private String taskInfo;
@ApiModelProperty(value = "任务id")
@TableField("TASK_ID")
private String taskId;
@ApiModelProperty(value = "流程实例id")
@TableField("P_ID")
private String pId;
@ApiModelProperty(value = "流程名称")
@TableField("PRC_NAME")
private String prcName;
@ApiModelProperty(value = "创建时间")
@TableField("CREATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String createTime;
@ApiModelProperty(value = "更新时间")
@TableField("UPDATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String updateTime;
@ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑")
@TableField("EDIT_STATUS")
private String editStatus;
@ApiModelProperty(value = "onlyOffice 编辑文件存储路径")
@TableField("EDIT_FILE_PATH")
private String editFilePath;
@ApiModelProperty(value = "逻辑状态")
@TableField("FLAG")
private String flag;
@ApiModelProperty(value = "onlyOffice 访问编辑文件全路径")
@TableField(exist = false)
private String downLoadUrl;
@ApiModelProperty(value = "处理人姓名")
@TableField(exist = false)
private String userName;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java
+8
View File
@@ -67,6 +67,14 @@ public class SarBussStandAttrInfo extends BaseEntity {
@TableField(exist = false)
private String glwj;
@ApiModelProperty(value = "译文件")
@TableField("TRANSLATION")
private String translation;
@ApiModelProperty(value = "原文件")
@TableField("FBGBUSS")
private String fbgbuss;
//
// @TableField("SVPPS")
// private String svpps;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
+177
View File
@@ -0,0 +1,177 @@
package com.adc.da.slrs.sarBussStandAttrInfo.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.scheduling.support.SimpleTriggerContext;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* <p>
*
* </p>
*
* @author
* @since 2023-02-28
*/
@Data
public class SarBussStandAttrInfoExecl extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
@ApiModelProperty(value = "标准基础表主键")
private String standId;
private String creationUser;
@ApiModelProperty(value = "是否有效")
private String validFlag;
@ApiModelProperty(value = "创建时间")
private Date creationTime;
@ApiModelProperty(value = "修改时间")
private Date modifyTime;
@ApiModelProperty(value = "体系类别")
private String txlbbuss;
private String glwj;
private String svpps;
private String gfxyywj;
private String zrbm;
private Date fzrq;
private Date fsrq;
private String qbmj;
private String qbsq;
private String qbwb;
private String gcwb;
private String zyqcr;
private String qcfbw;
private String xglc;
private String xgbm;
private String xhqbm;
private String zqcbm;
private String qtqcr;
private String wfspjs;
private String xgjh;
//附件
private String qtwjbuss;
//标准中文名称
private String standName;
//企标类型
private String standSort;
//标准年份
private String standYear;
//文本状态
private String textStatusBuss;
//起草部门
private String qcdw;
//起草人
private String qcrbuss;
//发布日期
private String issueTime;
//标准编号
private String standCode;
//标准英文名称
private String standEnName;
//实施日期
private String putTime;
//企标制修订状态
private String revisionStatus;
//废止日期
private String fzrqbuss;
//代替企标编号
private String dtqbbhbuss;
//复审日期
private String fsrqbuss;
//被代替企标编号
private String bdtqbbhbuss;
//文件上传人员
private String wjscrybuss;
//适用车型
private String sycxclass;
//能源类型
private String nylxclass;
//适用产品线
private String sycpxclass;
//上传时间
private String xcsjbuss;
//关联模块-乘用车VPPS编码
private String cycvppsbmbuss;
//关联模块--乘用车vpps中文名称
private String cycvppscnbuss;
//关联模块--卡车VPPS编码
private String kcvppsbmbuss;
//关联模块--卡车vpps中文名称
private String kcvppscnbuss;
//采用标准
private String cybz;
//采标程度
private String cycd;
//引用标准
private String yybz;
//备案日期
private String barq;
@TableField(exist = false)
private Map<String, Object> attrInfoMap = new LinkedHashMap<>();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+57 -3
View File
@@ -3,10 +3,12 @@ package com.adc.da.slrs.sarBussionessStand.controller;
import com.adc.da.Log.BusinessType;
import com.adc.da.Log.EpcLog;
import com.adc.da.common.FileUnZip;
import com.adc.da.common.ReadExcel;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
@@ -23,25 +25,33 @@ import com.adc.da.util.exception.AdcDaBaseException;
import com.adc.da.util.utils.IOUtils;
import com.adc.da.util.utils.StringUtils;
import com.adc.da.utils.util.BussStandExportUtil;
import com.adc.da.utils.util.FieldConvertUtil;
import com.adc.da.utils.util.SarAdvanceSearchUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.commons.io.FileUtils;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
import java.util.List;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
/**
* <p>
@@ -74,6 +84,12 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@Autowired
private IDicTypeEOService dicTypeEOService;
@Value("${file.path}")
private String filePath;
@Autowired
ISarLawsInfoService sarLawsInfoEOService;
/**
* 根据计划库制定状态查询企标编号
*
@@ -143,6 +159,14 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarBussionessStand:updateSarBussionessStand")
public ResponseMessage<SarBussionessStand> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception {
//校验编号和名称是否存在
QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber())
.eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName());
List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){
return Result.error("当前企标标准号和企标名称已存在");
}
sarBussionessStandEO.setModifyTime(new Date());
sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO);
return Result.success("","修改成功",sarBussionessStandEO);
@@ -375,13 +399,43 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
return "1";
}
@ApiOperation(value = "|SarBussionessStand|编号+名称组合为唯一标识（企业）")
@PostMapping("/selectOnlyInfo")
public ResponseMessage selectOnlyInfo (@RequestBody SarBussionessStand sarBussionessStand){
QueryWrapper<SarBussionessStand> wrapper=new QueryWrapper<>();
wrapper.eq(null!=sarBussionessStand.getStandName(),"STAND_NAME",sarBussionessStand.getStandName())
.eq(null!=sarBussionessStand.getStandNumber(),"STAND_NUMBER",sarBussionessStand.getStandNumber());
Integer s=sarBussionessStandEOService.count(wrapper);
if (s>0){
return Result.error("当前企业编号和中文名称已存在");
}else {
return Result.success();
}
}
@ApiOperation(value = "导入功能")
@PostMapping("/importSarBussionessStandFile")
public ResponseMessage<String> importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{
return sarBussionessStandEOService.importSarBussionessStandFile(file);
}
@ApiOperation(value = "|SarBussionessStand|判断原文译文")
@GetMapping("/emptyFileAnewStorage")
public ResponseMessage emptyFileAnewStorage (String type){
return sarBussionessStandEOService.emptyFileAnewStorage(type);
}
@ApiOperation(value = "|SarBussionessStand|老系统附件重复问题")
@GetMapping("/repetitionFile")
public ResponseMessage repetitionFile (){
return sarBussionessStandEOService.repetitionFile();
}
@ApiOperation(value = "|SarBussionessStand|新系统企业库（产品标准）附件重复问题")
@GetMapping("/newRpetitionFile")
public ResponseMessage newRpetitionFile (){
return sarBussionessStandEOService.newRpetitionFile();
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+8
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.sarBussionessStand.dao;
import com.adc.da.slrs.sarBussionessStand.entity.OldSystem;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO;
@@ -118,5 +119,12 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
int insertSelective(SarBussionessStand sarBussionessStandEO);
void importSarBussionessStand(SarBussionessStand sarBussionessStands);
List<OldSystem> selectListInfo();
List<OldSystem> getBussionessStandInfo();
void updateByIdInfo(@Param("strFile")String strFile, @Param("attfId")String attfId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+7 -2
View File
@@ -1,12 +1,12 @@
package com.adc.da.slrs.sarBussionessStand.service;
import com.adc.da.http.ResponseMessage;
import com.adc.da.search.entity.SarBussionessStandEO;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -53,7 +53,12 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
void convertDocAllQB(List<SarBussStandFile> list);
void checkFileByEncrypt();
ResponseMessage emptyFileAnewStorage(String type);
ResponseMessage<String> importSarBussionessStandFile(MultipartFile file)throws Exception;
ResponseMessage repetitionFile();
ResponseMessage newRpetitionFile();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+894 -316
View File
File diff suppressed because it is too large Load Diff
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/utils/SslUtils.java
+69
View File
@@ -0,0 +1,69 @@
package com.keepsoft.devbase.core.util;
import lombok.SneakyThrows;
import org.apache.commons.io.IOUtils;
import javax.net.ssl.*;
import java.io.OutputStreamWriter;
import java.net.URL;
import java.net.URLConnection;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
/**
* 此工具类用来解决，请求https时，ssl证书的问题
*/
public class SslUtils {
private static void trustAllHttpsCertificates() throws Exception {
TrustManager[] trustAllCerts = new TrustManager[1];
TrustManager tm = new miTM();
trustAllCerts[0] = tm;
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, null);
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
}
/**
* 忽略HTTPS请求的SSL证书，必须在openConnection之前调用
* @throws Exception
*/
@SneakyThrows
public static void ignoreSsl() {
HostnameVerifier hv = new HostnameVerifier() {
public boolean verify(String urlHostName, SSLSession session) {
System.out.println("Warning: URL Host: " + urlHostName + " vs. " + session.getPeerHost());
return true;
}
};
trustAllHttpsCertificates();
HttpsURLConnection.setDefaultHostnameVerifier(hv);
}
static class miTM implements TrustManager, X509TrustManager {
public X509Certificate[] getAcceptedIssuers() {
return null;
}
public boolean isServerTrusted(X509Certificate[] certs) {
return true;
}
public boolean isClientTrusted(X509Certificate[] certs) {
return true;
}
public void checkServerTrusted(X509Certificate[] certs, String authType)
throws CertificateException {
return;
}
public void checkClientTrusted(X509Certificate[] certs, String authType)
throws CertificateException {
return;
}
}
}
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/sarStandAttrInfo/entity/SarStandAttrInfo.java
-1
View File
@@ -238,5 +238,4 @@ public class SarStandAttrInfo extends BaseEntity {
@TableField("BDTBZH")
private String bdtbzh;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+1
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarStandIdea.service.Impl;
import com.adc.da.person.entity.TsPersonCollect;
import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaDao;
import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/controller/SarStandTranslateController.java
+81
View File
@@ -0,0 +1,81 @@
package com.adc.da.slrs.sarStandTranslate.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.slrs.StandardQA.entity.AskUser;
import com.adc.da.slrs.sarStandTranslate.entity.SarStandTranslate;
import com.adc.da.slrs.sarStandTranslate.service.SarStandTranslateService;
import com.adc.da.util.UUIDUtils;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
/**
* <p>
* 前端控制器
* </p>
*
* @author gjb
* @since 2023/2/23
*/
@RestController
@Api(tags = "流程中心-标准需求（翻译）申请流程")
@RequestMapping("/${restPath}/sarStandTranslate")
@Slf4j
public class SarStandTranslateController extends BaseController<SarStandTranslate> {
@Autowired
private SarStandTranslateService sarStandTranslateService;
/**
* 流程中心，标准需求翻译申请 发起
* @param
* @return
*/
@PostMapping("/addSarStandTranslate")
public ResponseMessage addSarStandTranslate(@RequestBody SarStandTranslate sarStandTranslate){
sarStandTranslate.setId(UUIDUtils.randomUUID20());
if(sarStandTranslateService.save(sarStandTranslate)){
return Result.success("200","添加成功",sarStandTranslate);
}else {
return Result.error("-1","添加失败",null);
}
}
/**
* 流程中心，标准需求翻译审核 回填
* @param
* @return
*/
@PostMapping("/selectSarStandTranslate")
public ResponseMessage selectSarStandTranslate(String id){
SarStandTranslate byId = sarStandTranslateService.getById(id);
if(byId!=null){
return Result.success("200",null,byId);
}else {
return Result.error("-1","失败",null);
}
}
/**
* 流程中心，标准需求翻译申请 审核
* @param
* @return
*/
@PostMapping("/updateSarStandTranslate")
public ResponseMessage updateSarStandTranslate(@RequestBody SarStandTranslate sarStandTranslate){
if(sarStandTranslateService.updateById(sarStandTranslate)){
return Result.success("200","成功",sarStandTranslate);
}else {
return Result.error("-1","失败",null);
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/dao/SarStandTranslateDao.java
+15
View File
@@ -0,0 +1,15 @@
package com.adc.da.slrs.sarStandTranslate.dao;
import com.adc.da.slrs.sarStandTranslate.entity.SarStandTranslate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author gjb
* @since 2023-02-23
*/
public interface SarStandTranslateDao extends BaseMapper<SarStandTranslate> {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java
+104
View File
@@ -0,0 +1,104 @@
package com.adc.da.slrs.sarStandTranslate.entity;
import com.adc.da.base.entity.BaseEntity;
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;
/**
* <p>
*
* </p>
* 标准需求翻译申请表
* @author gjb
* @since 2023-02-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarStandTranslate对象", description="")
public class SarStandTranslate extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId("ID")
private String id;
@ApiModelProperty(value = "申请人")
@TableField("PRORPSER_NAME")
private String proposerName;
@ApiModelProperty(value = "申请单位")
@TableField("PRORPSER_UNIT")
private String proposerUnit;
// @ApiModelProperty(value = "联系电话")
// @TableField("PHONE")
// private String phone;
//
// @ApiModelProperty(value = "邮箱")
// @TableField("MAIL")
// private String mail;
@ApiModelProperty(value = "类型")
@TableField("TYPE")
private String type;
@ApiModelProperty(value = "标准编号")
@TableField("STAND_NUMBER")
private String standNumber;
@ApiModelProperty(value = "标准名称")
@TableField("STAND_NAME")
private String standName;
@ApiModelProperty(value = "需求时间")
@TableField("NEED_TIME")
private String needTime;
@ApiModelProperty(value = "页数/字数")
@TableField("NUMBER_WORDS")
private String numberWords;
@ApiModelProperty(value = "原语言")
@TableField("INITIAL_LANGUAGE")
private String initialLanguage;
@ApiModelProperty(value = "目标语言")
@TableField("GOAL_LANGUAGE")
private String goalLanguage;
@ApiModelProperty(value = "费用出资项目目的项目名称")
@TableField("COST_GOAL_PROECT_NAME")
private String costGoalProectName;
@ApiModelProperty(value = "费用出资项目目的项目编号科目")
@TableField("COST_GOAL_PROECT_NUMBER")
private String costGoalProectNumber;
@ApiModelProperty(value = "是否批准")
@TableField("RATIFY")
private String ratify;
@ApiModelProperty(value = "申请理由")
@TableField("REASON")
private String reason;
@ApiModelProperty(value = "驳回理由")
@TableField("NOT_REASON")
private String notReason;
@ApiModelProperty(value = "费用")
@TableField("COST")
private String cost;
@ApiModelProperty(value = "审核人")
@TableField("AUDIT")
private String audit;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/SarStandTranslateService.java
+7
View File
@@ -0,0 +1,7 @@
package com.adc.da.slrs.sarStandTranslate.service;
import com.adc.da.slrs.sarStandTranslate.entity.SarStandTranslate;
import com.baomidou.mybatisplus.extension.service.IService;
public interface SarStandTranslateService extends IService<SarStandTranslate> {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/service/impl/SarStandTranslateServiceImpl.java
+19
View File
@@ -0,0 +1,19 @@
package com.adc.da.slrs.sarStandTranslate.service.impl;
import com.adc.da.slrs.sarStandTranslate.dao.SarStandTranslateDao;
import com.adc.da.slrs.sarStandTranslate.entity.SarStandTranslate;
import com.adc.da.slrs.sarStandTranslate.service.SarStandTranslateService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class SarStandTranslateServiceImpl extends ServiceImpl<SarStandTranslateDao, SarStandTranslate> implements SarStandTranslateService {
@Autowired
private SarStandTranslateDao sarStandTranslateDao;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+34 -1
View File
@@ -298,6 +298,14 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
} else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) {
sarStandardsInfoEO.setMenuId("22179d54d4e640098e29");
}
//校验编号和名称是否存在
QueryWrapper<SarStandardsInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber())
.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName());
Integer s1 = sarStandardsInfoEOService.count(queryWrapper);
if (s1>0){
return Result.error("当前标准编号和中文名称已存在");
}
sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO);
return Result.success("0", "添加成功", sarStandardsInfoEO);
}
@@ -307,6 +315,14 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarStandardsInfo:updateSarStandardsInfo")
public ResponseMessage<SarStandardsInfo> updateSarStandardsInfo(@RequestBody SarStandardsInfo sarStandardsInfoEO) throws Exception {
//校验编号和名称是否存在
QueryWrapper<SarStandardsInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber())
.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName());
List<SarStandardsInfo> list = sarStandardsInfoEOService.list(queryWrapper);
if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){
return Result.error("当前标准编号和中文名称已存在");
}
int result = sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO);
if (result > 0) {
return Result.success("", "修改成功", sarStandardsInfoEO);
@@ -882,11 +898,12 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
wrapper .eq("STAND_TYPE",page.getStandType())
.eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort())
.eq(null!=page.getStandName(),"STAND_NAME",page.getStandName())
.eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber())
.eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0);
Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){
return Result.error();
return Result.error("当前标准编号或中文名称已存在");
}else {
return Result.success();
}
@@ -925,4 +942,20 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
return "1";
}
@ApiOperation(value = "|SarStandardsInfoEO|编号+名称组合为唯一标识（国内海外）")
@PostMapping("/selectOnlyInfo")
public ResponseMessage selectOnlyInfo (@RequestBody SarStandardsInfo sarStandardsInfo){
QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
wrapper.eq(null!=sarStandardsInfo.getStandName(),"STAND_NAME",sarStandardsInfo.getStandName())
.eq(null!=sarStandardsInfo.getStandNumber(),"STAND_NUMBER",sarStandardsInfo.getStandNumber());
Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){
return Result.error("当前标准编号和中文名称已存在");
}else {
return Result.success();
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+10
View File
@@ -18,6 +18,7 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService;
import com.adc.da.slrs.sarStandFile.service.ISarStandFileService;
import com.adc.da.slrs.sarStandWarning.entity.WarningDate;
import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl;
import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController;
import com.adc.da.slrs.sarUser.entity.TsUser;
import com.adc.da.att.service.IAttFileEOService;
import com.adc.da.att.vo.AttFileVo;
@@ -259,6 +260,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private EncryptFileUtils encryptFileUtils;
// /**
// * 反向操作标准
// */
@@ -2373,6 +2375,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
List<SarStandardsInfo> list = (List<SarStandardsInfo>) map.get("resultList");
int countSuccess = 0;
for (SarStandardsInfo sarStandardsInfoEO : list) {
//校验编号和名称是否存在
QueryWrapper<SarStandardsInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber())
.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName());
Integer s1 = count(queryWrapper);
if (s1>0){
return Result.error("当前标准编号和中文名称已存在");
}
sarStandardsInfoEO.setStandType(standType);
sarStandardsInfoEO.setMenuId(menuId);
createSarStandardsInfo(sarStandardsInfoEO);
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-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+2
View File
@@ -56,6 +56,8 @@ public class FieldConvertUtil {
public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态";
public static String exportBaseFieldNamesBussCode = "起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称";
public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," +
"需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本";