From 458df8499bd8aac5a76d907f8abb9dc067b28888 Mon Sep 17 00:00:00 2001 From: jlt Date: Tue, 29 Mar 2022 21:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=9C=E5=9C=BA=E5=88=86?= =?UTF-8?q?=E5=8C=BA=E3=80=81=E8=8F=9C=E5=9C=B0=E5=88=92=E5=88=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=BB=BA=E7=AB=8B=E8=80=85=E3=80=81=E5=BB=BA?= =?UTF-8?q?=E7=AB=8B=E6=97=B6=E9=97=B4=E3=80=81=E6=9B=B4=E6=96=B0=E8=80=85?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=9C=A8Controller=E4=B8=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jlt/csa/controller/FarmZoneController.java | 8 ++++++++ .../java/com/jlt/csa/controller/GardenController.java | 8 ++++++++ .../com/jlt/csa/service/impl/FarmZoneServiceImpl.java | 4 ++-- .../java/com/jlt/csa/service/impl/GardenServiceImpl.java | 2 -- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java b/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java index f25d97993..7b1026bc6 100644 --- a/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java +++ b/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java @@ -2,6 +2,8 @@ package com.jlt.csa.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.DateUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -21,6 +23,8 @@ import com.jlt.csa.service.IFarmZoneService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import static com.ruoyi.common.utils.SecurityUtils.getUsername; + /** * 农场分区Controller * @@ -77,6 +81,8 @@ public class FarmZoneController extends BaseController @PostMapping public AjaxResult add(@RequestBody FarmZone farmZone) { + farmZone.setCreateBy(getUsername()); + farmZone.setCreateTime(DateUtils.getNowDate()); return toAjax(farmZoneService.insertFarmZone(farmZone)); } @@ -88,6 +94,8 @@ public class FarmZoneController extends BaseController @PutMapping public AjaxResult edit(@RequestBody FarmZone farmZone) { + farmZone.setUpdateBy(getUsername()); + farmZone.setUpdateTime(DateUtils.getNowDate()); return toAjax(farmZoneService.updateFarmZone(farmZone)); } diff --git a/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java b/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java index 6de28edbc..31152aae8 100644 --- a/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java +++ b/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java @@ -2,6 +2,8 @@ package com.jlt.csa.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.DateUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -77,6 +79,8 @@ public class GardenController extends BaseController @PostMapping public AjaxResult add(@RequestBody Garden garden) { + garden.setCreateBy(getUsername()); + garden.setCreateTime(DateUtils.getNowDate()); return toAjax(gardenService.insertGarden(garden)); } @@ -88,6 +92,8 @@ public class GardenController extends BaseController @PutMapping public AjaxResult edit(@RequestBody Garden garden) { + garden.setUpdateBy(getUsername()); + garden.setUpdateTime(DateUtils.getNowDate()); return toAjax(gardenService.updateGarden(garden)); } @@ -99,6 +105,8 @@ public class GardenController extends BaseController @PutMapping("/{ids}") public AjaxResult updateStatus(@RequestBody Garden garden, @PathVariable Long[] ids) { + garden.setUpdateBy(getUsername()); + garden.setUpdateTime(DateUtils.getNowDate()); return toAjax(gardenService.updateGardenStatus(garden, ids)); } diff --git a/private-farm/src/main/java/com/jlt/csa/service/impl/FarmZoneServiceImpl.java b/private-farm/src/main/java/com/jlt/csa/service/impl/FarmZoneServiceImpl.java index 89375b2c7..5887cb74b 100644 --- a/private-farm/src/main/java/com/jlt/csa/service/impl/FarmZoneServiceImpl.java +++ b/private-farm/src/main/java/com/jlt/csa/service/impl/FarmZoneServiceImpl.java @@ -8,6 +8,8 @@ import com.jlt.csa.mapper.FarmZoneMapper; import com.jlt.csa.domain.FarmZone; import com.jlt.csa.service.IFarmZoneService; +import static com.ruoyi.common.utils.SecurityUtils.getUsername; + /** * 农场分区Service业务层处理 * @@ -53,7 +55,6 @@ public class FarmZoneServiceImpl implements IFarmZoneService @Override public int insertFarmZone(FarmZone farmZone) { - farmZone.setCreateTime(DateUtils.getNowDate()); return farmZoneMapper.insertFarmZone(farmZone); } @@ -66,7 +67,6 @@ public class FarmZoneServiceImpl implements IFarmZoneService @Override public int updateFarmZone(FarmZone farmZone) { - farmZone.setUpdateTime(DateUtils.getNowDate()); return farmZoneMapper.updateFarmZone(farmZone); } diff --git a/private-farm/src/main/java/com/jlt/csa/service/impl/GardenServiceImpl.java b/private-farm/src/main/java/com/jlt/csa/service/impl/GardenServiceImpl.java index f618ef4e8..0851becba 100644 --- a/private-farm/src/main/java/com/jlt/csa/service/impl/GardenServiceImpl.java +++ b/private-farm/src/main/java/com/jlt/csa/service/impl/GardenServiceImpl.java @@ -66,7 +66,6 @@ public class GardenServiceImpl implements IGardenService @Override public int updateGarden(Garden garden) { - garden.setUpdateTime(DateUtils.getNowDate()); return gardenMapper.updateGarden(garden); } @@ -78,7 +77,6 @@ public class GardenServiceImpl implements IGardenService * @return 结果 */ public int updateGardenStatus(Garden garden, Long[] ids) { - garden.setUpdateTime(DateUtils.getNowDate()); return gardenMapper.updateGardenStatus(garden, ids); }