1.技术监督通用文件表调整

2.终端检测导入功能调整 3.技术监督计划增加其他附件上传
2024-08-19 16:19:23 +08:00
parent 9e23373878
commit 25ee513246
18 changed files with 91 additions and 92 deletions
--- 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<Boolean> addOrUpdateFile(List<FileUrl> list) {
+    public HttpResult<Boolean> addOrUpdateFile(@RequestBody  List<FileUrl> list) {
        String methodDescribe = getMethodDescribe("addOrUpdateFile");
        Boolean b = fileUrlService.addOrUpdateFile(list);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
--- 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 {

--- 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<FileUrl> {
+public interface FileUrlMapper extends MppBaseMapper<FileUrl> {

 }
--- 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<Supervisi
        params.setSheetNum(1);
        List<SupervisionDevMainReportExcel> devExcels = new ArrayList<>();
        try {
-            ExcelImportResult<SupervisionDevMainReportExcel> sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveUserSExcel.class, params);
+            ExcelImportResult<SupervisionDevMainReportExcel> 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<Supervisi
                //todo 需要根据变电站id进行匹配
                LambdaQueryWrapper<SupervisionTempDeviceReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                lambdaQueryWrapper
-                        .eq(SupervisionTempDeviceReport::getSubstation, dev.getSubstation())
+                        .eq(SupervisionTempDeviceReport::getSubstationName, dev.getSubstation())
                        .eq(SupervisionTempDeviceReport::getTerminalIp, dev.getTerminalIp());
                List<SupervisionTempDeviceReport> list = supervisionTempDeviceReportService.getBaseMapper().selectList(lambdaQueryWrapper);
                if (CollectionUtil.isNotEmpty(list)) {
@@ -518,7 +519,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
                List<String> 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<Supervisi
                po.setImportType(1);
                po.setStatus(2);
                po.setState(DataStateEnum.ENABLE.getCode());
-                this.save(po);
                //终端基础信息
                StringBuilder msg = new StringBuilder();
                SupervisionTempDeviceReport devDetails = new SupervisionTempDeviceReport();
-                devDetails.setId(po.getId());
                if(deptMap.containsKey(dev.getPowerCompany())){
                    devDetails.setPowerCompany(deptMap.get(dev.getPowerCompany()));
                    devDetails.setPowerCompany(deptMap.get(dev.getPowerCompany()));
@@ -545,7 +544,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
                //todo 需要根据变电站id进行匹配
 //                devDetails.setCustomSubstationFlag();
 //                devDetails.setSubstation();
-//                devDetails.setSubstationName();
+                devDetails.setSubstationName(dev.getSubstation());
 //                devDetails.setSubstationVoltageLevel();
 //                devDetails.setLongitude();
 //                devDetails.setLatitude();
@@ -591,16 +590,16 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
                }else{
                    msg.append("所属前置机不存在!");
                }
-                devDetails.setCurrentTerminalDetectionTime(dev.getCurrentTerminalDetectionTime());
-                devDetails.setNextTerminalInspectionTime(dev.getCurrentTerminalDetectionTime().plusYears(5));
+                devDetails.setCurrentTerminalDetectionTime(DateUtil.parseDate(dev.getCurrentTerminalDetectionTime()).toLocalDateTime());
+                devDetails.setNextTerminalInspectionTime(DateUtil.parseDate(dev.getCurrentTerminalDetectionTime()).toLocalDateTime().plusYears(5));
                devDetails.setIdentificationCode(dev.getIdentificationCode());
                devDetails.setTerminalSecretKey(dev.getTerminalSecretKey());
                devDetails.setTerminalModel(dev.getTerminalModel());
                devDetails.setDataType(dev.getDataType());
                devDetails.setCommunicationStatus("0");
                devDetails.setSimCardNumber(dev.getSimCardNumber());
-                devDetails.setCommissioningTime(dev.getCommissioningTime());
-                devDetails.setDataUpdateTime(dev.getDataUpdateTime());
+                devDetails.setCommissioningTime(DateUtil.parseDate(dev.getCommissioningTime()).toLocalDateTime());
+                devDetails.setDataUpdateTime(StrUtil.isNotBlank(dev.getDataUpdateTime())?DateUtil.parseDate(dev.getDataUpdateTime()).toLocalDateTime():null);
                devDetails.setTimeSyncFunction(Integer.parseInt(dev.getTimeSyncFunction()));
                devDetails.setElectroplatingFunction(Integer.parseInt(dev.getElectroplatingFunction()));
                devDetails.setMonitoringDeviceInstallationPosition(dev.getMonitoringDeviceInstallationPosition());
@@ -621,6 +620,8 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
                    devMsgList.add(sensitiveUserExcelMsg);
                    continue;
                }
+                this.save(po);
+                devDetails.setId(po.getId());
                supervisionTempDeviceReportService.saveOrUpdate(devDetails);
            }
        }
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/file/IFileUrlService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/file/IFileUrlService.java
@@ -1,6 +1,6 @@
 package com.njcn.supervision.service.file;

-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.supervision.pojo.po.file.FileUrl;

 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 * @author wr
 * @since 2024-08-14
 */
-public interface IFileUrlService extends IService<FileUrl> {
+public interface IFileUrlService extends IMppService<FileUrl> {

    /**
     * 根据id获取全部数据
--- 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<FileUrlMapper, FileUrl> implements IFileUrlService {
+public class FileUrlServiceImpl extends MppServiceImpl<FileUrlMapper, FileUrl> implements IFileUrlService {

    @Override
    public List<FileUrl> getFileUrlList(String id) {
-        return this.list(new LambdaQueryWrapper<FileUrl>().eq(FileUrl::getId, id));
+        return this.list(new LambdaQueryWrapper<FileUrl>().eq(FileUrl::getSupervisionId, id));
    }

    @Override
    public Boolean addOrUpdateFile(List<FileUrl> list) {
-        return this.saveOrUpdateBatch(list);
+        return this.saveOrUpdateBatchByMultiId(list);
    }
 }
--- 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<UserReportPOMapper, Use
                    List<String> 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<UserReportPOMapper, Use
                    List<String> 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());