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

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
zyd
2022-10-24 22:32:24 +08:00
parent 14c3354739 5a01009cf8
commit b9afd7ff0c
11 changed files with 150 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+8 -3
View File
@@ -48,6 +48,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.json.JSONTokener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -131,7 +132,9 @@ public class ActSarItemsBussEOService {
String sarStandAttrInfo = JSONObject.toJSONString(attrInfoMap);
SarBussionessStand bussionessStand = new SarBussionessStand();
bussionessStand.setId(standId);
bussionessStand.setTextStatusBuss(textStatus);
if("2".equals(reviewResults) || "3".equals(reviewResults)) { // 废止，有效时才修改文本状态
bussionessStand.setTextStatusBuss(textStatus);
}
bussionessStand.setSarStandAttrEOStr(sarStandAttrInfo);
iSarBussionessStandService.updateSarBussionessStand(bussionessStand);
@@ -168,7 +171,7 @@ public class ActSarItemsBussEOService {
String releaseTime = String.valueOf(standMap.get("releaseTime"));
String YYBZ = String.valueOf(standMap.get("YYBZ"));
String CYBZ = String.valueOf(standMap.get("CYBZ"));
String SYCXCLASS = getFieldsValue(standMap,"SYCXCLASS");
String SYCXCLASS = ObjectUtils.isEmpty(standMap.get("SYCXCLASS")) ? "" : getFieldsValue(standMap, "SYCXCLASS");
String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS"));
String LXD = String.valueOf(standMap.get("LXD"));
@@ -207,7 +210,9 @@ public class ActSarItemsBussEOService {
+"创建了《"+ esName +"》,其计划结果为复审";
esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
}else{
iEsRevisePlanService.addPlan(esRevisePlanDTO);
if("1".equals(reviewResults)) { // 修订时才生成企标计划
iEsRevisePlanService.addPlan(esRevisePlanDTO);
}
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+8 -1
View File
@@ -19,6 +19,7 @@ import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandVal.entity.SarStandVal;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
@@ -191,12 +192,18 @@ public class ActSarItemsEOService {
// 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId
String standnumber = "";
SarStandardsInfoEOPage queryPage = new SarStandardsInfoEOPage();
if(StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear()) && !"null".equals(sarStandardsInfoEO.getStandYear())){
standnumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear();
queryPage.setStandSort(sarStandardsInfoEO.getStandSort());
queryPage.setStandNumber(sarStandardsInfoEO.getStandNumber());
queryPage.setStandYear(sarStandardsInfoEO.getStandYear());
} else {
standnumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber();
queryPage.setStandSort(sarStandardsInfoEO.getStandSort());
queryPage.setStandNumber(sarStandardsInfoEO.getStandNumber());
}
List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType());
List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(queryPage, sarStandardsInfoEO.getStandType());
if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds());
adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+1
View File
@@ -176,6 +176,7 @@ public class LoginRestController {
}
String token = jwtUtils.generateToken(userEO.getUsid());
log.info(token);
// 加密重要信息
BASE64Encoder encoder = new BASE64Encoder();
userEO.setToken(token);
adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java
+24 -1
View File
@@ -9,6 +9,7 @@ package com.adc.da.search.conf;
import com.adc.da.slrs.tsTask.dao.TbTaskDao;
import com.adc.da.slrs.tsTask.entity.TbTask;
import com.adc.da.slrs.tsTask.service.ITbTaskService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -95,7 +96,7 @@ public class SchedulerConf {
log.info("{}，任务启动！", taskId);
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
log.error("{}，任务启动失败...", taskId);
e.printStackTrace();
log.error(e.getMessage(),e);
}
}
@@ -113,6 +114,28 @@ public class SchedulerConf {
log.info("{}，任务停止...", taskId);
}
public TbTask manualRunTask(String taskId){
TbTask task = iTbTaskService.getById(taskId);
if(task!=null){
try {
//获取并实例化Runnable任务类
Class<?> clazz = Class.forName(task.getTaskClass());
Runnable runnable = (Runnable) clazz.newInstance();
Thread runTaskThread = new Thread(runnable);
runTaskThread.start();
log.info("{}，任务开始启动执行！", task.getTaskDesc());
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
log.error("{}，任务启动失败...", task.getTaskDesc());
log.error(e.getMessage(),e);
}
return task;
}else{
return null;
}
}
/**
* 根据ip开启定时任务
*/
adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
+14 -4
View File
@@ -213,10 +213,20 @@ public class DataSyncServiceImpl implements IDataSyncService {
// 1.1.1.1.2.1 拼接 被代替标准号
String btd = bdtList.stream().map(info1 -> {
String addStrandNumber = "";
if (StringUtils.isNotEmpty(info1.getStandYear())) {
addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber() + "-" + info1.getStandYear();
} else {
addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber();
//var judgeFn = new RegExp(/\s+/g);
//if(judgeFn.test(nowstandinfo.standSort)){
// nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
//}else if(nowstandinfo.standSort === 'Q/QCBFC'){
// nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
//}else {
// nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
//}
if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort().indexOf(" ")>0){
addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):"");
}else if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort() =="Q/QCBFC"){
addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):"");
}else{
addStrandNumber = info1.getStandSort()+" "+ info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):"");
}
return addStrandNumber;
}).collect(Collectors.joining(","));
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+28 -2
View File
@@ -525,13 +525,19 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
//@RequiresPermissions("lawss:sarStandardsInfo:selectReplaceStandNum")
public ResponseMessage validateStandNumber(SarStandardsInfoEOPage page) throws Exception {
if (StringUtils.isNotEmpty(page.getStandNumber()) && StringUtils.isNotEmpty(page.getStandSort())) {
SarStandardsInfoEOPage newQueryPage = new SarStandardsInfoEOPage();
String standnumber = "";
if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){
standnumber = page.getStandSort() + " " + page.getStandNumber() + "-" + page.getStandYear();
newQueryPage.setStandSort(page.getStandSort());
newQueryPage.setStandNumber(page.getStandNumber());
newQueryPage.setStandYear(page.getStandYear());
} else {
standnumber = page.getStandSort() + " " + page.getStandNumber();
newQueryPage.setStandSort(page.getStandSort());
newQueryPage.setStandNumber(page.getStandNumber());
}
List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, page.getStandType());
List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(newQueryPage, page.getStandType());
if (standlist.size() > 0) {
if (StringUtils.isNotEmpty(page.getId())) {
// 如果是修改，判断id是否一样
@@ -778,7 +784,27 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
// page.setStandNumber("UN(ECE)" + number);
// }
}
List<SarStandardsInfo> getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType());
/**
* 此处需要拆分输入的标准编号
* 只需要拆分国内、海外标准
*/
SarStandardsInfoEOPage newQueryPage = new SarStandardsInfoEOPage();
String standNumber = page.getStandNumber();
String[] numberArray = standNumber.split(" ");
if(numberArray.length==2){
newQueryPage.setStandSort(numberArray[0]);
String numLastStr = numberArray[1];
String[] yearArray = numLastStr.split("-");
if(yearArray.length==2){
newQueryPage.setStandNumber(yearArray[0]);
newQueryPage.setStandYear(yearArray[1]);
}else{
newQueryPage.setStandNumber(numLastStr);
}
}else{
newQueryPage.setStandCode(page.getStandNumber());
}
List<SarStandardsInfo> getList = sarStandardsInfoEOService.selectStandardsByStandnumber(newQueryPage,page.getStandType());
SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage();
sarBussionessStandEOPage.setStandCode(page.getStandNumber());
List<SarBussionessStand> list = iSarBussionessStandService.queryByList(sarBussionessStandEOPage);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+11
View File
@@ -182,6 +182,9 @@ public class SarStandardsInfo extends BaseEntity {
private String standTextStatusShow; // 标准文本状态显示名称
@TableField(exist = false)
private String sychronId; // 同步数据ID
@TableField(exist = false)
private String standCode;//标准编号
@TableField(exist = false)
private List<DicTypeEO> dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据
@TableField(exist = false)
@@ -652,5 +655,13 @@ public class SarStandardsInfo extends BaseEntity {
public void setStandTextStatusShow(String standTextStatusShow) {
this.standTextStatusShow = standTextStatusShow;
}
public String getStandCode() {
return standCode;
}
public void setStandCode(String standCode) {
this.standCode = standCode;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
+2 -1
View File
@@ -42,7 +42,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
ResponseMessage<SarStandardsInfo> importSarStandardsInfoData(List<Map<String,String>> dataList, String standType, String menuId, String filepath);
List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfoEOPage queryPahe, String standType);
List<SarStandardsInfo> getStandInfoByList(String limit);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+16 -3
View File
@@ -2998,10 +2998,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
* @author gaoyan
* date 2018-11-13
*/
public List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType) {
public List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfoEOPage queryPage , String standType) {
SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
sarStandardsInfoEO.setStandNumber(replaceStandNum);
sarStandardsInfoEO.setStandType(standType);
if(StringUtils.isNotBlank(queryPage.getStandSort())){
sarStandardsInfoEO.setStandSort(queryPage.getStandSort());
}
if(StringUtils.isNotBlank(queryPage.getStandNumber())){
sarStandardsInfoEO.setStandNumber(queryPage.getStandNumber());
}
if(StringUtils.isNotBlank(queryPage.getStandYear())){
sarStandardsInfoEO.setStandYear(queryPage.getStandYear());
}
if(StringUtils.isNotBlank(queryPage.getStandCode())){
sarStandardsInfoEO.setStandCode(queryPage.getStandCode());
}
if(StringUtils.isNotBlank(standType)){
sarStandardsInfoEO.setStandType(standType);
}
return dao.selectStandardsByStandnumber(sarStandardsInfoEO);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java
+17
View File
@@ -1,8 +1,11 @@
package com.adc.da.slrs.tsTask.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.search.conf.SchedulerConf;
import com.adc.da.slrs.tsTask.service.ITbTaskService;
import io.swagger.annotations.ApiOperation;
import oracle.ucp.proxy.annotation.Post;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +58,20 @@ public class TbTaskController extends BaseController<TbTask> {
return "操作成功";
}
@ApiOperation(value = "手动启动定时任务")
@GetMapping("/manualRunTask/{taskId}")
public ResponseMessage manualRunTask(@PathVariable("taskId") String taskId) {
TbTask tbTask = schedulerConf.manualRunTask(taskId);
if(tbTask!=null){
return Result.success("开始启动定时任务：《"+tbTask.getTaskDesc()+"》");
}else{
return Result.error("定时任务未找到："+taskId);
}
}
/**
* 根据ip开启定时任务
* http://localhost:10085/tbTask
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+21 -1
View File
@@ -1543,7 +1543,7 @@
<if test="standType != null">
and stand_type = #{standType}
</if>
<if test="standNumber != null">
<if test="standNumber != null and standSort == null">
and (
(trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
@@ -1567,6 +1567,26 @@
)
and SAR_STANDARDS_INFO.STAND_YEAR = ''
) -->
</if>
<if test="standCode != null">
and (
(trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
)
<!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
or (stand_name like concat(concat('%',#{standNumber}),'%'))
)
</if>
<if test="standSort !=null and standNumber !=null and standYear !=null">
and (
SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
)
</if>
<if test="standSort !=null and standNumber !=null and standYear ==null">
and (
SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber}
)
</if>
<if test="sychronId != null">
and id != #{sychronId}