diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ca2d6fdd..855101ea 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-zhaokaiyao") //@FeignClient(value = "shan") public interface workFlowFeignClient { diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java index d61654ca..36e4c5f1 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java @@ -1,63 +1,217 @@ -package com.adc.da.convert.mq; - -import com.adc.da.att.entity.AttFileEO; -import com.adc.da.att.service.IAttFileEOService; -import com.rabbitmq.client.Channel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.amqp.rabbit.annotation.Exchange; -import org.springframework.amqp.rabbit.annotation.Queue; -import org.springframework.amqp.rabbit.annotation.QueueBinding; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.messaging.Message; -import org.springframework.stereotype.Component; - -@Component -public class SendConvertMQService { - - // 文档转换远程服务IP地址 - @Value("${convert.host}") - private String convertHost; - - @Autowired - private IAttFileEOService iAttFileEOService; - - private static final Logger logger = LoggerFactory.getLogger(SendConvertMQService.class); - - @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createConvertStandMQ_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "convert-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "convert-key_SQ_GSAR")) - public void createMQ(AttFileEO attFileEO, Message message, Channel channel) throws Exception{ - try{ - try{ - Thread.sleep(5000); - insertOrUpdateStandInfo(attFileEO); - }catch(InterruptedException e){ - logger.error(e.toString()); - Thread.currentThread().interrupt(); - } - } catch (Exception e) { - logger.error("文档转换消息队列进入添加数据方法前失败！"); - logger.error(e.getMessage(),e); - }finally { - Long tag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(tag,false); - logger.debug("文档转换消息确认成功！！！！！！！！！"); - } - - } - - /** - * 文档转换逻辑 - * @param attFileEO - */ - public void insertOrUpdateStandInfo(AttFileEO attFileEO){ - - } - - -} +//package com.adc.da.convert.mq; +// +//import com.adc.da.att.entity.AttFileEO; +//import com.adc.da.att.service.IAttFileEOService; +//import com.adc.da.convert.common.DocConverterPdf; +//import com.adc.da.util.http.ResponseMessage; +//import com.adc.da.util.http.Result; +//import com.adc.da.util.utils.StringUtils; +//import com.rabbitmq.client.Channel; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.amqp.rabbit.annotation.Exchange; +//import org.springframework.amqp.rabbit.annotation.Queue; +//import org.springframework.amqp.rabbit.annotation.QueueBinding; +//import org.springframework.amqp.rabbit.annotation.RabbitListener; +//import org.springframework.amqp.support.AmqpHeaders; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.messaging.Message; +//import org.springframework.stereotype.Component; +// +//import java.io.File; +//import java.util.Date; +//import java.util.Map; +// +//@Component +//public class SendConvertMQService { +// +// // 文档转换远程服务IP地址 +// @Value("${convert.host}") +// private String convertHost; +// +// @Autowired +// private IAttFileEOService iAttFileEOService; +// +// private static final Logger logger = LoggerFactory.getLogger(SendConvertMQService.class); +// +// @RabbitListener(bindings = @QueueBinding( +// value = @Queue(value = "createConvertStandMQ_SQ_GSAR", durable = "true"), +// exchange = @Exchange(value = "convert-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"), +// key = "convert-key_SQ_GSAR")) +// public void createMQ(AttFileEO attFileEO, Message message, Channel channel) throws Exception{ +// try{ +// try{ +// Thread.sleep(5000); +// insertOrUpdateStandInfo(attFileEO); +// }catch(InterruptedException e){ +// logger.error(e.toString()); +// Thread.currentThread().interrupt(); +// } +// } catch (Exception e) { +// logger.error("文档转换消息队列进入添加数据方法前失败！"); +// logger.error(e.getMessage(),e); +// }finally { +// Long tag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); +// channel.basicAck(tag,false); +// logger.debug("文档转换消息确认成功！！！！！！！！！"); +// } +// +// } +// +// public void insertConvertMsg(Map convertInfo) throws Exception{ +// String attId = ""; +// String filePath = ""; +// String otId = ""; +// String addUpFlag = ""; +// String convertType = ""; +// String standFileClassify = ""; +// String lawsFileClassify = ""; +// //资源与文件关联表转换成功的ID +// String standFilePdfId = ""; +// if(convertInfo.get("attId") != null){ +// attId = convertInfo.get("attId").toString(); +// } +// if(convertInfo.get("path") != null){ +// filePath = convertInfo.get("path").toString(); +// } +// if(convertInfo.get("otId") != null){ +// otId = convertInfo.get("otId").toString(); +// } +// if(convertInfo.get("addUpFlag") != null){ +// addUpFlag = convertInfo.get("addUpFlag").toString(); +// } +// if(convertInfo.get("convertType") != null){ +// convertType = convertInfo.get("convertType").toString(); +// } +// if(convertInfo.get("standFilePdfId") != null){ +// standFilePdfId = convertInfo.get("standFilePdfId").toString(); +// } +// if(convertInfo.get("standFileClassify") != null){ +// standFileClassify = convertInfo.get("standFileClassify").toString(); +// } +// if(convertInfo.get("lawsFileClassify") != null){ +// lawsFileClassify = convertInfo.get("lawsFileClassify").toString(); +// } +// +// //更改完转换表信息后开始转换 +// OtConvertMqEO convertMqEO = new OtConvertMqEO(); +// if("0".equals(addUpFlag)){ +// convertMqEO.setLawsId(convertInfo.get("lawsId").toString()); +//// convertMqEO.setResId(convertInfo.get("resId").toString()); +// } +// convertMqEO.setConvertType(convertType); +// convertMqEO.setAttId(attId); +// convertMqEO.setOriAttId(attId); +// convertMqEO.setId(otId); +// convertMqEO.setFilePath(filePath); +// convertMqEO.setAddOrUp(addUpFlag); +// convertMqEO.setPdfId(standFilePdfId); +// convertMqEO.setStandFileClassify(standFileClassify); +// convertMqEO.setLawsFileClassify(lawsFileClassify); +// int i = Integer.valueOf(convertInfo.get("againNum").toString()); +// convertMqEO.setAgainNum(i); +// docUploadConvert(convertMqEO); +// } +// +// /** +// * @Author yangxuenan +// * @Description 文件转换 +// * Date 2018/8/21 15:51 +// * @Param [path] +// * @return com.adc.da.util.http.ResponseMessage +// **/ +// public ResponseMessage docUploadConvert(OtConvertMqEO convertMqEO) throws Exception{ +// //保存在数据库中的ID +// String path = localFilePath + convertMqEO.getFilePath(); +// String convertId = convertMqEO.getId(); +// try { +// //进入转换方法中，修改OT_CONVERT表中状态为转换中 +// convertMqEO.setId(convertId); +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(3); +// convertMqEOService.updateByPrimaryKeySelective(convertMqEO); +// //开始转换。。。。。。 +// if(!"".equals(path)){ +// String converfilename = path.replaceAll("\\\\", "/"); +// logger.info("*****上传路径:*******"+localFilePath); +// logger.info("************文件路径：**********" + convertMqEO.getFilePath()); +// logger.info("************接口：**********" + port); +// logger.info("*****上传路径替换，加入文件名*******"+converfilename); +// //截取文件类型 +// int index = converfilename.lastIndexOf("."); +// String fileType = converfilename.substring(index,converfilename.length()); +// String fileOriName = converfilename.substring(0,index); +// //调用转换类DocConverter,并将需要转换的文件传递给该类的构造方法 +// DocConverterPdf d = new DocConverterPdf(converfilename,fileType); +// d.setConvertHost(convertHost); +// //调用conver方法开始转换，先执行doc2pdf()将office文件转换为pdf;再执行pdf2swf()将pdf转换为swf; +// File getPdf = d.conver(fileType); +// //调用getswfPath()方法，打印转换后的swf文件路径 +// String dPath = d.getpdfPath(); +// logger.info("*****转换后的pdf文件路径*******"+dPath); +// //判断是否转换成功，修改数据状态 +// if(!dPath.isEmpty() && getPdf.length()>0){ +// // 上传转换后文件 +// String pdfId = attFileEOService.saveFileAttId(getPdf); +// logger.info("////////转换后文件id"+pdfId); +// int count = 0; +// if("0".equals(convertMqEO.getAddOrUp())){ +// count = insertConvertDocToFiles(convertMqEO,pdfId,fileOriName,fileType); +// } else { +// //查询之前在资源与文件关联表中是否有转换成功的数据，如果有执行修改，没有执行新增 +// if(StringUtils.isNotEmpty(convertMqEO.getPdfId())){ +// count = updateConvertDocToFIles(convertMqEO,pdfId); +// } else { +// count = insertConvertDocToFiles(convertMqEO,pdfId,fileOriName,fileType); +// } +// } +// convertMqEO.setId(convertId); +// if (count>0) { +// // 转换成功 +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(1); +// convertMqEOService.updateByPrimaryKeySelective(convertMqEO); +// } else { +// // 转换失败 +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(2); +// convertMqEOService.updateByPrimaryKeySelective(convertMqEO); +// } +// } else { +// // 转换失败 +// convertMqEO.setId(convertId); +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(2); +// convertMqEOService.updateByPrimaryKeySelective(convertMqEO); +// if(convertMqEO.getAgainNum()<=5){ +// throw new Exception("转换失败"); +// } +// } +// return Result.success(dPath); +// } else { +// logger.error("转换时未获取到文件路径！"); +// return Result.error("文件存储失败，请重试"); +// } +// } catch (Exception e) { +// // 转换失败 +// logger.error("转换过程中失败！"); +// logger.error(e.getMessage(),e); +// convertMqEO.setId(convertId); +// convertMqEO.setMqState(2); +// convertMqEOService.updateByPrimaryKeySelective(convertMqEO); +// this.restartUploadConvert(convertMqEO); +// return Result.error("r0072", "文件转换失败，请重试"); +// } +// } +// +// /** +// * 文档转换逻辑 +// * @param attFileEO +// */ +// public void insertOrUpdateStandInfo(AttFileEO attFileEO){ +// +// } +// +// +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/dao/OtConvertEODao.java b/adc-da-slrs/src/main/java/com/adc/da/mq/dao/OtConvertEODao.java index cfbbe4e4..502fcb5c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/dao/OtConvertEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/dao/OtConvertEODao.java @@ -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 { int deleteByAttId(String value); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java index 3be1eb92..0b9eb8fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java @@ -20,6 +20,22 @@ import java.util.Map; @Repository public interface SarBussStandAttrInfoDao extends BaseMapper { + 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 queryByList(SarBussStandAttrInfoEOPage page); List queryByPage(SarBussStandAttrInfoEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java index f5bf3845..23b127bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java @@ -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; /** *

