提交 bbe9e116 作者: 925993793@qq.com

创建专题时,时间格式调整

上级 17657d06
...@@ -3,7 +3,6 @@ package com.zzsn.event.controller; ...@@ -3,7 +3,6 @@ package com.zzsn.event.controller;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -777,7 +776,6 @@ public class SubjectManageController { ...@@ -777,7 +776,6 @@ public class SubjectManageController {
*/ */
@PostMapping("/configScoreModel") @PostMapping("/configScoreModel")
public Result<?> configScoreModel(@RequestBody ScoreModelVo scoreModelVo) { public Result<?> configScoreModel(@RequestBody ScoreModelVo scoreModelVo) {
UserVo loginUser = UserUtil.getLoginUser();
scoreModelService.addOrUpdate(scoreModelVo, 1); scoreModelService.addOrUpdate(scoreModelVo, 1);
//调用接口,重新打分 //调用接口,重新打分
String subjectId = scoreModelVo.getSubjectId(); String subjectId = scoreModelVo.getSubjectId();
...@@ -819,7 +817,7 @@ public class SubjectManageController { ...@@ -819,7 +817,7 @@ public class SubjectManageController {
/** /**
* 模型绑定(包含去重、筛选、标签模型)--检查是否需要中断-专题配置页 * 模型绑定(包含去重、筛选、标签模型)--检查是否需要中断-专题配置页
* todo *
* *
* @param subjectPage 参数 * @param subjectPage 参数
* @return * @return
...@@ -831,7 +829,7 @@ public class SubjectManageController { ...@@ -831,7 +829,7 @@ public class SubjectManageController {
/** /**
* 前端发送请求,传参数给python * 前端发送请求,传参数给python
* todo *
*/ */
@PostMapping(value = "/sendPythonInfo") @PostMapping(value = "/sendPythonInfo")
public Result<?> sendPythonInfo(@RequestBody SubjectPage subjectPage) { public Result<?> sendPythonInfo(@RequestBody SubjectPage subjectPage) {
......
...@@ -3,6 +3,7 @@ package com.zzsn.event.service.impl; ...@@ -3,6 +3,7 @@ package com.zzsn.event.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
...@@ -372,6 +373,16 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl ...@@ -372,6 +373,16 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
if (subject.getSubjectType() == null) { if (subject.getSubjectType() == null) {
subject.setSubjectType(1); subject.setSubjectType(1);
} }
Date timeEnable = subject.getTimeEnable();
if (timeEnable != null) {
String format = cn.hutool.core.date.DateUtil.format(timeEnable, "yyyy-MM-dd 00:00:00");
subject.setTimeEnable(cn.hutool.core.date.DateUtil.parse(format));
}
Date timeDisable = subject.getTimeDisable();
if (timeDisable != null) {
String format = cn.hutool.core.date.DateUtil.format(timeDisable, "yyyy-MM-dd 23:59:59");
subject.setTimeDisable(DateUtil.parse(format));
}
String subjectCode = codeGenerateUtil.geneCodeNo(CodePrefixEnum.SUBJECT_DEFAULT.getValue()); String subjectCode = codeGenerateUtil.geneCodeNo(CodePrefixEnum.SUBJECT_DEFAULT.getValue());
subject.setSubjectCode(subjectCode); subject.setSubjectCode(subjectCode);
String cron = CronUtil.generateCron(subject.getUnit(), subject.getSpace()); String cron = CronUtil.generateCron(subject.getUnit(), subject.getSpace());
...@@ -391,6 +402,16 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl ...@@ -391,6 +402,16 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
BeanUtils.copyProperties(subjectPage, subject); BeanUtils.copyProperties(subjectPage, subject);
String cron = CronUtil.generateCron(subject.getUnit(), subject.getSpace()); String cron = CronUtil.generateCron(subject.getUnit(), subject.getSpace());
subject.setCron(cron); subject.setCron(cron);
Date timeEnable = subject.getTimeEnable();
if (timeEnable != null) {
String format = DateUtil.format(timeEnable, "yyyy-MM-dd 00:00:00");
subject.setTimeEnable(DateUtil.parse(format));
}
Date timeDisable = subject.getTimeDisable();
if (timeDisable != null) {
String format = DateUtil.format(timeDisable, "yyyy-MM-dd 23:59:59");
subject.setTimeDisable(DateUtil.parse(format));
}
baseMapper.updateById(subject); baseMapper.updateById(subject);
//删除专题-类别绑定关系 //删除专题-类别绑定关系
subjectTypeMapService.deleteBySubjectId(subject.getId()); subjectTypeMapService.deleteBySubjectId(subject.getId());
......
package com.zzsn.event.service.impl; package com.zzsn.event.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
...@@ -144,6 +145,16 @@ public class SubjectSimpleServiceImpl implements SubjectSimpleService { ...@@ -144,6 +145,16 @@ public class SubjectSimpleServiceImpl implements SubjectSimpleService {
if (subject.getSubjectType() == null) { if (subject.getSubjectType() == null) {
subject.setSubjectType(1); subject.setSubjectType(1);
} }
Date timeEnable = subject.getTimeEnable();
if (timeEnable != null) {
String format = DateUtil.format(timeEnable, "yyyy-MM-dd 00:00:00");
subject.setTimeEnable(DateUtil.parse(format));
}
Date timeDisable = subject.getTimeDisable();
if (timeDisable != null) {
String format = DateUtil.format(timeDisable, "yyyy-MM-dd 23:59:59");
subject.setTimeDisable(DateUtil.parse(format));
}
String subjectCode = codeGenerateUtil.geneCodeNo(CodePrefixEnum.SUBJECT_DEFAULT.getValue()); String subjectCode = codeGenerateUtil.geneCodeNo(CodePrefixEnum.SUBJECT_DEFAULT.getValue());
subject.setSubjectCode(subjectCode); subject.setSubjectCode(subjectCode);
String cron = CronUtil.generateCron(subject.getUnit(), subject.getSpace()); String cron = CronUtil.generateCron(subject.getUnit(), subject.getSpace());
......
...@@ -53,15 +53,15 @@ public class SubjectPage { ...@@ -53,15 +53,15 @@ public class SubjectPage {
/**数据来源(0-平台数据;1-全网搜)*/ /**数据来源(0-平台数据;1-全网搜)*/
private Integer dataSource; private Integer dataSource;
/**启用时间*/ /**启用时间*/
@Excel(name = "启用时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "启用时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "启用时间") @ApiModelProperty(value = "启用时间")
private Date timeEnable; private Date timeEnable;
/**停用时间*/ /**停用时间*/
@Excel(name = "停用时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "停用时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "停用时间") @ApiModelProperty(value = "停用时间")
private Date timeDisable; private Date timeDisable;
/**划分专题库*/ /**划分专题库*/
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论