From 415bfd3086333ab02973f95d085d91c019d93b4e Mon Sep 17 00:00:00 2001 From: shanao Date: Sat, 14 Sep 2024 19:43:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=B1=A1=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accident/AccidentRecordsController.java | 18 ++++++--- .../accident/AccidentRecordsService.java | 7 ++-- .../impl/AccidentRecordsServiceImpl.java | 39 ++++++++++++++++++- 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java index f46e4dab..b7ddfa80 100644 --- a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java +++ b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java @@ -1,6 +1,7 @@ package com.zcloud.controller.accident; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.zcloud.controller.base.BaseController; @@ -71,8 +72,11 @@ public class AccidentRecordsController extends BaseController { @ResponseBody @RequestMapping("/save") public Map save(HttpServletRequest request) { - AccidentRecords accidentRecords = BeanUtil.mapToBean(new PageData(request), AccidentRecords.class, true); - accidentRecordsService.save(accidentRecords); + PageData pageData = new PageData(request); + if (CollUtil.isEmpty(pageData)){ + throw new RuntimeException("参数不能为空"); + } + accidentRecordsService.save(pageData); Map result = new HashMap<>(); result.put("result", "success"); return result; @@ -88,9 +92,13 @@ public class AccidentRecordsController extends BaseController { @RequestMapping("/update") public Map update(HttpServletRequest request) { PageData pageData = new PageData(request); - AccidentRecords accidentRecords = BeanUtil.mapToBean(pageData, AccidentRecords.class, true); - accidentRecords.setId(Optional.of(accidentRecords.getId()).orElseThrow(() -> new RuntimeException("id不能为空"))); - accidentRecordsService.update(accidentRecords); + if (CollUtil.isEmpty(pageData)){ + throw new RuntimeException("参数不能为空"); + } + if (pageData.get("id") != null) { + throw new RuntimeException("id不能为空"); + } + accidentRecordsService.update(pageData); Map result = new HashMap<>(); result.put("result", "success"); return result; diff --git a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java index 8ed30d49..2d003b70 100644 --- a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java +++ b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java @@ -2,7 +2,6 @@ package com.zcloud.service.accident; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.accident.AccidentRecords; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -29,16 +28,16 @@ public interface AccidentRecordsService { /** * 新增 * - * @param accidentRecords 要保存的实体 + * @param pageData 要保存的实体 */ - void save(AccidentRecords accidentRecords); + void save(PageData pageData); /** * 修改 * * @param bean 要修改的实体 */ - void update(AccidentRecords bean); + void update(PageData pageData); /** * 删除 diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index f3777606..ca806922 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.service.accident.impl; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -58,7 +59,8 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { @Override @Transactional(rollbackFor = Exception.class) - public void save(AccidentRecords accidentRecords) { + public void save(PageData pageData) { + AccidentRecords accidentRecords = new AccidentRecords(); accidentRecords.setId(IdUtil.fastSimpleUUID()); accidentRecords.setCreatedBy(Jurisdiction.getUsername()); Date date = new Date(); @@ -71,12 +73,45 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { accidentRecords.setIsDeleted(0); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); accidentRecords.setCorpinfoId(corpinfoId); + accidentRecords.setIncidentNumber(pageData.getString("incidentNumber")); + accidentRecords.setIncidentName(pageData.getString("incidentName")); + accidentRecords.setIncidentType(pageData.getString("incidentType")); + accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); + accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); + accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); + accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); + accidentRecords.setCause(pageData.getString("cause")); + accidentRecords.setSummary(pageData.getString("summary")); + accidentRecords.setAnalysis(pageData.getString("analysis")); + accidentRecords.setSuggestions(pageData.getString("suggestions")); + accidentRecords.setMeasures(pageData.getString("measures")); + accidentRecords.setCreator(pageData.getString("creator")); + accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), DatePattern.UTC_MS_PATTERN)); Assert.isTrue(accidentRecordsMapper.save(accidentRecords) == 1, "新增事故记录失败"); } @Override @Transactional(rollbackFor = Exception.class) - public void update(AccidentRecords accidentRecords) { + public void update(PageData pageData) { + AccidentRecords accidentRecords = new AccidentRecords(); + accidentRecords.setIncidentNumber(pageData.getString("incidentNumber")); + accidentRecords.setIncidentName(pageData.getString("incidentName")); + accidentRecords.setIncidentType(pageData.getString("incidentType")); + accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); + accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setIncidentDate(DateUtil.parse(pageData.getString("incidentDate"), DatePattern.UTC_MS_PATTERN)); + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); + accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); + accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); + accidentRecords.setCause(pageData.getString("cause")); + accidentRecords.setSummary(pageData.getString("summary")); + accidentRecords.setAnalysis(pageData.getString("analysis")); + accidentRecords.setSuggestions(pageData.getString("suggestions")); + accidentRecords.setMeasures(pageData.getString("measures")); + accidentRecords.setCreator(pageData.getString("creator")); + accidentRecords.setReportDate(DateUtil.parse(pageData.getString("reportDate"), DatePattern.UTC_MS_PATTERN)); accidentRecords.setUpdatedBy(Jurisdiction.getUsername()); accidentRecords.setUpdatedTime(new Date()); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId();