From 25ee5132463bb0b47d43bbaa8ecdcc11c9cf55fa Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 19 Aug 2024 16:19:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=96=87=E4=BB=B6=E8=A1=A8=E8=B0=83=E6=95=B4=202.?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=A3=80=E6=B5=8B=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4=203.=E6=8A=80=E6=9C=AF=E7=9B=91?= =?UTF-8?q?=E7=9D=A3=E8=AE=A1=E5=88=92=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/poi/excel/ExcelUtil.java | 8 --- .../pojo/dto/SensitiveReportExcel.java | 6 +- .../pojo/dto/SensitiveUserSExcel.java | 8 +-- .../dto/SupervisionDevMainReportExcel.java | 57 +++++++------------ .../pojo/param/survey/SurveyTestParam.java | 6 ++ .../supervision/pojo/po/file/FileUrl.java | 24 +++++--- .../pojo/po/survey/SurveyTest.java | 9 ++- .../vo/device/SupervisionDevMainReportVO.java | 4 ++ .../controller/file/FileUrlController.java | 4 +- .../user/UserReportRenewalController.java | 2 +- .../mapper/file/FileUrlMapper.java | 4 +- ...SupervisionDevMainReportPOServiceImpl.java | 21 +++---- .../service/file/IFileUrlService.java | 4 +- .../service/file/impl/FileUrlServiceImpl.java | 8 +-- .../user/impl/UserReportPOServiceImpl.java | 4 +- .../system/controller/ConfigController.java | 1 - .../system/service/impl/AuditServiceImpl.java | 11 +++- .../src/main/resources/bootstrap.yml | 2 +- 18 files changed, 91 insertions(+), 92 deletions(-) diff --git a/pqs-common/common-poi/src/main/java/com/njcn/poi/excel/ExcelUtil.java b/pqs-common/common-poi/src/main/java/com/njcn/poi/excel/ExcelUtil.java index e39475a70..b4ee7882c 100644 --- a/pqs-common/common-poi/src/main/java/com/njcn/poi/excel/ExcelUtil.java +++ b/pqs-common/common-poi/src/main/java/com/njcn/poi/excel/ExcelUtil.java @@ -2,14 +2,10 @@ package com.njcn.poi.excel; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.export.ExcelExportService; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.CharsetUtil; import com.njcn.web.utils.HttpServletUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.hssf.usermodel.DVConstraint; -import org.apache.poi.hssf.usermodel.HSSFDataValidation; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.CellReference; @@ -22,8 +18,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.URLEncoder; import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @author hongawen @@ -181,8 +175,6 @@ public class ExcelUtil { } } } - - workbook.write(outputStream); } catch (IOException e) { log.error(">>> 导出数据异常：{}", e.getMessage()); diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java index 9aee174c9..c48b034fb 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java @@ -8,7 +8,6 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDate; @Data public class SensitiveReportExcel implements Serializable { @@ -55,9 +54,8 @@ public class SensitiveReportExcel implements Serializable { // private String orgId; - @Excel(name = "工程预期投产日期", width = 30) - //@NotBlank(message = "工程预期投产日期不能为空") - private LocalDate expectedProductionDate; + @Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30) + private String expectedProductionDate; @Excel(name = "电压等级", width = 30) //@NotBlank(message = "电压等级不能为空") diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java index 4a046be27..54b68424c 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java @@ -3,13 +3,10 @@ package com.njcn.supervision.pojo.dto; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDate; @Data public class SensitiveUserSExcel implements Serializable { @@ -60,10 +57,9 @@ public class SensitiveUserSExcel implements Serializable { // private String orgId; - @Excel(name = "工程预期投产日期", width = 30) + @Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30) //@NotBlank(message = "工程预期投产日期不能为空") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate expectedProductionDate; + private String expectedProductionDate; @Excel(name = "电压等级", width = 30) //@NotBlank(message = "电压等级不能为空") diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java index 89d9fa2d7..4b1878a7b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java @@ -1,17 +1,13 @@ package com.njcn.supervision.pojo.dto; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; /** * Description: @@ -26,14 +22,12 @@ import java.time.LocalDateTime; public class SupervisionDevMainReportExcel { - /** * 工程预期投产日期 */ - @Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30) + @Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30, height = 6) @NotBlank(message = "不能为空") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate expectedProductionDate; + private String expectedProductionDate; /** * 所属地市 @@ -107,19 +101,15 @@ public class SupervisionDevMainReportExcel { /** * 投运时间 */ - @Excel(name = "*投运时间(yyyy-MM-dd HH:mm:ss)", width = 30) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Excel(name = "*投运时间(yyyy-MM-dd HH:mm:ss)", width = 40) @NotBlank(message = "投运时间不能为空") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime commissioningTime; + private String commissioningTime; /** * 数据更新时间 */ - @Excel(name = "数据更新时间(yyyy-MM-dd HH:mm:ss)", width = 30) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime dataUpdateTime; + @Excel(name = "数据更新时间(yyyy-MM-dd HH:mm:ss)", width = 40) + private String dataUpdateTime; /** * 所属前置机 @@ -131,9 +121,9 @@ public class SupervisionDevMainReportExcel { /** * 监测终端安装位置 */ - @Excel(name = "*监测终端安装位置", width = 30, replace = {"电网侧_0", "用户侧_1", "_0"}) + @Excel(name = "*监测终端安装位置", width = 30, replace = {"电网侧_0", "用户侧_1"}) @NotBlank(message = "监测终端安装位置不能为空") - private String monitoringDeviceInstallationPosition; + private String monitoringDeviceInstallationPosition = "0"; /** * 识别码 @@ -150,14 +140,14 @@ public class SupervisionDevMainReportExcel { /** * 终端模型 */ - @Excel(name = "终端模型", width = 30, replace = {"虚拟终端_0", "实际终端_1", "离线_2", "_1"}) - private String terminalModel; + @Excel(name = "终端模型", width = 30, replace = {"虚拟终端_0", "实际终端_1", "离线_2"}) + private String terminalModel = "1"; /** * 数据类型 */ - @Excel(name = "数据类型", width = 30, replace = {"暂态系统_0", "稳态系统_1", "两个系统_2", "_2"}) - private String dataType; + @Excel(name = "数据类型", width = 30, replace = {"暂态系统_0", "稳态系统_1", "两个系统_2"}) + private String dataType = "2"; /** * 终端接线方式类型 @@ -177,11 +167,9 @@ public class SupervisionDevMainReportExcel { /** * 本次终端检测时间 */ - @Excel(name = "*本次终端检测时间(yyyy-MM-dd HH:mm:ss)", width = 30) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Excel(name = "*本次终端检测时间(yyyy-MM-dd HH:mm:ss)", width = 40) @NotBlank(message = "本次终端检测时间不能为空") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime currentTerminalDetectionTime; + private String currentTerminalDetectionTime; /** @@ -212,33 +200,32 @@ public class SupervisionDevMainReportExcel { * SIM卡号 */ @Excel(name = "SIM卡号", width = 30) - @NotBlank(message = "不能为空") private String simCardNumber; /** * 对时功能 */ - @Excel(name = "对时功能", width = 30, replace = {"关闭_0", "开启_1", "_0"}) - private String timeSyncFunction; + @Excel(name = "对时功能", width = 30, replace = {"关闭_0", "开启_1"}) + private String timeSyncFunction = "0"; /** * 电镀功能 */ - @Excel(name = "电镀功能", width = 30, replace = {"关闭_0", "开启_1", "_0"}) - private String electroplatingFunction; + @Excel(name = "电镀功能", width = 30, replace = {"关闭_0", "开启_1"}) + private String electroplatingFunction = "0"; /** * 召换标志 */ - @Excel(name = "召换标志", width = 30, replace = {"周期触发_0", "变位触发_1", "_0"}) - private String summonFlag; + @Excel(name = "召换标志", width = 30, replace = {"周期触发_0", "变位触发_1"}) + private String summonFlag = "0"; /** * 告警功能 */ - @Excel(name = "告警功能", width = 30, replace = {"否_0", "是_1", "_0"}) - private String alarmFunction; + @Excel(name = "告警功能", width = 30, replace = {"否_0", "是_1"}) + private String alarmFunction = "0"; /** * 合同号 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java index 7b0db87b8..abae1a738 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java @@ -64,6 +64,12 @@ public class SurveyTestParam implements Serializable { @ApiModelProperty(value = "技术监督报告") private String supervisionReport; + /** + * 其他报告 + */ + @ApiModelProperty(value = "其他报告") + private String otherReport; + /** * 是否有问题 0 没有问题 1 有问题 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/file/FileUrl.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/file/FileUrl.java index bc6da7add..2389280eb 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/file/FileUrl.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/file/FileUrl.java @@ -1,45 +1,51 @@ package com.njcn.supervision.pojo.po.file; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; + + /** *

- * 用户档案信息表 + * 用户档案信息表 *

* * @author wr * @since 2024-08-14 */ -@Getter -@Setter +@Data @TableName("supervision_file_url") public class FileUrl extends BaseEntity { - private static final long serialVersionUID = 1L; /** * id(对应表数据id一样) */ - private String id; + @MppMultiId + @TableField(value = "supervision_Id") + private String supervisionId; /** * 字段名称 */ + @MppMultiId + @TableField(value = "name") private String name; /** * 文件地址 */ + @TableField(value = "url") private String url; /** * 状态：0-删除 1-正常 */ - private Integer state; + @TableField(value = "state") + private Integer state = 1; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java index b4c84ea45..e022301cf 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java @@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import java.io.Serializable; import java.time.LocalDate; -import java.time.LocalDateTime; import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** *

@@ -72,6 +69,12 @@ public class SurveyTest extends BaseEntity implements Serializable { */ private String supervisionReport; + /** + * 其他报告 + */ + private String otherReport; + + /** * 是否有问题 0 没有问题 1 有问题 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java index 19483a13c..81a289b4b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java @@ -175,4 +175,8 @@ public class SupervisionDevMainReportVO { private String createBy; + /** + * 状态：0：系统建档 1：外部导入 + */ + private Integer importType; } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/file/FileUrlController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/file/FileUrlController.java index 23ce7b760..c1db3935b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/file/FileUrlController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/file/FileUrlController.java @@ -45,9 +45,9 @@ public class FileUrlController extends BaseController { } @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @GetMapping("/addOrUpdateFile") + @PostMapping("/addOrUpdateFile") @ApiOperation("批量添加和修改文件信息") - public HttpResult addOrUpdateFile(List list) { + public HttpResult addOrUpdateFile(@RequestBody List list) { String methodDescribe = getMethodDescribe("addOrUpdateFile"); Boolean b = fileUrlService.addOrUpdateFile(list); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java index 650b8fbe6..782967a61 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java @@ -30,7 +30,7 @@ import com.njcn.web.controller.BaseController; */ @RestController @RequiredArgsConstructor -@RequestMapping("/userReportRenewal") +@RequestMapping("width = 30,height = 60Renewal") @Api(tags = "干扰源常态化管理信息更新") public class UserReportRenewalController extends BaseController { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/file/FileUrlMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/file/FileUrlMapper.java index 558ac777d..20260ec27 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/file/FileUrlMapper.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/file/FileUrlMapper.java @@ -1,6 +1,6 @@ package com.njcn.supervision.mapper.file; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.supervision.pojo.po.file.FileUrl; /** @@ -11,6 +11,6 @@ import com.njcn.supervision.pojo.po.file.FileUrl; * @author wr * @since 2024-08-14 */ -public interface FileUrlMapper extends BaseMapper { +public interface FileUrlMapper extends MppBaseMapper { } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index 2da3e8750..a2c9a2f02 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -7,6 +7,7 @@ import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -447,7 +448,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl devExcels = new ArrayList<>(); try { - ExcelImportResult sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveUserSExcel.class, params); + ExcelImportResult sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SupervisionDevMainReportExcel.class, params); //如果存在非法数据，将不合格的数据导出 if (sensitiveUserExcelExcelImportResult.isVerifyFail()) { PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法数据.xlsx", response); @@ -489,7 +490,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper - .eq(SupervisionTempDeviceReport::getSubstation, dev.getSubstation()) + .eq(SupervisionTempDeviceReport::getSubstationName, dev.getSubstation()) .eq(SupervisionTempDeviceReport::getTerminalIp, dev.getTerminalIp()); List list = supervisionTempDeviceReportService.getBaseMapper().selectList(lambdaQueryWrapper); if (CollectionUtil.isNotEmpty(list)) { @@ -518,7 +519,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl DeptIds = deptS.stream().filter(x -> x.getName().equals(dev.getCity())).map(DeptDTO::getId).collect(Collectors.toList()); po.setOrgId(CollUtil.isNotEmpty(DeptIds)?DeptIds.get(0):RequestUtil.getDeptIndex()); - po.setExpectedProductionDate(dev.getExpectedProductionDate()); + po.setExpectedProductionDate(DateUtil.parseDate(dev.getExpectedProductionDate()).toLocalDateTime().toLocalDate()); po.setCity(PubUtil.getDicById(dev.getCity(), jiBeiArea)); po.setUserStatus("1"); // po.setAcceptanceInspectionReport(); @@ -531,11 +532,9 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl { +public interface IFileUrlService extends IMppService { /** * 根据id获取全部数据 diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/file/impl/FileUrlServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/file/impl/FileUrlServiceImpl.java index 4e27d26fd..a389c1085 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/file/impl/FileUrlServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/file/impl/FileUrlServiceImpl.java @@ -1,7 +1,7 @@ package com.njcn.supervision.service.file.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.supervision.mapper.file.FileUrlMapper; import com.njcn.supervision.pojo.po.file.FileUrl; import com.njcn.supervision.service.file.IFileUrlService; @@ -18,15 +18,15 @@ import java.util.List; * @since 2024-08-14 */ @Service -public class FileUrlServiceImpl extends ServiceImpl implements IFileUrlService { +public class FileUrlServiceImpl extends MppServiceImpl implements IFileUrlService { @Override public List getFileUrlList(String id) { - return this.list(new LambdaQueryWrapper().eq(FileUrl::getId, id)); + return this.list(new LambdaQueryWrapper().eq(FileUrl::getSupervisionId, id)); } @Override public Boolean addOrUpdateFile(List list) { - return this.saveOrUpdateBatch(list); + return this.saveOrUpdateBatchByMultiId(list); } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index b31305f16..d5f7ef2bb 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -743,7 +743,7 @@ public class UserReportPOServiceImpl extends ServiceImpl DeptIds = data.stream().filter(x -> x.getName().equals(userExcel.getCity())).map(DeptDTO::getId).collect(Collectors.toList()); userReportPO.setOrgId(CollUtil.isNotEmpty(DeptIds)?DeptIds.get(0):RequestUtil.getDeptIndex()); - userReportPO.setExpectedProductionDate(userExcel.getExpectedProductionDate()); + userReportPO.setExpectedProductionDate(DateUtil.parseDate(userExcel.getExpectedProductionDate()).toLocalDateTime().toLocalDate()); userReportPO.setUserType(UserNatureEnum.SENSITIVE_USER.getCode()); //所属地市 userReportPO.setCity(userExcel.getCity()); @@ -942,7 +942,7 @@ public class UserReportPOServiceImpl extends ServiceImpl DeptIds = data.stream().filter(x -> x.getName().equals(reportExcel.getCity())).map(DeptDTO::getId).collect(Collectors.toList()); userReportPO.setOrgId(CollUtil.isNotEmpty(DeptIds)?DeptIds.get(0):RequestUtil.getDeptIndex()); - userReportPO.setExpectedProductionDate(reportExcel.getExpectedProductionDate()); + userReportPO.setExpectedProductionDate(DateUtil.parseDate(reportExcel.getExpectedProductionDate()).toLocalDateTime().toLocalDate()); userReportPO.setUserType(reportExcel.getUserType()); //所属地市 userReportPO.setCity(reportExcel.getCity()); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java index 759c62842..137e4d166 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java @@ -72,7 +72,6 @@ public class ConfigController extends BaseController { String methodDescribe = getMethodDescribe("getSysConfigData"); LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe); List res = iConfigService.getList(); - if (CollectionUtils.isEmpty(res)) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); } else { diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index a5ca80d3f..c27e2575d 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -340,8 +340,15 @@ public class AuditServiceImpl extends ServiceImpl implem @Override public void clearHistoryLog() { - LocalDate nowDate = LocalDate.now(); - LocalDate agoDate = nowDate.minusMonths(clearHistoryLog).with(TemporalAdjusters.firstDayOfMonth()); + Config config = iConfigService.getOne(new LambdaQueryWrapper().eq(Config::getState, DataStateEnum.ENABLE.getCode())); + Integer logTime; + if(ObjectUtil.isNotNull(config)){ + logTime = config.getLogTime(); + }else{ + logTime = clearHistoryLog; + } + LocalDateTime nowDate = LocalDateTime.now(); + LocalDateTime agoDate = nowDate.minusMonths(logTime).with(TemporalAdjusters.firstDayOfMonth()); String date = agoDate.format(DateTimeFormatter.ISO_LOCAL_DATE); QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/pqs-system/system-boot/src/main/resources/bootstrap.yml b/pqs-system/system-boot/src/main/resources/bootstrap.yml index 86061e74f..f17ec5db1 100644 --- a/pqs-system/system-boot/src/main/resources/bootstrap.yml +++ b/pqs-system/system-boot/src/main/resources/bootstrap.yml @@ -61,6 +61,6 @@ runTake: #清除日志月份 clear: - num: 1 + num: 3 mqtt: client-id: @artifactId@${random.value}