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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!82
This commit is contained in:
高嵩
2023-05-18 18:39:44 +08:00
parent 93d2f3cbff 14dbf79dc4
commit afbd075cd7
16 changed files with 380 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java
+16
View File
@@ -0,0 +1,16 @@
package com.adc.da.slrs.OnlineFileLog.controller;
import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/${restPath}/lawss/OnlineFileLog")
@Api(description = "|OnlineFileLog|")
public class OnlineFileLogController {
@Autowired
private OnlineFileLogService onlineFileLogService;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/dao/OnlineFileLogDao.java
+7
View File
@@ -0,0 +1,7 @@
package com.adc.da.slrs.OnlineFileLog.dao;
import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface OnlineFileLogDao extends BaseMapper<OnlineFileLog> {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java
+74
View File
@@ -0,0 +1,74 @@
package com.adc.da.slrs.OnlineFileLog.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("online_file_log")
@ApiModel(value="OnlineFileLog对象", description="")
@Data
public class OnlineFileLog extends BaseEntity {
@ApiModelProperty(value = "主键")
@TableId(value = "ID", type = IdType.UUID)
private String id;
@TableField("HIS_ID")
@ApiModelProperty(value = "在线编辑工作流的id")
private String hisId;
@TableField("ATT_FILE_ID")
@ApiModelProperty(value = "新文件存储的id")
private String attFileId;
@TableField("FILE_NAME")
@ApiModelProperty(value = "新名称")
private String fileName;
@TableField("OLD_FILE_NAME")
@ApiModelProperty(value = "老名称")
private String oLdFileName;
@TableField("FILE_SUFFIX")
@ApiModelProperty(value = "后缀")
private String fileSuffix;
@TableField("FILE_PATH")
@ApiModelProperty(value = "路径")
private String filePath;
@TableField("COUNT")
@ApiModelProperty(value = "计数")
private Integer count;
@TableField("CREATE_TIME")
@ApiModelProperty(value = "创建时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@TableField("UPDATE_TIME")
@ApiModelProperty(value = "修改时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty(value = "是否有效")
@TableField("VALID_FLAG")
private String validFlag;
//跨服io流转换
@TableField(exist = false)
private byte[] bytes;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java
+7
View File
@@ -0,0 +1,7 @@
package com.adc.da.slrs.OnlineFileLog.service;
import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog;
import com.baomidou.mybatisplus.extension.service.IService;
public interface OnlineFileLogService extends IService<OnlineFileLog> {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java
+12
View File
@@ -0,0 +1,12 @@
package com.adc.da.slrs.OnlineFileLog.service.impl;
import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao;
import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog;
import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service
public class OnlineFileLogServiceImpl extends ServiceImpl<OnlineFileLogDao, OnlineFileLog> implements OnlineFileLogService {
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+41
View File
@@ -20,6 +20,8 @@ import com.adc.da.search.entity.StandLawsEO;
import com.adc.da.search.service.StandLawsSearchService;
import com.adc.da.slrs.NewsFeed.entity.NewsFeed;
import com.adc.da.slrs.NewsFeed.service.INewsFeedService;
import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao;
import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog;
import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
@@ -282,6 +284,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired
private SarBussionessStandStateDao sarBussionessStandStateDao;
@Autowired
private OnlineFileLogDao onlineFileLogDao;
@Override
public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
SarBussionessStand bussionessStand = new SarBussionessStand();
@@ -1443,6 +1448,42 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && InitStandAttrUtil.fileFieldListBuss.size() > 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) {
value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
String onFileId = "";
String fileId = "";
String[] split = value.split(",");
for (String id : split) {
if (id.contains("ATT_FILE")) {
if (org.apache.commons.lang3.StringUtils.isNotBlank(fileId)) {
fileId = fileId + "," + id;
} else {
fileId = id;
}
} else {
if (org.apache.commons.lang3.StringUtils.isNotBlank(onFileId)) {
onFileId = onFileId + "," + id;
} else {
onFileId = id;
}
}
}
String officeFileIds = "";
if(org.apache.commons.lang3.StringUtils.isNotBlank(onFileId)){
String[] splitOn = onFileId.split(",");
for (String idOn: splitOn){
QueryWrapper<OnlineFileLog> onlineFileLogQueryWrapper = new QueryWrapper<>();
onlineFileLogQueryWrapper.eq("HIS_ID",idOn);
onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME");
List<OnlineFileLog> onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper);
if(!onlineFileLogs.isEmpty()){
if(org.apache.commons.lang3.StringUtils.isNotBlank(officeFileIds)){
officeFileIds = officeFileIds+","+onlineFileLogs.get(0).getAttFileId();
}else {
officeFileIds = onlineFileLogs.get(0).getAttFileId();
}
}
}
}
value = fileId+","+officeFileIds;
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value);
entry.setValue(fileObj);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
+24 -24
View File
@@ -34,20 +34,20 @@ import java.util.*;
public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
@Resource
private EarlyWarningEOServiceImpl earlyWarningEOService;
/**
*
* @param newStandPage
* @param newStandPageSize
* @param oldStandPage
* @param oldStandPageSize
* @param newItemsPage
* @param newItemsPageSize
* @param oldItemsPage
* @param oldItemsPageSize
* @return
* @author zj
* date 2021-06-15
**/
/**
*
* @param newStandPage
* @param newStandPageSize
* @param oldStandPage
* @param oldStandPageSize
* @param newItemsPage
* @param newItemsPageSize
* @param oldItemsPage
* @param oldItemsPageSize
* @return
* @author zj
* date 2021-06-15
**/
@GetMapping("/${restPath}/StandWarning")
@ApiOperation("标准预警查询")
public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize,
@@ -91,12 +91,12 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
return Result.success("200",listMap);
}
/**
*
*
* @param id
* @return
* @author zj
* date 2021-06-15
**/
* @return
* @author zj
* date 2021-06-15
**/
@GetMapping("/ChangePermissions")
@ApiOperation("取消预警")
public ResponseMessage ChangePermissions(String id) {
@@ -104,15 +104,15 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
return Result.success("200",power);
}
/**
*
*
* @param newPolicyPage
* @param newPolicyPageSize
* @param oldPolicyPage
* @param oldPolicyPageSize
* @return
* @author zj
* date 2021-06-15
**/
* @return
* @author zj
* date 2021-06-15
**/
@GetMapping("/PolicyWarning")
@ApiOperation("政策预警查询")
public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize,
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
-10
View File
@@ -292,11 +292,6 @@ public class SarStandardComplianceAssessResultController {
iPage.setTotal(datasCount);
iPage.setRecords(standards);
while (iPage.getRecords().remove(null)) ;
if(StringUtils.isNotBlank(eo.getOrder())){
if(eo.getOrder().equals("desc")){
iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem()));
}
}
return Result.success(iPage);
} else {
IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
@@ -312,11 +307,6 @@ public class SarStandardComplianceAssessResultController {
if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
while (page.getRecords().remove(null)) ;
if(StringUtils.isNotBlank(eo.getOrder())){
if(eo.getOrder().equals("desc")){
iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem()));
}
}
return Result.success(page);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+41
View File
@@ -6,6 +6,8 @@ import com.adc.da.person.entity.StandInfo;
import com.adc.da.person.entity.TsPersonCollect;
import com.adc.da.slrs.NewsFeed.entity.NewsFeed;
import com.adc.da.slrs.NewsFeed.service.INewsFeedService;
import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao;
import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog;
import com.adc.da.slrs.regulations.dao.StandDataDao;
import com.adc.da.slrs.regulations.entity.SearchStandContext;
import com.adc.da.slrs.regulations.entity.StandData;
@@ -263,6 +265,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private EncryptFileUtils encryptFileUtils;
@Autowired
private OnlineFileLogDao onlineFileLogDao;
// /**
// * 反向操作标准
@@ -937,6 +942,42 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
String onFileId = "";
String fileId = "";
String[] split = value.split(",");
for (String id : split) {
if (id.contains("ATT_FILE")) {
if (StringUtils.isNotBlank(fileId)) {
fileId = fileId + "," + id;
} else {
fileId = id;
}
} else {
if (StringUtils.isNotBlank(onFileId)) {
onFileId = onFileId + "," + id;
} else {
onFileId = id;
}
}
}
String officeFileIds = "";
if(StringUtils.isNotBlank(onFileId)){
String[] splitOn = onFileId.split(",");
for (String idOn: splitOn){
QueryWrapper<OnlineFileLog> onlineFileLogQueryWrapper = new QueryWrapper<>();
onlineFileLogQueryWrapper.eq("HIS_ID",idOn);
onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME");
List<OnlineFileLog> onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper);
if(!onlineFileLogs.isEmpty()){
if(StringUtils.isNotBlank(officeFileIds)){
officeFileIds = officeFileIds+","+onlineFileLogs.get(0).getAttFileId();
}else {
officeFileIds = onlineFileLogs.get(0).getAttFileId();
}
}
}
}
value = fileId+","+officeFileIds;
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value);
entry.setValue(fileObj);
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+3 -1
View File
@@ -79,8 +79,10 @@
<if test="prcNum!=null and prcNum!=''">
AND sins.prc_num like concat(concat('%',#{prcNum}),'%')
</if>
ORDER BY sins.specific_item
<if test="order !=null and order!=''">
ORDER BY sins.specific_item ${order}
</if>
) c ORDER BY CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED)
LIMIT ${(current-1)*size},${size}
</select>
adc-da-slrs/src/main/resources/mysql/foton.sql
+17
View File
@@ -1,4 +1,21 @@
-- 福田数据库 表字段 记录 字典 等信息记录
--2023-05-18 主服务 创建表 在线编辑日志表
CREATE TABLE `online_file_log` (
`ID` varchar(36) NOT NULL COMMENT 'ID',
`HIS_ID` varchar(50) DEFAULT NULL COMMENT '在线编辑工作流的id',
`ATT_FILE_ID` varchar(50) DEFAULT NULL COMMENT '新文件存储的id',
`FILE_NAME` varchar(255) DEFAULT NULL COMMENT '新名称',
`OLD_FILE_NAME` varchar(255) DEFAULT NULL COMMENT '老名称',
`FILE_SUFFIX` varchar(255) DEFAULT NULL COMMENT '文件后缀',
`FILE_PATH` varchar(255) DEFAULT NULL COMMENT '路径',
`COUNT` bigint(5) DEFAULT NULL COMMENT '计数',
`CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
`UPDATE_TIME` datetime DEFAULT NULL COMMENT '修改时间',
`VALID_FLAG` varchar(255) DEFAULT NULL COMMENT '是否有效',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 2023-04-14 16:27 生产环境未同步
-- 更改 sar_stand_item_val 表PROOERTY_VAL 类型 varchar 为 text