@@ -11,6 +14,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author super_liu * @since 2021-07-25 */ +@Repository public interface SarBussStandFileDao extends BaseMapper { + List selectFileByStandId(String lawsId); + + List selectFileByStandIdAndId(SarBussStandFile laws); + + List selectFileByAttId(String attId); + + List selectFileMsgByAttId(String attId); + + List selectFileByResId(SarBussStandFile sarBussStandFileEO); + + int deleteByStandId(String standId); + + int insertForeach(List list); //批量新增 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/entity/SarBussStandFile.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/entity/SarBussStandFile.java index 74c407fd..81e1708e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/entity/SarBussStandFile.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/entity/SarBussStandFile.java @@ -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 idList = new ArrayList<>(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java index 1ffff18b..e03fc1cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java @@ -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; /** *

@@ -11,6 +14,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author super_liu * @since 2021-07-25 */ +@Repository public interface SarBussStandValDao extends BaseMapper { + //通过标准id删除表中数据 + int deleteDataByStandId(String standId); + + int insertForeach(List list); //批量新增 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/entity/SarBussStandVal.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/entity/SarBussStandVal.java index e867c4ff..8957346b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/entity/SarBussStandVal.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/entity/SarBussStandVal.java @@ -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; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 04e92d80..14d6e5a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -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 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 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 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查询标准详情 * diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index dd512fdd..b5a14085 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -18,6 +18,10 @@ import java.util.List; @Repository public interface SarBussionessStandDao extends BaseMapper { + SarBussionessStand selectByPrimaryKey(String standId); + + List selectStandardsByStandNumber(SarBussionessStand sarBussionessStand); + List selectStandardsInfoByKey(String id); List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 55f22bd5..08cf908a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -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 updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception; + + List selectStandardsByStandNumber(String replaceStandNum); + SarBussionessStand selectStandardsInfoByKey(String id) throws Exception; SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c16d1382..a20f5c1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -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= 1) { + // 修改属性表数据 + sarBussStandAttrInfoEODao.deleteStandAttrByStandId(standId); + + sarBussStandValEODao.deleteDataByStandId(standId); + + //删除文件详情表数据 + sarBussStandFileEODao.deleteByStandId(standId); + SarBussStandFile sarBussStandFileEO = new SarBussStandFile(); + sarBussStandFileEO.setStandId(standId); + sarBussStandFileEO.setIdList(null); + List 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 sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + StringBuilder fieldsBuilder = new StringBuilder(); + StringBuilder valuesBuilder = new StringBuilder(); + Map selectionMap = new HashMap<>(); + Map fileMap = new HashMap<>(); + Map multiTimeMap = new HashMap<>(); + String fileIds = ""; + for (Map.Entry 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 selectionMap) { + if (selectionMap != null && selectionMap.size() > 0) { + List standValList = new ArrayList<>(); + for (Map.Entry 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 fileMap) throws Exception { + if (fileMap != null && fileMap.size() > 0) { + List standFileList = new ArrayList<>(); + for (Map.Entry entry : fileMap.entrySet()) { + String value = entry.getValue(); + String field = entry.getKey(); + if (StringUtils.isNotBlank(value)) { + List 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 fileList,List 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 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 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 sarBussionessStandlist = this.baseMapper.selectStandardsInfoByKey(id); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java index 358a90b1..464d7fb9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java @@ -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 { @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ - List sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page); + List rows = ServiceImpl.querySarItemAndInterpretation(page); - return Result.success("200",sarItemVOS); + PageInfo pageInfo = getPageInfo(page.getPager(), rows); + + return Result.success(pageInfo); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 63a09bbd..ad550b86 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -24,7 +24,10 @@ import java.util.Set; @Repository public interface SarStandItemsDao extends BaseMapper { - List querySarItemAndInterpretation(FindSarItemsPageReqDTO page); + List querySarItemAndInterpretation(FindSarItemsPageReqDTO page); + + Integer sarItemCount(FindSarItemsPageReqDTO page); + List querySarStandItemsList(SarStandItemsEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 1ab1f864..27d00de4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -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; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java index 769d39c0..d63647ef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java @@ -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; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 441a01ac..4474b458 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -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) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index dce6e79b..abf3eaba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -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 querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ - return dao.querySarItemAndInterpretation(page); + public List querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + + + + Integer count=dao.sarItemCount(page); + page.getPager().setRowCount(count); + + + List sarStandItems = dao.querySarItemAndInterpretation(page); + return sarStandItems; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 5fa8089c..59218feb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -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 { List getSarStandardsInfoPage(SarStandardsInfoEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 1b2bddea..fb043141 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -267,13 +267,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + if(page.getMenuId() != null ){ QueryWrapper qw = new QueryWrapper<>(); qw.eq("ID",page.getMenuId()); qw.isNull("PARENT_ID"); List children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + List getMenuIdList = tsUserService.getResourceId(new TsResource()); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else { @@ -599,10 +599,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + + /** + * SarItemVO换为sarItemVOS + * List sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + * .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + */ + + List sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map 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 sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + + /** + * SarItemVO换为SarItemVOS + * List sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + * .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + */ + List sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map 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 getMenuIdList = new ArrayList<>(); - if(standardsInfoExcelVO.getUserId() != null){ - getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId()); - } + List getMenuIdList=tsUserService.getResourceId(new TsResource()); // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 248f06d6..d9e1adf8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -51,15 +51,14 @@ - + - - - + + @@ -68,23 +67,22 @@ - - SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo - + - SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,SAR_STAND_ITEMS.fo - + @@ -195,11 +193,11 @@ - - - - - + + + + + @@ -263,22 +261,22 @@ - update SAR_STAND_ITEMS - set modify_time = #{modifyTime}, - creation_time = #{creationTime}, - creation_user = #{creationUser}, - valid_flag = #{validFlag}, - remarks = #{remarks}, - responsible_unit = #{responsibleUnit}, - energy_kind = #{energyKind}, - apply_arctic = #{applyArctic}, - tack_time = #{tackTime}, - parts = #{parts}, - items_name = #{itemsName}, - items_num = #{itemsNum}, - stand_id = #{standId} - where id = #{id} - + update SAR_STAND_ITEMS + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + creation_user = #{creationUser}, + valid_flag = #{validFlag}, + remarks = #{remarks}, + responsible_unit = #{responsibleUnit}, + energy_kind = #{energyKind}, + apply_arctic = #{applyArctic}, + tack_time = #{tackTime}, + parts = #{parts}, + items_name = #{itemsName}, + items_num = #{itemsNum}, + stand_id = #{standId} + where id = #{id} + @@ -363,10 +361,13 @@ - delete from SAR_STAND_ITEMS - where id = #{value} + delete from SAR_STAND_ITEMS + where id = #{value} + + + + - - + SELECT COUNT( 1 ) FROM sar_stand_items + + + + + + @@ -742,10 +753,10 @@ a.STAND_ID FROM sar_stand_items a - LEFT JOIN sar_standards_info b - on a.STAND_ID=b.ID + LEFT JOIN sar_standards_info b + on a.STAND_ID=b.ID WHERE b.VALID_FLAG = 0 - and a.FILE_TYPE ='FBGBJBD' + and a.FILE_TYPE ='FBGBJBD' GROUP BY a.STAND_ID limit #{page},#{size} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandFile/SarBussStandFileMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandFile/SarBussStandFileMapper.xml index 69368ce3..f5f571df 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandFile/SarBussStandFileMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandFile/SarBussStandFileMapper.xml @@ -1,5 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, use_model, att_id, stand_id, id,file_suffix,file_name,stand_file_classify, + password,creation_user,ori_att_id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and use_model ${useModuleOperator} #{useModule} + + + and att_id ${attIdOperator} #{attId} + + + and res_id ${resIdOperator} #{resId} + + + and stand_id ${standIdOperator} #{standId} + + + and id ${idOperator} #{id} + + + + + + insert into SAR_BUSS_STAND_FILE + + modify_time, + creation_time, + valid_flag, + use_model, + att_id, + stand_id, + id, + file_suffix, + file_name, + stand_file_classify, + password, + creation_user, + ori_att_id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{useModule, jdbcType=VARCHAR}, + #{attId, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{fileSuffix, jdbcType=VARCHAR}, + #{fileName, jdbcType=VARCHAR}, + #{standFileClassify, jdbcType=VARCHAR}, + #{password, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{oriAttId, jdbcType=VARCHAR}, + + + + + + update SAR_BUSS_STAND_FILE + + + ori_att_id = #{oriAttId}, + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + use_model = #{useModule}, + + + att_id = #{attId}, + + + stand_id = #{standId}, + + + where id = #{id} + + + + + + + + delete from SAR_BUSS_STAND_FILE + where id = #{value} + + + + + + + + + + + + + + + + + + + + + + + + delete from SAR_BUSS_STAND_FILE + where stand_id = #{value} + + + + + insert into SAR_BUSS_STAND_FILE + () + values + + (#{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.creationTime, jdbcType=TIMESTAMP}, + #{item.validFlag, jdbcType=INTEGER}, + #{item.useModel, jdbcType=VARCHAR}, + #{item.attId, jdbcType=VARCHAR}, + #{item.standId, jdbcType=VARCHAR}, + #{item.id, jdbcType=VARCHAR}, + #{item.fileSuffix, jdbcType=VARCHAR}, + #{item.fileName, jdbcType=VARCHAR}, + #{item.standFileClassify, jdbcType=VARCHAR}, + #{item.password, jdbcType=VARCHAR}, + #{item.creationUser, jdbcType=VARCHAR}, + #{item.oriAttId, jdbcType=VARCHAR}) + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandVal/SarBussStandValMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandVal/SarBussStandValMapper.xml index 0ef07061..904713a3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandVal/SarBussStandValMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandVal/SarBussStandValMapper.xml @@ -2,4 +2,134 @@ + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, property_value, property_type, stand_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and property_value ${propertyValueOperator} #{propertyValue} + + + and property_type ${propertyTypeOperator} #{propertyType} + + + and stand_id ${standIdOperator} #{standId} + + + and id ${idOperator} #{id} + + + + + + + insert into SAR_BUSS_STAND_VAL() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{propertyValue, jdbcType=VARCHAR}, #{propertyType, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + + + + + insert into SAR_BUSS_STAND_VAL + + modify_time, + creation_time, + valid_flag, + property_value, + property_type, + stand_id, + id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{propertyValue, jdbcType=VARCHAR}, + #{propertyType, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + + + + + + + + + + + + delete from SAR_BUSS_STAND_VAL + where stand_id = #{standId} + + + + insert into SAR_BUSS_STAND_VAL + () + values + + (#{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.creationTime, jdbcType=TIMESTAMP}, + #{item.validFlag, jdbcType=INTEGER}, + #{item.propertyValue, jdbcType=VARCHAR}, + #{item.propertyType, jdbcType=VARCHAR}, + #{item.standId, jdbcType=VARCHAR}, + #{item.id, jdbcType=VARCHAR}) + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 4a8b266e..04eea3a6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -675,7 +675,7 @@ -