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

Merge remote-tracking branch 'origin/develop_master' into develop_1

Browse Source
This commit is contained in:
yanyizhou
2021-08-23 09:47:05 +08:00
parent 23365ffa16 a242b9ac56
commit 67dc9c829a
63 changed files with 2080 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/mq/service/CreateMQService.java → adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java
+5 -5
View File
@@ -1,7 +1,7 @@
package com.adc.da.mq.service;
package com.adc.da.mq;
import com.adc.da.common.ConvertMqEO;
import com.adc.da.mq.dao.OtConvertEODao;
import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.adc.da.util.UUIDUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.amqp.core.AmqpTemplate;
@@ -18,7 +18,7 @@ public class CreateMQService {
private AmqpTemplate rabbitTemplate;
@Autowired
private OtConvertEODao otConvertEODao;
private OtConvertMqDao otConvertEODao;
/**
* @Author yangxuenan
* @Description 创建消息队列
@@ -26,7 +26,7 @@ public class CreateMQService {
* @Param [convert, convertType]
* @return int
**/
public void sendMQ(ConvertMqEO convert) throws Exception{
public void sendMQ(OtConvertMq convert) throws Exception{
String otId = UUIDUtils.randomUUID20();
//向OT_CONVERT_EO表中添加/修改数据
//判断用户是初次发送还是重新发送,初次将添加到数据库，重新发送将修改原数据信息
adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java
+57
View File
@@ -0,0 +1,57 @@
package com.adc.da.mq;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
import net.sf.json.JSONObject;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
@Component
public class CreateStandMQService {
@Autowired
private AmqpTemplate rabbitTemplate;
/**
*
* @param sarStandardsInfoEO 标准实体
* @param addOrUpdate
* @throws Exception
*/
public void sendStandMQ(Object sarStandardsInfoEO, String addOrUpdate) throws Exception{
JSONObject json = JSONObject.fromObject(sarStandardsInfoEO);
String sarStandardsInfoStr = json.toString();
Map<String,Object> standMap = new HashMap<String,Object>();
standMap.put("sarStandards", sarStandardsInfoStr);
standMap.put("addOrUpdate", addOrUpdate);
//发送消息队列
this.rabbitTemplate.convertAndSend("stand-exchange_SQ_GSAR", "stand-key_SQ_GSAR", standMap);
}
public void sendLawsMQ(SarLawsInfo sarLawsInfoEO, String addOrUpdate) throws Exception{
JSONObject json = JSONObject.fromObject(sarLawsInfoEO);
String sarLawsInfoStr = json.toString();
Map<String,Object> lawsMap = new HashMap<String,Object>();
lawsMap.put("sarLaws", sarLawsInfoStr);
lawsMap.put("addOrUpdate", addOrUpdate);
//发送消息队列
this.rabbitTemplate.convertAndSend("laws-exchange_SQ_GSAR", "laws-key_SQ_GSAR", lawsMap);
}
public void sendBussStandMQ(SarBussionessStand sarBussionessStandEO, String addOrUpdate) throws Exception{
JSONObject json = JSONObject.fromObject(sarBussionessStandEO);
String sarBussInfoStr = json.toString();
Map<String,Object> bussMap = new HashMap<String,Object>();
bussMap.put("sarBuss", sarBussInfoStr);
bussMap.put("addOrUpdate", addOrUpdate);
//发送消息队列
this.rabbitTemplate.convertAndSend("buss-exchange_SQ_GSAR", "buss-key_SQ_GSAR", bussMap);
}
}
adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
+290
View File
@@ -0,0 +1,290 @@
package com.adc.da.mq;
import com.adc.da.slrs.otSvpps.service.IOtSvppsService;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.utils.util.InitStandAttrUtil;
import com.rabbitmq.client.Channel;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.json.JSONTokener;
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.messaging.Message;
import org.springframework.stereotype.Component;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Component
public class SendBussMQService {
@Autowired
private ISarStandardsInfoService sarStandardsInfoService;
@Autowired
private SysInfoEOService sysInfoEOService;
@Autowired
private DicTypeEODao dicTypeEODao;
@Autowired
private IOtSvppsService otSvppsEOService;
private static final Logger logger = LoggerFactory.getLogger(SendBussMQService.class);
@RabbitListener(bindings = @QueueBinding(
value = @Queue(value = "createBussMQ_SQ_GSAR", durable = "true"),
exchange = @Exchange(value = "buss-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"),
key = "buss-key_SQ_GSAR"))
public void createMQ(Map<String,Object> bussMap, Message message, Channel channel) throws Exception{
try{
try{
Thread.sleep(5000);
insertOrUpdateBussInfo(bussMap);
}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 insertOrUpdateBussInfo(Map<String,Object> bussMap) throws Exception {
String addOrUpdate = bussMap.get("addOrUpdate").toString();
String FZRQFSRQ = null;
if ("updateFromAct".equals(addOrUpdate)){
addOrUpdate = "update";
FZRQFSRQ = "1";
}
String sarBuss = bussMap.get("sarBuss").toString();
JSONObject jsonobject = JSONObject.fromObject(sarBuss);
SarBussionessStand infoEO = (SarBussionessStand) JSONObject.toBean(jsonobject, SarBussionessStand.class);
String jsonobject1 = infoEO.getSarStandAttrEOStr();
Map<String,Object> map1 = new HashMap<>();
if (StringUtils.isEmpty(jsonobject1)){
map1.put("null","null");
}else {
map1 = JSONObject.fromObject(jsonobject1);
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//修改索引信息表
// 往索引表中插入数据
String baseSearchContent = "";
String getCodeName = "";
Map<String,Object> saveMap = new HashMap<>();
String a = null;
try{
a = sdf.format(infoEO.getIssueTime());
saveMap.put("issue_time"," "+a);
}catch (Exception e){
saveMap.put("issue_time"," ");
}
//发布日期 高级查询
Date issue_time_data = null;
if (StringUtils.isNotBlank(a)) {
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
issue_time_data = format.parse(saveMap.get("issue_time")+" 00:00:00");
} catch (ParseException ignored) {
}
}
if (issue_time_data != null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(issue_time_data);
int month = calendar.get(Calendar.MONTH)+1;
String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH));
saveMap.put("issue_time_data",Long.valueOf(times));
}else{
saveMap.put("issue_time_data",-1000000000000000000L);
}
try{
saveMap.put("put_time"," "+ sdf.format(infoEO.getPutTime()));
}catch (Exception e){
saveMap.put("put_time"," ");
}
//实施日期 高级查询
Date put_time_data = null;
if (StringUtils.isNotBlank(a)) {
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
put_time_data = format.parse(saveMap.get("put_time")+" 00:00:00");
} catch (ParseException ignored) {
}
}
if (put_time_data != null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(put_time_data);
int month = calendar.get(Calendar.MONTH)+1;
String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH));
saveMap.put("put_time_data",Long.valueOf(times));
}else{
saveMap.put("put_time_data",-1000000000000000000L);
}
// saveMap.put("put_time",sdf.format(infoEO.getPutTime()));
saveMap.put("id",infoEO.getId());
saveMap.put("standSort",infoEO.getStandSort());
saveMap.put("stand_sort",infoEO.getStandSort());
if(StringUtils.isNotEmpty(infoEO.getStandSort())){
String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandSort());
saveMap.put("standSortShow",codeName);
getCodeName = codeName;
}
saveMap.put("standYear",infoEO.getStandYear());
saveMap.put("stand_year",infoEO.getStandYear());
saveMap.put("standNumber",infoEO.getStandCode());
saveMap.put("stand_code",infoEO.getStandCode());
saveMap = dealNumberMsg(saveMap,infoEO,getCodeName);
saveMap.put("nameshow",infoEO.getStandName());
saveMap.put("stand_name",infoEO.getStandName());
saveMap.put("standEnName",infoEO.getStandEnName());
saveMap.put("stand_en_name",infoEO.getStandEnName());
saveMap.put("replaceStandNum",infoEO.getReplaceStandNum());
saveMap.put("replace_stand_num",infoEO.getReplaceStandNum());
saveMap.put("replacedStandNum",infoEO.getReplacedStandNum());
saveMap.put("replaced_stand_num",infoEO.getReplacedStandNum());
saveMap.put("statecode",infoEO.getStandStatus());
saveMap.put("stand_status",infoEO.getStandStatus());
if (StringUtils.isNotEmpty(infoEO.getStandStatus())) {
String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandStatus());
saveMap.put("standstateshow",codeName);
}
//新加字段
saveMap.put("country",infoEO.getApplyCountry());
if(StringUtils.isNotEmpty(infoEO.getApplyCountry())){
String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getApplyCountry());
saveMap.put("countryShow",codeName);
}
// 自定义属性字段
String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
Map<String,Object> infoMap = infoEO.getAttrInfoMap();
if (attrInfoMap != null && !attrInfoMap.isEmpty()) {
attrInfoMap = sysInfoEOService.changeSelectInfo(attrInfoMap, "stand",baseSearchContent);
saveMap.putAll(attrInfoMap);
}
saveMap.put("type","bussstand");
saveMap.put("validFlag","0");
saveMap.put("content",infoEO.getFileIds());
String fieldInfo = InitStandAttrUtil.queryField;
List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
// 动态存储属性字段
for (String field : fieldInfoList) {
saveMap.put(field,attrInfoMap.getOrDefault(field,""));
String fieldValue = "";
if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){
Object json= new JSONTokener(infoMap.get(field).toString()).nextValue();
if(!json.toString().equals("null")){
fieldValue = infoMap.get(field).toString();
}
}
saveMap.put(field+"Name",fieldValue);
}
//当建立代替时，产生的没有文件的问题
if (StringUtils.isBlank(String.valueOf(saveMap.get("content")))) {
String context = filterStringIsNotBlank(String.valueOf(saveMap.get("FBGBUSS")),true)
+ filterStringIsNotBlank(String.valueOf(saveMap.get("BZSMBUSS")),true)
+ filterStringIsNotBlank(String.valueOf(saveMap.get("LSBBBUSS")),true)
+ filterStringIsNotBlank(String.valueOf(saveMap.get("QTWJBUSS")),true)
+ filterStringIsNotBlank(String.valueOf(saveMap.get("GLWJBUSS")),true);
context = context.replace(",,", ",");
saveMap.put("content", context);
}
if("add".equals(addOrUpdate)){
sarStandardsInfoService.insertIntoIndexForMap(saveMap);
} else {
sarStandardsInfoService.updateIntoIndexForMap(saveMap);
}
}
private String filterStringIsNotBlank(String str,boolean boo){
String f = ",";
return (str == null || str.equals("") || str.equals("null")) ? "" : (boo ? str+f : str);
}
private String dateFormatToStr(String dateStr){
if(dateStr == null || dateStr.equals("")){
return "";
}
String dateToStr = "";
try {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
dateToStr = dateFormat.format(dateFormat.parse(dateStr.trim().substring(0,10)));
}catch (Exception e){
e.getMessage();
}
return dateToStr;
}
public Map<String,Object> dealNumberMsg (Map<String,Object> saveMap,SarBussionessStand infoEO,String getCodeName) {
/*if(StringUtils.isNotEmpty(infoEO.getStandYear())){
String num = getCodeName + " " + infoEO.getStandCode() + "-" + infoEO.getStandYear();
saveMap.put("numbershow",num);
int index = infoEO.getStandCode().indexOf(".");
int index1 = infoEO.getStandCode().indexOf(":");
String numberExpNull = "";
if(index > -1){
numberExpNull = getCodeName + infoEO.getStandCode() + "-" + num.replaceAll(" ","")
+ "-" + getCodeName + infoEO.getStandCode().substring(0,index) + "-" + infoEO.getStandCode().substring(0,index);
}else if(index1 > -1){
numberExpNull = getCodeName + infoEO.getStandCode() + "-" + num.replaceAll(" ","")
+ "-" + getCodeName + infoEO.getStandCode().substring(0,index1) + "-" + infoEO.getStandCode().substring(0,index1);
}else{
numberExpNull = getCodeName + infoEO.getStandCode() + "-" + num.replaceAll(" ","");
}
} else {
String number = getCodeName + " " + infoEO.getStandCode();
saveMap.put("numbershow",number);
String numberExpNull = "";
int index = infoEO.getStandCode().indexOf(".");
if(index > -1){
numberExpNull = getCodeName + infoEO.getStandCode() + "-" + number.replaceAll(" ","")
+ "-" + getCodeName + infoEO.getStandCode().substring(0,index) + "-" + infoEO.getStandCode().substring(0,index);
}else{
numberExpNull = getCodeName + infoEO.getStandCode() + "-" + number.replaceAll(" ","");
}
saveMap.put("numberExpNull",numberExpNull);
}*/
String number = infoEO.getStandCode();
saveMap.put("numbershow",number);
String numberExpNull = "";
int index = infoEO.getStandCode().indexOf(".");
if(index > -1){
numberExpNull = infoEO.getStandCode() + "-" + number.replaceAll(" ","")
+ "-" + infoEO.getStandCode().substring(0,index) + "-" + infoEO.getStandCode().substring(0,index);
}else{
numberExpNull = infoEO.getStandCode() + "-" + number.replaceAll(" ","");
}
saveMap.put("numberExpNull",numberExpNull);
return saveMap;
}
}
adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java → adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
+1 -2
View File
@@ -1,6 +1,5 @@
package com.adc.da.mq.service;
package com.adc.da.mq;
import com.adc.da.slrs.otSvpps.entity.OtSvpps;
import com.adc.da.slrs.otSvpps.service.IOtSvppsService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
adc-da-slrs/src/main/java/com/adc/da/mq/dao/OtConvertEODao.java
-12
View File
@@ -1,12 +0,0 @@
package com.adc.da.mq.dao;
import com.adc.da.common.ConvertMqEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
@Repository
public interface OtConvertEODao extends BaseMapper<ConvertMqEO> {
int deleteByAttId(String value);
}
adc-da-slrs/src/main/java/com/adc/da/mq/service/CreateStandMQService.java
-32
View File
@@ -1,32 +0,0 @@
package com.adc.da.mq.service;
import net.sf.json.JSONObject;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
@Component
public class CreateStandMQService {
@Autowired
private AmqpTemplate rabbitTemplate;
/**
*
* @param sarStandardsInfoEO 标准实体
* @param addOrUpdate
* @throws Exception
*/
public void sendStandMQ(Object sarStandardsInfoEO, String addOrUpdate) throws Exception{
JSONObject json = JSONObject.fromObject(sarStandardsInfoEO);
String sarStandardsInfoStr = json.toString();
Map<String,Object> standMap = new HashMap<String,Object>();
standMap.put("sarStandards", sarStandardsInfoStr);
standMap.put("addOrUpdate", addOrUpdate);
//发送消息队列
this.rabbitTemplate.convertAndSend("stand-exchange_SQ_GSAR", "stand-key_SQ_GSAR", standMap);
}
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+136
View File
@@ -0,0 +1,136 @@
package com.adc.da.scheduled;
import com.adc.da.scheduled.dao.SarStandardInfoDao;
import com.adc.da.scheduled.dao.SarStandardItemDao;
import com.adc.da.scheduled.dao.SarStandardWarningDao;
import com.adc.da.scheduled.entity.DataDTO;
import com.adc.da.scheduled.entity.WarningEO;
import com.adc.da.util.UUIDUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.util.LinkedList;
import java.util.List;
@EnableScheduling
@Component
@Slf4j
public class ScheduledJob {
/**
* 根据配置文件设置是否开启定时器
*/
@Value("${isNotScheduled}")
private boolean isNotScheduled; //是否开启定时器
//
// @Scheduled(cron="*/5 * * * * ?")
// @Async
// public void StandScheduledJob(){
// System.out.println("hello");
//// if(isNotScheduled){
//// System.out.println(Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---START-01");
//// System.out.println(Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---End-01");
//// try{
//// Thread.sleep(2000);
//// }catch(Exception e){
//// }
//// }
// }
@Autowired
private SarStandardWarningDao sarStandardWarningDao;
@Autowired
private SarStandardItemDao sarStandardItemDao;
@Autowired
private SarStandardInfoDao sarStandardInfoDao;
@Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
// @Scheduled(cron="*/5 * * * * ?")
@Async
public void schedulingTasks() {
/**
* 1.查询标准属性字段表(sar_stand_attr_info) XCXSSEQ ZCCSSRQ ZRGCS
* 联接标准信息表sar_standards_info表的STAND_NAME
* 2.查询分解单(条款表)
* 3.查询预警表
* 4.去掉预警表中已存在的的数据
* 5.插入预警表
*/
/**
mark:标识预警的种类
3：新车标准预警
4：在产车标准预警
1：新车条款预警
2：在产车条款预警
*/
System.out.println("开始执行预警!!!");
//预警期限
DataDTO dataDTO = new DataDTO();
dataDTO.setStartDate(LocalDate.now().plusDays(1)) //系统日期的下一天
.setEndDate(LocalDate.now().plusMonths(3).plusDays(1));//系统日期3个月后
LinkedList<WarningEO> warningList = new LinkedList<>();
//分解单(条款) 新车型 mark=1
List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.select(dataDTO, "XCXSSRQ");
for (WarningEO warningEO : itemForXCXSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("1")
.setPutTime(warningEO.getXCXSSRQ());
}
warningList.addAll(itemForXCXSSRQ);
//分解单(条款) 在产车型 mark=2
List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.select(dataDTO, "ZCCSSRQ");
for (WarningEO warningEO : itemForZCCSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("2")
.setPutTime(warningEO.getZCCSSRQ());
}
warningList.addAll(itemForZCCSSRQ);
//标准 新车型 预警 mark=3
List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.select(dataDTO, "XCXSSRQ");
for (WarningEO warningEO : standInfoXCXSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("3")
.setPutTime(warningEO.getXCXSSRQ());
}
warningList.addAll(standInfoXCXSSRQ);
//标准 在产车型 mark=4
List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.select(dataDTO, "ZCCSSRQ");
for (WarningEO warningEO : standInfoZCCSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("4")
.setPutTime(warningEO.getZCCSSRQ());
}
warningList.addAll(standInfoZCCSSRQ);
//持久化至预警表 忽略标准id和标志位都一样的数据
if (warningList.size()!=0){
int count = sarStandardWarningDao.ignoreInsert(warningList);
System.out.println("已预警 " + count + " 条标准或条款!!");
}
}
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java
+17
View File
@@ -0,0 +1,17 @@
package com.adc.da.scheduled.dao;
import com.adc.da.scheduled.entity.DataDTO;
import com.adc.da.scheduled.entity.WarningEO;
import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface SarStandardInfoDao{
public List<WarningEO> select(DataDTO date, String str);
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java
+17
View File
@@ -0,0 +1,17 @@
package com.adc.da.scheduled.dao;
import com.adc.da.scheduled.entity.DataDTO;
import com.adc.da.scheduled.entity.WarningEO;
import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface SarStandardItemDao extends BaseMapper{
public List<WarningEO> select(DataDTO date, String str);
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java
+15
View File
@@ -0,0 +1,15 @@
package com.adc.da.scheduled.dao;
import com.adc.da.scheduled.entity.WarningEO;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.LinkedList;
@Repository
public interface SarStandardWarningDao extends IService<WarningEO> {
public int ignoreInsert(@Param(value = "warningEOS") LinkedList<WarningEO> warningEOS);
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java
+18
View File
@@ -0,0 +1,18 @@
package com.adc.da.scheduled.entity;
import lombok.Data;
import lombok.experimental.Accessors;
import java.time.LocalDate;
@Data
@Accessors(chain = true)
public class DataDTO {
private LocalDate startDate;
private LocalDate endDate;
private String str;
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java
+22
View File
@@ -0,0 +1,22 @@
package com.adc.da.scheduled.entity;
import com.adc.da.base.entity.BaseEntity;
import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.experimental.Accessors;
import lombok.experimental.SuperBuilder;
import java.util.Date;
@Data
@Accessors(chain = true)
public class WarningEO extends EarlyWarningEO {
private static final long serialVersionUID = 1L;
private Date XCXSSRQ;
private Date ZCCSSRQ;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/otConvertMq/controller/OtConvertMqController.java
+23
View File
@@ -0,0 +1,23 @@
package com.adc.da.slrs.otConvertMq.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 文档转换记录信息表 前端控制器
* </p>
*
* @author super_liu
* @since 2021-08-20
*/
@RestController
@Api(tags = "|OtConvertMq|")
@RequestMapping("/otConvertMq/ot-convert-mq")
public class OtConvertMqController extends BaseController<OtConvertMq> {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/otConvertMq/dao/OtConvertMqDao.java
+20
View File
@@ -0,0 +1,20 @@
package com.adc.da.slrs.otConvertMq.dao;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
/**
* <p>
* 文档转换记录信息表 Mapper 接口
* </p>
*
* @author super_liu
* @since 2021-08-20
*/
@Repository
public interface OtConvertMqDao extends BaseMapper<OtConvertMq> {
int deleteByAttId(String value);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/otConvertMq/entity/OtConvertMq.java
+100
View File
@@ -0,0 +1,100 @@
package com.adc.da.slrs.otConvertMq.entity;
import com.adc.da.base.entity.BaseEntity;
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 org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* <p>
* 文档转换记录信息表
* </p>
*
* @author super_liu
* @since 2021-08-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="OtConvertMq对象", description="文档转换记录信息表")
public class OtConvertMq extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId("ID")
private String id;
@ApiModelProperty(value = "消息队列编码")
@TableField("MQ_CODE")
private String mqCode;
@ApiModelProperty(value = "队列状态")
@TableField("MQ_STATE")
private Integer mqState;
@TableField("USER_ID")
private String userId;
@ApiModelProperty(value = "文件路径")
@TableField("FILE_PATH")
private String filePath;
@ApiModelProperty(value = "文件ID")
@TableField("ATT_ID")
private String attId;
@ApiModelProperty(value = "是否有效")
@TableField("VALID_FLAG")
private Integer validFlag;
@ApiModelProperty(value = "创建时间")
@TableField("CREATION_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date creationTime;
@ApiModelProperty(value = "修改时间")
@TableField("MODIFY_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
@TableField(exist = false)
private String fileOriginPath;
//向文件表添加信息
@TableField(exist = false)
private String lawsId;
@TableField(exist = false)
private String resId;
@TableField(exist = false)
private String convertType;
@TableField(exist = false)
private String pdfPath;
@TableField(exist = false)
private String pdfId;
@TableField(exist = false)
private String addOrUp;
@TableField(exist = false)
private String oldFileName;
@TableField(exist = false)
private String standFileClassify;
@TableField(exist = false)
private String lawsFileClassify;
@TableField(exist = false)
private String oriAttId;
@TableField(exist = false)
private int againNum;
@TableField(exist = false)
private String fileSuffix;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/otConvertMq/service/IOtConvertMqService.java
+16
View File
@@ -0,0 +1,16 @@
package com.adc.da.slrs.otConvertMq.service;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 文档转换记录信息表 服务类
* </p>
*
* @author super_liu
* @since 2021-08-20
*/
public interface IOtConvertMqService extends IService<OtConvertMq> {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/otConvertMq/service/impl/OtConvertMqServiceImpl.java
+20
View File
@@ -0,0 +1,20 @@
package com.adc.da.slrs.otConvertMq.service.impl;
import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.adc.da.slrs.otConvertMq.service.IOtConvertMqService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 文档转换记录信息表 服务实现类
* </p>
*
* @author super_liu
* @since 2021-08-20
*/
@Service
public class OtConvertMqServiceImpl extends ServiceImpl<OtConvertMqDao, OtConvertMq> implements IOtConvertMqService {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java
+49 -2
View File
@@ -1,12 +1,28 @@
package com.adc.da.slrs.sarBussStandFile.controller;
import com.adc.da.att.entity.AttFileEO;
import com.adc.da.att.service.IAttFileEOService;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarBussStandFile.service.ISarBussStandFileService;
import com.adc.da.slrs.standardSplit.controller.SarStandFileEOController;
import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService;
import com.adc.da.slrs.standardSplit.service.SarStandFileEOService;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
import java.util.List;
/**
* <p>
* 企业标准文件详情表 前端控制器
@@ -16,8 +32,39 @@ import com.adc.da.base.web.BaseController;
* @since 2021-07-25
*/
@RestController
@Api(description = "|SarBussStandFile|")
@RequestMapping("/sarBussStandFile/sar-buss-stand-file")
@Api(tags = "|SarBussStandFile|")
@RequestMapping("/${restPath}/lawss/sarBussStandFile")
public class SarBussStandFileController extends BaseController<SarBussStandFile> {
private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOController.class);
@Autowired
private IAttFileEOService attFileEOService;
@Autowired
private SarStandAttrDetailsEOService sarStandAttrDetailsEOService;
public static final String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8";
@Autowired
private ISarBussStandFileService sarBussStandFileEOService;
@ApiOperation(value = "|SarBussStandFileEO|查询转换后的文档详情")
@GetMapping("/queryConvertAtt")
/*@RequiresPermissions("lawss:sarLawsFile:list")*/
public ResponseMessage<SarBussStandFile> queryConvertAtt(String attId) throws Exception {
List<SarBussStandFile> getList = sarBussStandFileEOService.selectFileByAttId(attId);
SarBussStandFile sarBussStandFileEO = new SarBussStandFile();
if(getList != null && !getList.isEmpty()){
sarBussStandFileEO = getList.get(0);
AttFileEO attFileEO = attFileEOService.getFileInfo(attId);
if(attFileEO != null){
sarBussStandFileEO.setFileOldName(attFileEO.getOldFileName());
}
// readStandOrLawsLogService.sendReadSOLLog("BUSS",sarBussStandFileEO);
return Result.success(sarBussStandFileEO);
} else {
return Result.success(null);
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java
+4
View File
@@ -30,4 +30,8 @@ public interface SarBussStandFileDao extends BaseMapper<SarBussStandFile> {
int deleteByStandId(String standId);
int insertForeach(List<SarBussStandFile> list); //批量新增
int insertSelective(SarBussStandFile sarBussStandFile);
int updateByPrimaryKeySelective(SarBussStandFile sarBussStandFile);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/entity/SarBussStandFile.java
+10 -1
View File
@@ -67,7 +67,7 @@ public class SarBussStandFile extends BaseEntity {
@ApiModelProperty(value = "是否有效")
@TableField("VALID_FLAG")
private String validFlag;
private Integer validFlag;
@ApiModelProperty(value = "创建时间")
@TableField("CREATION_TIME")
@@ -86,4 +86,13 @@ public class SarBussStandFile extends BaseEntity {
@TableField(exist = false)
private List<String> idList = new ArrayList<>();
@TableField(exist = false)
private String useModule;
@TableField(exist = false)
private String resId;
@TableField(exist = false)
private Integer pageCount;
@TableField(exist = false)
private String fileOldName;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java
+4
View File
@@ -3,6 +3,8 @@ package com.adc.da.slrs.sarBussStandFile.service;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 企业标准文件详情表 服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ISarBussStandFileService extends IService<SarBussStandFile> {
List<SarBussStandFile> selectFileByAttId(String attId) throws Exception;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java
+10
View File
@@ -4,8 +4,11 @@ import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
import com.adc.da.slrs.sarBussStandFile.service.ISarBussStandFileService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 企业标准文件详情表 服务实现类
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
@Service
public class SarBussStandFileServiceImpl extends ServiceImpl<SarBussStandFileDao, SarBussStandFile> implements ISarBussStandFileService {
@Autowired
private SarBussStandFileDao sarStandFileEODao;
@Override
public List<SarBussStandFile> selectFileByAttId(String attId) throws Exception{
return sarStandFileEODao.selectFileByAttId(attId);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+4 -22
View File
@@ -10,10 +10,10 @@ 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;
import com.adc.da.http.Result;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.util.utils.StringUtils;
import com.adc.da.utils.util.SarAdvanceSearchUtil;
import com.alibaba.fastjson.JSONObject;
@@ -168,33 +168,15 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
page.setAdvanceSearchStr(null);
}
}
page.setUserId(LoginUserUtil.getUserId());
if(page.getUserId() == null || page.getUserId().equals("")){
page.setUserId(LoginUserUtil.getUserId());
}
if(StringUtils.isNotBlank(page.getPaixu())){
String sql = page.getPaixu()+" "+page.getShunxu();
page.setSql(sql);
}else{
page.setOrderBy("SAR_BUSSIONESS_STAND.MODIFY_TIME DESC");
}
if(page.getMenuId() != null ){
QueryWrapper<TsResource> qw = new QueryWrapper<>();
qw.eq("ID",page.getMenuId());
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(!children.isEmpty() || page.getMenuId().equals("nomenu")){
List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
}
List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+66
View File
@@ -1,10 +1,14 @@
package com.adc.da.slrs.sarBussionessStand.dao;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.sys.entity.UserEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List;
/**
@@ -30,4 +34,66 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
List<SarBussionessStand> getBussionessStandInfoPage(SarBussionessStandEOPage page);
List<SarBussionessStand> getBussionessStandInfoPageByRole(SarBussionessStandEOPage page);
//企标复审使用
List<SarBussionessStand> getBussionessStandInfoQbfs(SarBussionessStandEOPage page);
int getBussionessStandInfoCountByRole(SarBussionessStandEOPage page);
List<SarBussionessStand> getSarBussionessStand(SarBussionessStandEOPage page);
//liwenxuan:标准法规更新数量及清单:企业标准
Integer selectBussionessStandardsCount(Date visitTime);
//liwenxuan:标准法规更新数量及清单:企业标准All
Integer selectBussionessStandardsCountAll();
List<SarBussionessStand> selectSarBussionesDownloadFileInfo(String id);
List<SarBussionessStand> selectStandardsByStandnumber(SarBussionessStand sarStandardsInfoEO);
List<SarBussionessStand> selectStandByStandNumber(@Param("standCode") String standCode);
/**
* 搜索中心查询相关推荐
*
* @param:
* @auther: gaoyan
* @date: 2018/11/10 9:22
*/
List<RecommendVO> selectRecommendStand(SarBussionessStandEOPage pagenew);
List<RecommendVO> selectCloseStand(SarBussionessStandEOPage pagenew);
List<SarBussionessStand> queryByPutTimeList(SarBussionessStand sarBussionessStandEO);
int updateByStandNum(SarBussionessStand s);
/**
* 根据唯一的标准code，修改标准的被代替标准号
* @param:
* @auther: gaoyan
* @date: 2018/11/10 9:22
*/
int updateRelacedNumByNumber(SarBussionessStandEOPage pagenew);
int updateRelaceNumByNumber(SarBussionessStandEOPage pagenew);
List<SarBussionessStand> selectBussStandByIdAndRole(SarBussionessStandEOPage pagenew);
void updateReplacedNumById(SarBussionessStand sarBussionessStandEO);
Integer selectStandColumn(@Param("columnName") String columnName);
List<SarBussionessStand> standRemindInfo(@Param("standCode") String standCode, @Param("standName") String standName);
int selectIsExit(@Param("id") String id);
List<String> selectPerson(String qbid);
List<UserEO> selectPersonAll(String qbid);
int updateByPrimaryKeySelectiveTimeNotNull(SarBussionessStand sarBussionessStandEO);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+3
View File
@@ -180,6 +180,9 @@ public class SarBussionessStand extends BaseEntity {
@TableField(exist = false)
private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
@TableField(exist = false)
private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
@TableField(exist = false)
private String sarStandAttrEOStr; //新增修改时属性表信息
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+283 -22
View File
@@ -6,9 +6,13 @@ 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.mq.CreateMQService;
import com.adc.da.mq.CreateStandMQService;
import com.adc.da.person.entity.TsPersonCollect;
import com.adc.da.person.page.PersonCollectEOPage;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
@@ -16,32 +20,37 @@ 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.sarStandAttrInfo.dao.SarStandAttrInfoDao;
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.sarUpdLog.service.ISarUpdLogService;
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.entity.DicTypeEO;
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.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.json.JSONTokener;
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.stereotype.Service;
import java.sql.Clob;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -55,6 +64,17 @@ import java.util.*;
@Service
public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStandDao, SarBussionessStand> implements ISarBussionessStandService {
private static final Logger logger = LoggerFactory.getLogger(SarBussionessStandServiceImpl.class);
@Value("${elas.flag}")
private boolean elasflag; //ES是否启用
@Value("${file.path}")
private String filePath;//文件存储路径
@Autowired
private SarBussionessStandDao sarBussionessStandEODao;
@Autowired
private ITsUserService tsUserService;
@@ -67,6 +87,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired
private ITsResourceService iTsResourceService;
@Autowired
private SarStandAttrInfoDao sarStandAttrInfoEODao;
@Autowired
private SysInfoEOService sysInfoEOService;
@@ -77,7 +100,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
private IPersonCollectEOService personCollectEOService;
@Autowired
private OtConvertEODao otConvertEODao;
private OtConvertMqDao otConvertEODao;
@Autowired
private CreateMQService convertMq;
@@ -91,6 +114,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired
private SarStandardsInfoDao sarStandardsInfoEODao;
@Autowired
private CreateStandMQService createStandMQService;
@Autowired
private ISarUpdLogService sarUpdLogEOService;
@Autowired
private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;
@@ -126,18 +155,147 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
createStandAttrInfo(sarBussionessStandEO);
// 根据代替标准号 ，修改代替标准号标准中的，被代替标准号
// updateReplaceConnect(sarBussionessStandEO);
// //修改收藏分享编号名称
// updateCollectAndShare(sarBussionessStandEO);
// // 记录修改日志
// saveUpdateLog(sarBussionessStandEO,beforeStandEO);
// if (elasflag) {
// createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update");
// }
updateReplaceConnect(sarBussionessStandEO);
//修改收藏分享编号名称
updateCollectAndShare(sarBussionessStandEO);
// 记录修改日志
saveUpdateLog(sarBussionessStandEO,beforeStandEO);
if (elasflag) {
createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update");
}
}
return sarBussionessStandEO;
}
public void saveUpdateLog(SarBussionessStand sarStandardsInfoEO,SarBussionessStand beforeSarStandardsInfo) throws Exception{
Map<String,Object> newMap = new HashMap<>();
Map<String,Object> oldMap = beforeSarStandardsInfo.getAttrInfoMap();
String attrStr = sarStandardsInfoEO.getSarStandAttrEOStr();
if (StringUtils.isNotBlank(attrStr)) {
newMap = JSONObject.fromObject(attrStr);
}
newMap = changeMap(sarStandardsInfoEO,newMap);
oldMap = changeMap(beforeSarStandardsInfo,oldMap);
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
String number = sortName + " " + sarStandardsInfoEO.getStandCode();
if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
number += "-" + sarStandardsInfoEO.getStandYear();
}
String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
}
public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) {
map.put("country",sarStandardsInfoEO.getApplyCountry());
map.put("standSort",sarStandardsInfoEO.getStandSort());
map.put("standNumber",sarStandardsInfoEO.getStandCode());
map.put("standYear",sarStandardsInfoEO.getStandYear());
map.put("standName",sarStandardsInfoEO.getStandName());
map.put("standEnName",sarStandardsInfoEO.getStandEnName());
map.put("standNature",sarStandardsInfoEO.getStandNature());
map.put("standState",sarStandardsInfoEO.getStandStatus());
if (sarStandardsInfoEO.getIssueTime() != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
map.put("issueTime",issueStr);
}
if (sarStandardsInfoEO.getPutTime() != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String issueStr = format.format(sarStandardsInfoEO.getPutTime());
map.put("putTime",issueStr);
}
map.put("replaceStandNum",sarStandardsInfoEO.getReplaceStandNum());
map.put("replacedStandNum",sarStandardsInfoEO.getReplacedStandNum());
return map;
}
public void updateCollectAndShare(SarBussionessStand sarBussionessStandEO) throws Exception {
//修改收藏表中
String number = sarBussionessStandEO.getStandCode()+ "）";
PersonCollectEOPage personCollectEOPage = new PersonCollectEOPage();
personCollectEOPage.setValidFlag("0");
personCollectEOPage.setCollectResId(sarBussionessStandEO.getId());
List<TsPersonCollect> listCollect = personCollectEOService.queryByList(personCollectEOPage);
if (listCollect != null && listCollect.size() > 0) {
for (TsPersonCollect getCollect : listCollect) {
TsPersonCollect collectEO = new TsPersonCollect();
collectEO.setId(getCollect.getId());
collectEO.setCollectTitle(sarBussionessStandEO.getStandName() + " " + "（ 编号:" + number);
personCollectEOService.updateByPrimaryKeySelective(collectEO);
}
}
}
public void updateReplaceConnect(SarBussionessStand sarBussionessStandEO) throws Exception{
if(StringUtils.isNotEmpty(sarBussionessStandEO.getReplaceStandNum())){
SarBussionessStandEOPage sarStandardsInfoEOPage = new SarBussionessStandEOPage();
//当前代替标准号的标准类别为类别name，需修改为code
String[] replaceList = sarBussionessStandEO.getReplaceStandNum().trim().split(",");
String replaceListNew[];
int countre = 0;
// List<String> newReplaceList = new ArrayList<>();
if (replaceList!=null && replaceList.length>0) {
for(String replaceNum : replaceList){
if(replaceNum.indexOf(" ")!=-1){
String dicName = replaceNum.substring(0,replaceNum.lastIndexOf(" "));
DicTypeEO dicTypeEO = new DicTypeEO();
dicTypeEO.setDicTypeName(dicName);
dicTypeEO.setDicTypeCode("BUSSSTANDCLASS");
List<DicTypeEO> getDicCode = dicTypeEODao.getDicTypeByDicTypeName(dicTypeEO);
if(getDicCode!= null && getDicCode.size()>0){
replaceNum = replaceNum.replaceFirst(dicName,getDicCode.get(0).getDicTypeCode());
replaceList[countre] = replaceNum;
countre++;
}
}
}
}
sarStandardsInfoEOPage.setReplaceStandNumList(replaceList);
// 2021/03/30 刘慧文修改 标准类别已不存在
if(StringUtils.isNotEmpty(sarBussionessStandEO.getStandYear())){
sarStandardsInfoEOPage.setReplacedStandNum(sarBussionessStandEO.getStandCode()+"-"+sarBussionessStandEO.getStandYear());
} else {
sarStandardsInfoEOPage.setReplacedStandNum(sarBussionessStandEO.getStandCode());
}
int updateResult = sarBussionessStandEODao.updateRelacedNumByNumber(sarStandardsInfoEOPage);
//编写预警信息
// writeWarnings(sarBussionessStandEO);
}
if (StringUtils.isNotEmpty(sarBussionessStandEO.getReplacedStandNum())) {
SarBussionessStandEOPage sarStandardsInfoEOPage = new SarBussionessStandEOPage();
//当前代替标准号的标准类别为类别name，需修改为code
String[] replaceList = sarBussionessStandEO.getReplacedStandNum().trim().split(",");
int countre = 0;
// List<String> newReplaceList = new ArrayList<>();
if (replaceList!=null && replaceList.length>0) {
for(String replaceNum : replaceList){
if(replaceNum.indexOf(" ")!=-1){
String dicName = replaceNum.substring(0,replaceNum.lastIndexOf(" "));
DicTypeEO dicTypeEO = new DicTypeEO();
dicTypeEO.setDicTypeName(dicName);
dicTypeEO.setDicTypeCode("BUSSSTANDCLASS");
List<DicTypeEO> getDicCode = dicTypeEODao.getDicTypeByDicTypeName(dicTypeEO);
if(getDicCode!= null && getDicCode.size()>0){
replaceNum = replaceNum.replaceFirst(dicName,getDicCode.get(0).getDicTypeCode());
replaceList[countre] = replaceNum;
countre++;
}
}
}
}
sarStandardsInfoEOPage.setReplacedStandNumList(replaceList);
// 2021/03/30 刘慧文修改 标准类别已不存在
if(StringUtils.isNotEmpty(sarBussionessStandEO.getStandYear())){
sarStandardsInfoEOPage.setReplaceStandNum(sarBussionessStandEO.getStandCode()+"-"+sarBussionessStandEO.getStandYear());
} else {
sarStandardsInfoEOPage.setReplaceStandNum(sarBussionessStandEO.getStandCode());
}
int updateResult = sarBussionessStandEODao.updateRelaceNumByNumber(sarStandardsInfoEOPage);
}
}
/***
* @Description: 新增属性表数据
* @Author: yangxuenan
@@ -266,7 +424,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarStandFileEO.setCreationUser(LoginUserUtil.getUserId());
sarStandFileEO.setCreationTime(new Date());
sarStandFileEO.setModifyTime(new Date());
sarStandFileEO.setValidFlag("0");
sarStandFileEO.setValidFlag(0);
sarStandFileEO.setStandId(standId); //标准ID
sarStandFileEO.setUseModel(UseModuleEnum.SOURCE_FILE.getValue()); //文件使用模式
sarStandFileEO.setId(com.adc.da.sys.util.UUIDUtils.randomUUID20());
@@ -282,7 +440,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
newFileEO.setCreationUser(LoginUserUtil.getUserId());
newFileEO.setCreationTime(new Date());
newFileEO.setModifyTime(new Date());
newFileEO.setValidFlag("0");
newFileEO.setValidFlag(0);
newFileEO.setStandId(standId); //标准ID
newFileEO.setId(com.adc.da.sys.util.UUIDUtils.randomUUID20());
newFileEO.setAttId(fileInfo.getId()); //文件ID
@@ -294,7 +452,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
standFileList.add(newFileEO);
} else {
String filePath = fileInfo.getFilePath() + fileInfo.getFileName();
ConvertMqEO convert = new ConvertMqEO();
OtConvertMq convert = new OtConvertMq();
convert.setLawsId(standId);
convert.setAttId(fileInfo.getId());
convert.setFilePath(filePath);
@@ -344,13 +502,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
String name = entry.getKey();
String value = "";
if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && InitStandAttrUtil.fileFieldListBuss.size() > 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) {
value = entry.getValue().toString();
if (org.apache.commons.lang3.StringUtils.isNotBlank(value)) {
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
entry.setValue(fileObj);
}
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
value = entry.getValue().toString();
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
@@ -407,6 +565,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Override
public List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception {
//查询当前登录人角色拥有权限的菜单
if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
QueryWrapper<TsResource> qw = new QueryWrapper<>();
qw.eq("ID",page.getMenuId());
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
}
}
Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
page.getPager().setRowCount(rowCount);
List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
@@ -421,7 +599,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
*/
public void attrInfo (List<SarBussionessStand> sarlist) throws Exception {
for(SarBussionessStand row : sarlist){
attrInfo1(row);
attrInfoDetails(row);
}
}
@@ -444,6 +622,85 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
public void attrInfoShowSearchDetails(SarBussionessStand row,String type) throws Exception {
if (row != null) {
attrInfoSearchDetails(row,type);
Map<String, Object> getAttrMap = row.getAttrInfoMap();
if (getAttrMap != null && getAttrMap.size() > 0) {
for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
String name = entry.getKey();
String value = "";
List<String> valArr = new ArrayList<>();
if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
if(StringUtils.isNotBlank(entry.getValue().toString())){
Object json= new JSONTokener(entry.getValue().toString()).nextValue();
if(json instanceof org.json.JSONArray){
valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class);
}else {
value = entry.getValue().toString();
valArr = Arrays.asList(value.split(","));
}
if(!valArr.isEmpty()){
value = dicTypeEODao.getDicNamesByCodes(valArr);
}
}
entry.setValue(value);
}
}
}
}
}
public void attrInfoSearchDetails(SarBussionessStand row,String type) throws Exception {
String fieldInfo = InitStandAttrUtil.queryField;
String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
row.setCollectId(collectId);
// 查询属性表数据
if (StringUtils.isNotBlank(fieldInfo)) {
Map<String, Object> getAttrMap = new TreeMap<>();
if(type.equals("add")){
String sarStandAttrEOStr = row.getSarStandAttrEOStr();
getAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
}else {
getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
}
if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) {
// 遍历修改所有clob类型的值
for (String clobField : InitStandAttrUtil.clobFieldList) {
Clob clobValue = (Clob) getAttrMap.get(clobField);
String fieldValue = FieldConvertUtil.ClobToString(clobValue);
getAttrMap.put(clobField, fieldValue);
}
}
if (getAttrMap != null && !getAttrMap.isEmpty()) {
row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
}
row.setAttrInfoMap(getAttrMap);
}
}
private Map<String, Object> transformUpperCase(Map<String, Object> orgMap) {
Map<String, Object> resultMap = new HashMap<>();
for (Map.Entry<String, Object> entry : orgMap.entrySet()) {
String newKey = entry.getKey().toLowerCase();
resultMap.put(newKey, orgMap.get(entry.getKey()));
if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && !InitStandAttrUtil.fileFieldListBuss.isEmpty() && InitStandAttrUtil.fileFieldListBuss.contains(entry.getKey())) {
String value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
if(!fileObj.isEmpty()){
resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName());
}
}
}
}
return resultMap;
}
public void attrInfoDetails (SarBussionessStand row) throws Exception {
String fieldInfo = InitStandAttrUtil.queryFieldBuss;
String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
@@ -492,6 +749,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
getAttrMap.putAll(newMap);
}
if (getAttrMap != null && !getAttrMap.isEmpty()) {
row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
}
row.setAttrInfoMap(getAttrMap);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
-1
View File
@@ -114,7 +114,6 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
fileNameDto.setFileName(FileNames);//存入
}
list1.set(a,fileNameDto);
}else if (null!=list.get(a).getFileIds()){
AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData();
FindFileNameDto fileNameDto = list1.get(a);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java
+2
View File
@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
import com.adc.da.sys.common.SelectionResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
@@ -16,6 +17,7 @@ import java.util.Map;
* @author super_liu
* @since 2021-06-01
*/
@Repository
public interface SarStandAttrInfoDao extends BaseMapper<SarStandAttrInfo> {
void alterStandAttr(@Param("fieldInfo") String fieldInfo);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandFile/dao/SarStandFileDao.java
+6
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandFile.dao;
import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
* @author super_liu
* @since 2021-06-02
*/
@Repository
public interface SarStandFileDao extends BaseMapper<SarStandFile> {
List<SarStandFile> selectFileByStandId(String lawsId);
@@ -29,4 +31,8 @@ public interface SarStandFileDao extends BaseMapper<SarStandFile> {
int insertForeach(List<SarStandFile> list); //批量新增
int insertSelective(SarStandFile sarStandFile);
int updateByPrimaryKeySelective(SarStandFile sarStandFile);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandFile/entity/SarStandFile.java
+9 -1
View File
@@ -86,20 +86,28 @@ public class SarStandFile extends BaseEntity {
private String oriAttId;
@Transient
@TableField(exist = false)
private String resId;
@Transient
@TableField(exist = false)
private Integer pageCount;
@Transient
@TableField(exist = false)
private String fileOldName;
@Transient
private List<String> idlist = new ArrayList<>();
@TableField(exist = false)
private List<String> idList = new ArrayList<>();
@Transient
@TableField(exist = false)
private String standFileClassifyShow;
@Transient
@TableField(exist = false)
private String standNumber;
@Transient
@TableField(exist = false)
private String standName;
@Transient
@TableField(exist = false)
private String sarType;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+8
View File
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -52,6 +53,13 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
return Result.success("200",publicList);
}
@ApiOperation(value = "查询流程汇总-公共意见")
@GetMapping("/getPublicIdea")
public ResponseMessage getPublicIdea(@Param("unique") String unique){
List<SarPublicIdeaAll> publicList =sarPublicIdeaAllDao.getPublicIdea(unique);
return Result.success("200",publicList);
}
@ApiOperation(value = "查询全部意见")
@GetMapping("/checkIsShow")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
+6
View File
@@ -3,6 +3,11 @@ package com.adc.da.slrs.sarStandIdea.dao;
import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
/**
* <p>
@@ -15,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
List<SarPublicIdeaAll> getPublicIdea(@Param("unique")String unique);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java
+1
View File
@@ -10,4 +10,5 @@ public class DetAllStandDto {
String userId;
String endTime;
String Account;
String ideaId;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java
+3
View File
@@ -63,5 +63,8 @@ public class SarPublicIdea extends BaseEntity {
@TableField("stand_type")
private String standType;
@TableField("uniques")
private String uniques;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
+3
View File
@@ -58,6 +58,9 @@ public class SarPublicIdeaAll extends BaseEntity {
@TableField("new_text")
private String newText;
@TableField("idea_id")
private String ideaId;
public static final String CID = "cid";
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
e.printStackTrace();
}
QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
wrapper.eq("CID", detAllStandDto.getCid());
wrapper.eq("idea_id", detAllStandDto.getIdeaId());
Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize());
IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
System.out.println("总条数" + userIPage.getTotal());
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+1 -5
View File
@@ -193,13 +193,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
//分页查询的总数
Integer count=dao.sarItemCount(page);
page.getPager().setRowCount(count);
List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
return sarStandItems;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+43 -33
View File
@@ -6,11 +6,14 @@ import com.adc.da.att.vo.AttFileVo;
import com.adc.da.common.*;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.mq.service.CreateStandMQService;
import com.adc.da.mq.CreateMQService;
import com.adc.da.mq.CreateStandMQService;
import com.adc.da.person.dao.PersonCollectEODao;
import com.adc.da.person.dao.PersonShareEODao;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.search.service.StandLawsSearchService;
import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage;
import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage;
@@ -29,7 +32,6 @@ import com.adc.da.slrs.sarStandFile.dao.SarStandFileDao;
import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
import com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO;
import com.adc.da.slrs.sarStandItems.entity.SarItemVO;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
@@ -74,24 +76,15 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.File;
import java.io.FileInputStream;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
import java.sql.Clob;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -182,6 +175,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private IAttFileEOService attFileEOService;
@Autowired
private CreateMQService convertMq;
@Autowired
private OtConvertMqDao otConvertEODao;
@Autowired
private DicTypeEODao dicTypeEODao;
@@ -776,7 +775,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandFileEO.setOriAttId(fileInfo.getId());
standFileList.add(sarStandFileEO);
//多文档转换 PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx
if (verifyFileType(fileInfo.getFileSuffix())) {
if ("pdf".equals(fileInfo.getFileSuffix()) || "PDF".equals(fileInfo.getFileSuffix())) {
SarStandFile newFileEO = new SarStandFile();
newFileEO.setCreationUser(LoginUserUtil.getUserId());
newFileEO.setCreationTime(new Date());
@@ -792,17 +791,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
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.STAND.getValue());
// convert.setOriAttId(fileInfo.getId());
// convertMq.sendMQ(convert);
String filePath = fileInfo.getFilePath() + fileInfo.getFileName();
OtConvertMq convert = new OtConvertMq();
convert.setLawsId(standId);
convert.setAttId(fileInfo.getId());
convert.setFilePath(filePath);
convert.setAddOrUp("0");
convert.setFileSuffix(fileInfo.getFileSuffix());
convert.setStandFileClassify(field);
convert.setConvertType(SarTypeEnum.STAND.getValue());
convert.setOriAttId(fileInfo.getId());
convertMq.sendMQ(convert);
}
}
}
@@ -1137,6 +1136,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
* @Return: com.adc.da.util.http.ResponseMessage<com.adc.da.lawss.entity.SarStandardsInfoEO>
*/
public int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception {
/**
* 加入对应"国家/地区"的清单列表
*/
//1.获取标准清单的"国家/地区"
//2.判断修改的标准的"国家/地区"与清单中的是否一致,一致则添加到清单中,不一致不作处理
String standId = sarStandardsInfoEO.getId();
// 查询修改前数据信息，为修改代替标准号使用
SarStandardsInfo beforeSarStandardsInfo = dao.selectById(standId);
@@ -1152,18 +1162,18 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
SarStandFile sarStandFileEO = new SarStandFile();
sarStandFileEO.setStandId(sarStandardsInfoEO.getId());
Map map = (Map) JSONObject.fromObject(sarStandardsInfoEO.getSarStandAttrEOStr());
sarStandFileEO.setIdlist(null);
sarStandFileEO.setIdList(null);
List<SarStandFile> listFile = sarStandFileEODao.selectFileByStandIdAndId(sarStandFileEO);
// if (listFile != null) {
// if (!listFile.isEmpty()) {
// for (int f = 0; f < listFile.size(); f++) {
// //删除文件信息表数据
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());
// }
// }
// }
//删除转换表ot_convert数据
otConvertEODao.deleteByAttId(listFile.get(f).getAttId());
}
}
}
sarStandPutTimeEODao.deleteByStandId(standId);
// 修改属性表数据
sarStandAttrInfoEODao.deleteStandAttrByStandId(standId);