From 8b2eb6b84a88fbf5a2f5f4cfa01c0901b25736ee Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Jun 2022 10:55:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=20=E6=96=B0=E5=A2=9E20s=E6=B2=89=E7=9D=A1=20?= =?UTF-8?q?=E9=81=BF=E5=85=8D=20=E9=A2=91=E7=B9=81=E6=AD=BB=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 51daf309..98d91734 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -133,6 +133,13 @@ public class ScheduledJob { logger.info("========================================================================================================"); //删除不在预警范围的标准 int remove = sarStandardWarningDao.autoCancelWarning(); + log.info("开始修整"+new Date()+"!"); + try { + Thread.sleep(20000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + log.info("结束修整"+new Date()+"!"); logger.info("取消" + remove + "条预警"); //预警期限(当前日期至3个月后) From 19db42504f95490931b3eed0e14b5a4339b77b4d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Jun 2022 11:32:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/scheduled/ScheduledJob.java | 8 -------- .../sarStandWarning/entity/StandWarningEO.java | 4 ++++ .../sarStandWarning/EarlyWraningEOMapper.xml | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 98d91734..9bf24da5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -6,7 +6,6 @@ import com.adc.da.scheduled.dao.SarStandardItemDao; import com.adc.da.scheduled.dao.SarStandardWarningDao; import com.adc.da.scheduled.entity.TermDTO; -import com.adc.da.slrs.ActivityDatas.entity.DataList; import com.adc.da.slrs.processModel.utils.TrainFormDate; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; @@ -22,8 +21,6 @@ import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; - - import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -35,17 +32,12 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.PostConstruct; -import java.lang.reflect.InvocationTargetException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; @EnableScheduling diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java index d073b263..398b5055 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -95,4 +95,8 @@ public class StandWarningEO extends EarlyWarningEO { @ApiModelProperty("范围查询发布日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") private String endIssueTime; + + @ExcelIgnore + @ApiModelProperty("stand标准 item条款") + private String mark; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 8913444b..67421bb3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -209,7 +209,12 @@ LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID POWER = '1' - AND (MARK = 'stand') + + AND (MARK = #{mark}) + + + AND (MARK = 'stand') + AND sarInfo.VALID_FLAG='0' AND attr.CLLX LIKE CONCAT('%', @@ -255,7 +260,12 @@ LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID POWER = '1' - AND (MARK = 'item') + + AND (MARK = #{mark}) + + + AND (MARK = 'item') + AND sarInfo.VALID_FLAG='0' From cd3729ace3a19b786887c9620cdb8ab1ed12ea1c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Jun 2022 14:25:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20bug?= =?UTF-8?q?=20+=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WgCommitteeController.java | 4 ++++ .../slrs/wgCommittee/entity/WgCommittee.java | 4 ++++ .../mapper/wgCommittee/WgCommitteeMapper.xml | 2 ++ .../att/controller/AttFileEOController.java | 9 +++++++++ .../java/com/adc/da/att/dao/AttFileEODao.java | 4 +++- .../adc/da/att/service/IAttFileEOService.java | 2 ++ .../service/impl/AttFileEOServiceImpl.java | 20 +++++++++++++++++++ .../mybatis/mapper/att/AttFileEOMapper.xml | 3 +++ 8 files changed, 47 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java index 35b56e61..a08878b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java @@ -15,8 +15,11 @@ import com.adc.da.slrs.wgCommittee.entity.WgCommittee; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -43,6 +46,7 @@ public class WgCommitteeController extends BaseController { @PostMapping("/insert") public ResponseMessage addWorkCommitter(WgCommittee wgCommittee) { + wgCommittee.setCreateTime(new Date()); if (isDistinct(wgCommittee.getCommitteeName(),null)){ if (iWgCommitteeService.add(wgCommittee)){ return Result.success("200","新增成功"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java index bff59910..5dff6902 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; import java.util.List; /** @@ -45,6 +46,9 @@ public class WgCommittee extends BasePage { @ApiModelProperty(value = "委员关联表") private String committeer; + @ApiModelProperty(value = "创建时间") + private Date createTime; + @ApiModelProperty(value = "委员") @TableField(exist = false) private String committeeIds; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml index e32ed03c..405fb81e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml @@ -16,6 +16,7 @@ and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%') + order by create_time desc limit ${(page-1)*pageSize},${pageSize} @@ -45,6 +46,7 @@ and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%') + order by create_time desc limit ${(page-1)*pageSize},${pageSize} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index bbdd94d2..91709a12 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -752,4 +753,12 @@ public class AttFileEOController { } } + + @ApiOperation(value = "修改文件名称") + @GetMapping("/updateFileName") + public ResponseMessage updateFileName(@Param("fileId") String fileId,@Param("fileName") String fileName) { + AttFileEO attFileEO = attFileEOService.updateFileInfo(fileId,fileName); + return Result.success(attFileEO); + } + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java index 1e2b9c43..b51ade10 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java @@ -20,6 +20,8 @@ public interface AttFileEODao extends BaseMapper { public AttFileEO selectFileInfoById(AttFileEO attFileEO); + public int updateFileInfoById(AttFileEO attFileEO); + public int insertData(AttFileEO attFileEO); - + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index 60f7922a..9f6a3b41 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -20,6 +20,8 @@ public interface IAttFileEOService extends IService { public AttFileEO getFileInfo(String attId); + public AttFileEO updateFileInfo(String attId,String name); + public List getMultiFileInfos(String fileIds); public List getMultiFileInfosOrderByDateDesc(String fileIds); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 82654b60..5a6ee40d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -333,6 +333,26 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileEO; } + @Override + public AttFileEO updateFileInfo(String attId,String name) { + /** + * 根据ID获取文件信息 + */ + AttFileEO attFileEO = new AttFileEO(); + AttFileEO attFileInfo=null; + Integer flag=0; + try { + attFileEO.setId(attId); + attFileInfo = this.baseMapper.selectFileInfoById(attFileEO); + attFileInfo.setOldFileName(name); + this.baseMapper.updateFileInfoById(attFileEO); + return attFileInfo; + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return attFileInfo; + } + /** * @Author super_liu * @Description 多文件查询 diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml index ce248b14..565a95df 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -96,5 +96,8 @@ where id = #{id} + + update ${tableName} set OLD_FILE_NAME = #{oldFileName} where id = #{id} +