From 3c83bf252cb3ecaf064c84a1e40516f27d7ccbb6 Mon Sep 17 00:00:00 2001 From: jlt Date: Tue, 29 Mar 2022 15:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=E5=86=9C?= =?UTF-8?q?=E5=9C=BA=E5=88=86=E5=8C=BA=E3=80=81=E8=8F=9C=E5=9C=B0=E5=88=92?= =?UTF-8?q?=E5=88=86=E6=A8=A1=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ontroller.java => FarmZoneController.java} | 40 +- .../jlt/csa/controller/GardenController.java | 17 +- .../base/CsaDictDataController.java | 115 ----- .../base/CsaDictTypeController.java | 126 ----- .../csa/domain/{Zone.java => FarmZone.java} | 26 +- .../main/java/com/jlt/csa/domain/Garden.java | 143 +++--- .../com/jlt/csa/mapper/FarmZoneMapper.java | 61 +++ .../java/com/jlt/csa/mapper/GardenMapper.java | 28 +- .../java/com/jlt/csa/mapper/ZoneMapper.java | 61 --- .../csa/mapper/base/CsaDictDataMapper.java | 96 ---- .../csa/mapper/base/CsaDictTypeMapper.java | 86 ---- .../com/jlt/csa/service/IFarmZoneService.java | 61 +++ .../com/jlt/csa/service/IGardenService.java | 31 +- .../com/jlt/csa/service/IZoneService.java | 61 --- .../csa/service/base/ICsaDictDataService.java | 61 --- .../csa/service/base/ICsaDictTypeService.java | 99 ---- .../csa/service/impl/FarmZoneServiceImpl.java | 96 ++++ .../csa/service/impl/GardenServiceImpl.java | 30 +- .../jlt/csa/service/impl/ZoneServiceImpl.java | 96 ---- .../impl/base/CsaDictDataServiceImpl.java | 112 ----- .../impl/base/CsaDictTypeServiceImpl.java | 224 --------- .../{ZoneMapper.xml => FarmZoneMapper.xml} | 46 +- .../resources/mapper/csa/GardenMapper.xml | 69 ++- .../mapper/csa/base/CsaDictDataMapper.xml | 124 ----- .../mapper/csa/base/CsaDictTypeMapper.xml | 105 ----- .../src/main/resources/application.yml | 5 +- ruoyi-admin/src/main/resources/logback.xml | 1 + ruoyi-ui/src/api/csa/farmzone.js | 8 +- ruoyi-ui/src/api/csa/garden.js | 10 + ruoyi-ui/src/views/csa/farmzone/index.vue | 348 ++++++++------ ruoyi-ui/src/views/csa/garden/index.vue | 437 ++++++++++-------- 31 files changed, 921 insertions(+), 1902 deletions(-) rename private-farm/src/main/java/com/jlt/csa/controller/{ZoneController.java => FarmZoneController.java} (67%) delete mode 100644 private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictDataController.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictTypeController.java rename private-farm/src/main/java/com/jlt/csa/domain/{Zone.java => FarmZone.java} (79%) create mode 100644 private-farm/src/main/java/com/jlt/csa/mapper/FarmZoneMapper.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/mapper/ZoneMapper.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictDataMapper.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictTypeMapper.java create mode 100644 private-farm/src/main/java/com/jlt/csa/service/IFarmZoneService.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/service/IZoneService.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictDataService.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictTypeService.java create mode 100644 private-farm/src/main/java/com/jlt/csa/service/impl/FarmZoneServiceImpl.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/service/impl/ZoneServiceImpl.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictDataServiceImpl.java delete mode 100644 private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictTypeServiceImpl.java rename private-farm/src/main/resources/mapper/csa/{ZoneMapper.xml => FarmZoneMapper.xml} (71%) delete mode 100644 private-farm/src/main/resources/mapper/csa/base/CsaDictDataMapper.xml delete mode 100644 private-farm/src/main/resources/mapper/csa/base/CsaDictTypeMapper.xml diff --git a/private-farm/src/main/java/com/jlt/csa/controller/ZoneController.java b/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java similarity index 67% rename from private-farm/src/main/java/com/jlt/csa/controller/ZoneController.java rename to private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java index c5a5f23a0..2f4dcb644 100644 --- a/private-farm/src/main/java/com/jlt/csa/controller/ZoneController.java +++ b/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java @@ -16,8 +16,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.jlt.csa.domain.Zone; -import com.jlt.csa.service.IZoneService; +import com.jlt.csa.domain.FarmZone; +import com.jlt.csa.service.IFarmZoneService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; @@ -25,24 +25,24 @@ import com.ruoyi.common.core.page.TableDataInfo; * 农场分区Controller * * @author 郏磊涛 - * @date 2022-03-27 + * @date 2022-03-28 */ @RestController @RequestMapping("/csa/farmzone") -public class ZoneController extends BaseController +public class FarmZoneController extends BaseController { @Autowired - private IZoneService zoneService; + private IFarmZoneService farmZoneService; /** * 查询农场分区列表 */ @PreAuthorize("@ss.hasPermi('csa:farmzone:list')") @GetMapping("/list") - public TableDataInfo list(Zone zone) + public TableDataInfo list(FarmZone farmZone) { startPage(); - List list = zoneService.selectZoneList(zone); + List list = farmZoneService.selectFarmZoneList(farmZone); return getDataTable(list); } @@ -52,10 +52,10 @@ public class ZoneController extends BaseController @PreAuthorize("@ss.hasPermi('csa:farmzone:export')") @Log(title = "农场分区", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, Zone zone) + public void export(HttpServletResponse response, FarmZone farmZone) { - List list = zoneService.selectZoneList(zone); - ExcelUtil util = new ExcelUtil(Zone.class); + List list = farmZoneService.selectFarmZoneList(farmZone); + ExcelUtil util = new ExcelUtil(FarmZone.class); util.exportExcel(response, list, "农场分区数据"); } @@ -63,10 +63,10 @@ public class ZoneController extends BaseController * 获取农场分区详细信息 */ @PreAuthorize("@ss.hasPermi('csa:farmzone:query')") - @GetMapping(value = "/{code}") - public AjaxResult getInfo(@PathVariable("code") String code) + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(zoneService.selectZoneByCode(code)); + return AjaxResult.success(farmZoneService.selectFarmZoneById(id)); } /** @@ -75,9 +75,9 @@ public class ZoneController extends BaseController @PreAuthorize("@ss.hasPermi('csa:farmzone:add')") @Log(title = "农场分区", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody Zone zone) + public AjaxResult add(@RequestBody FarmZone farmZone) { - return toAjax(zoneService.insertZone(zone)); + return toAjax(farmZoneService.insertFarmZone(farmZone)); } /** @@ -86,9 +86,9 @@ public class ZoneController extends BaseController @PreAuthorize("@ss.hasPermi('csa:farmzone:edit')") @Log(title = "农场分区", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody Zone zone) + public AjaxResult edit(@RequestBody FarmZone farmZone) { - return toAjax(zoneService.updateZone(zone)); + return toAjax(farmZoneService.updateFarmZone(farmZone)); } /** @@ -96,9 +96,9 @@ public class ZoneController extends BaseController */ @PreAuthorize("@ss.hasPermi('csa:farmzone:remove')") @Log(title = "农场分区", businessType = BusinessType.DELETE) - @DeleteMapping("/{codes}") - public AjaxResult remove(@PathVariable String[] codes) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(zoneService.deleteZoneByCodes(codes)); + return toAjax(farmZoneService.deleteFarmZoneByIds(ids)); } } 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 027cbd067..aef0d2030 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 @@ -23,9 +23,9 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 菜地划分Controller - * + * * @author 郏磊涛 - * @date 2022-03-24 + * @date 2022-03-29 */ @RestController @RequestMapping("/csa/garden") @@ -91,12 +91,23 @@ public class GardenController extends BaseController return toAjax(gardenService.updateGarden(garden)); } + /** + * 批量更新菜地状态 + */ + @PreAuthorize("@ss.hasPermi('csa:garden:edit')") + @Log(title = "农场分区", businessType = BusinessType.UPDATE) + @PutMapping("/{ids}") + public AjaxResult updateStatus(@RequestBody Garden garden, @PathVariable Long[] ids) + { + return toAjax(gardenService.updateGardenStatus(garden, ids)); + } + /** * 删除菜地划分 */ @PreAuthorize("@ss.hasPermi('csa:garden:remove')") @Log(title = "菜地划分", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(gardenService.deleteGardenByIds(ids)); diff --git a/private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictDataController.java b/private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictDataController.java deleted file mode 100644 index 24085d99c..000000000 --- a/private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictDataController.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.jlt.csa.controller.base; - -import com.jlt.csa.service.base.ICsaDictDataService; -import com.jlt.csa.service.base.ICsaDictTypeService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - * 数据字典信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/csa/base/dict/data") -public class CsaDictDataController extends BaseController -{ - @Autowired - private ICsaDictDataService dictDataService; - - @Autowired - private ICsaDictTypeService dictTypeService; - - @PreAuthorize("@ss.hasPermi('system:dict:list')") - @GetMapping("/list") - public TableDataInfo list(SysDictData dictData) - { - startPage(); - List list = dictDataService.selectDictDataList(dictData); - return getDataTable(list); - } - - @Log(title = "字典数据", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:dict:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, SysDictData dictData) - { - List list = dictDataService.selectDictDataList(dictData); - ExcelUtil util = new ExcelUtil(SysDictData.class); - util.exportExcel(response, list, "字典数据"); - } - - /** - * 查询字典数据详细 - */ - @PreAuthorize("@ss.hasPermi('system:dict:query')") - @GetMapping(value = "/{dictCode}") - public AjaxResult getInfo(@PathVariable Long dictCode) - { - return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); - } - - /** - * 根据字典类型查询字典数据信息 - */ - @GetMapping(value = "/type/{dictType}") - public AjaxResult dictType(@PathVariable String dictType) - { - List data = dictTypeService.selectDictDataByType(dictType); - if (StringUtils.isNull(data)) - { - data = new ArrayList(); - } - return AjaxResult.success(data); - } - - /** - * 新增字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:add')") - @Log(title = "字典数据", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictData dict) - { - dict.setCreateBy(getUsername()); - return toAjax(dictDataService.insertDictData(dict)); - } - - /** - * 修改保存字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:edit')") - @Log(title = "字典数据", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictData dict) - { - dict.setUpdateBy(getUsername()); - return toAjax(dictDataService.updateDictData(dict)); - } - - /** - * 删除字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.DELETE) - @DeleteMapping("/{dictCodes}") - public AjaxResult remove(@PathVariable Long[] dictCodes) - { - dictDataService.deleteDictDataByIds(dictCodes); - return success(); - } -} diff --git a/private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictTypeController.java b/private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictTypeController.java deleted file mode 100644 index 8ee22a66b..000000000 --- a/private-farm/src/main/java/com/jlt/csa/controller/base/CsaDictTypeController.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.jlt.csa.controller.base; - -import com.jlt.csa.service.base.ICsaDictTypeService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 数据字典信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/csa/base/dict/type") -public class CsaDictTypeController extends BaseController -{ - @Autowired - private ICsaDictTypeService dictTypeService; - - @PreAuthorize("@ss.hasPermi('system:dict:list')") - @GetMapping("/list") - public TableDataInfo list(SysDictType dictType) - { - startPage(); - List list = dictTypeService.selectDictTypeList(dictType); - return getDataTable(list); - } - - @Log(title = "字典类型", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:dict:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, SysDictType dictType) - { - List list = dictTypeService.selectDictTypeList(dictType); - ExcelUtil util = new ExcelUtil(SysDictType.class); - util.exportExcel(response, list, "字典类型"); - } - - /** - * 查询字典类型详细 - */ - @PreAuthorize("@ss.hasPermi('system:dict:query')") - @GetMapping(value = "/{dictId}") - public AjaxResult getInfo(@PathVariable Long dictId) - { - return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); - } - - /** - * 新增字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:add')") - @Log(title = "字典类型", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { - return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - dict.setCreateBy(getUsername()); - return toAjax(dictTypeService.insertDictType(dict)); - } - - /** - * 修改字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:edit')") - @Log(title = "字典类型", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { - return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - dict.setUpdateBy(getUsername()); - return toAjax(dictTypeService.updateDictType(dict)); - } - - /** - * 删除字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.DELETE) - @DeleteMapping("/{dictIds}") - public AjaxResult remove(@PathVariable Long[] dictIds) - { - dictTypeService.deleteDictTypeByIds(dictIds); - return success(); - } - - /** - * 刷新字典缓存 - */ - @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.CLEAN) - @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { - dictTypeService.resetDictCache(); - return AjaxResult.success(); - } - - /** - * 获取字典选择框列表 - */ - @GetMapping("/optionselect") - public AjaxResult optionselect() - { - List dictTypes = dictTypeService.selectDictTypeAll(); - return AjaxResult.success(dictTypes); - } -} diff --git a/private-farm/src/main/java/com/jlt/csa/domain/Zone.java b/private-farm/src/main/java/com/jlt/csa/domain/FarmZone.java similarity index 79% rename from private-farm/src/main/java/com/jlt/csa/domain/Zone.java rename to private-farm/src/main/java/com/jlt/csa/domain/FarmZone.java index e02269108..c4220eeef 100644 --- a/private-farm/src/main/java/com/jlt/csa/domain/Zone.java +++ b/private-farm/src/main/java/com/jlt/csa/domain/FarmZone.java @@ -6,17 +6,17 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 农场分区对象 csa_zone + * 农场分区对象 csa_farm_zone * * @author 郏磊涛 - * @date 2022-03-27 + * @date 2022-03-28 */ -public class Zone extends BaseEntity +public class FarmZone extends BaseEntity { private static final long serialVersionUID = 1L; - /** 分区代码 */ - private String code; + /** 分区id */ + private Long id; /** 分区类型 */ @Excel(name = "分区类型") @@ -26,21 +26,21 @@ public class Zone extends BaseEntity @Excel(name = "分区名称") private String name; - /** 状态（0正常 1停用） */ - @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + /** 状态 */ + @Excel(name = "状态") private String status; - /** 删除标志（0代表存在 2代表删除） */ + /** 删除标志 */ private String delFlag; - public void setCode(String code) + public void setId(Long id) { - this.code = code; + this.id = id; } - public String getCode() + public Long getId() { - return code; + return id; } public void setType(String type) { @@ -82,7 +82,7 @@ public class Zone extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("code", getCode()) + .append("id", getId()) .append("type", getType()) .append("name", getName()) .append("status", getStatus()) diff --git a/private-farm/src/main/java/com/jlt/csa/domain/Garden.java b/private-farm/src/main/java/com/jlt/csa/domain/Garden.java index 1093a7a3e..2abf1e931 100644 --- a/private-farm/src/main/java/com/jlt/csa/domain/Garden.java +++ b/private-farm/src/main/java/com/jlt/csa/domain/Garden.java @@ -8,25 +8,25 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 菜地划分对象 csa_garden - * + * * @author 郏磊涛 - * @date 2022-03-24 + * @date 2022-03-29 */ public class Garden extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** 菜地id */ private Long id; + /** 农场分区 */ + @Excel(name = "农场分区") + private Long zoneId; + /** 菜地编号 */ @Excel(name = "菜地编号") private String code; - /** 分区代码 */ - @Excel(name = "分区代码") - private String zoneCode; - /** 菜地名称 */ @Excel(name = "菜地名称") private String name; @@ -35,157 +35,164 @@ public class Garden extends BaseEntity @Excel(name = "平方米") private BigDecimal m2; - /** 会员id */ + /** 会员 */ + @Excel(name = "会员") private Long memberId; - /** 菜地管理员id */ + /** 菜地管理员 */ + @Excel(name = "菜地管理员") private Long managerId; - /** 工人id */ + /** 工人 */ + @Excel(name = "工人") private Long workerId; - /** 客服人员id */ + /** 客服人员 */ + @Excel(name = "客服人员") private Long contacterId; /** 耕作状态 */ + @Excel(name = "耕作状态") private String isFarming; /** 售出状态 */ + @Excel(name = "售出状态") private String isSelled; /** 竣工状态 */ @Excel(name = "竣工状态") private String isCompleted; - /** 状态（0正常 1停用） */ + /** 状态 */ + @Excel(name = "状态") private String status; - /** 删除标志（0代表存在 2代表删除） */ + /** 删除标志 */ private String delFlag; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setCode(String code) + public void setZoneId(Long zoneId) + { + this.zoneId = zoneId; + } + + public Long getZoneId() + { + return zoneId; + } + public void setCode(String code) { this.code = code; } - public String getCode() + public String getCode() { return code; } - public void setZoneCode(String zoneCode) - { - this.zoneCode = zoneCode; - } - - public String getZoneCode() - { - return zoneCode; - } - public void setName(String name) + public void setName(String name) { this.name = name; } - public String getName() + public String getName() { return name; } - public void setM2(BigDecimal m2) + public void setM2(BigDecimal m2) { this.m2 = m2; } - public BigDecimal getM2() + public BigDecimal getM2() { return m2; } - public void setMemberId(Long memberId) + public void setMemberId(Long memberId) { this.memberId = memberId; } - public Long getMemberId() + public Long getMemberId() { return memberId; } - public void setManagerId(Long managerId) + public void setManagerId(Long managerId) { this.managerId = managerId; } - public Long getManagerId() + public Long getManagerId() { return managerId; } - public void setWorkerId(Long workerId) + public void setWorkerId(Long workerId) { this.workerId = workerId; } - public Long getWorkerId() + public Long getWorkerId() { return workerId; } - public void setContacterId(Long contacterId) + public void setContacterId(Long contacterId) { this.contacterId = contacterId; } - public Long getContacterId() + public Long getContacterId() { return contacterId; } - public void setIsFarming(String isFarming) + public void setIsFarming(String isFarming) { this.isFarming = isFarming; } - public String getIsFarming() + public String getIsFarming() { return isFarming; } - public void setIsSelled(String isSelled) + public void setIsSelled(String isSelled) { this.isSelled = isSelled; } - public String getIsSelled() + public String getIsSelled() { return isSelled; } - public void setIsCompleted(String isCompleted) + public void setIsCompleted(String isCompleted) { this.isCompleted = isCompleted; } - public String getIsCompleted() + public String getIsCompleted() { return isCompleted; } - public void setStatus(String status) + public void setStatus(String status) { this.status = status; } - public String getStatus() + public String getStatus() { return status; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() + public String getDelFlag() { return delFlag; } @@ -193,25 +200,25 @@ public class Garden extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("code", getCode()) - .append("zoneCode", getZoneCode()) - .append("name", getName()) - .append("m2", getM2()) - .append("memberId", getMemberId()) - .append("managerId", getManagerId()) - .append("workerId", getWorkerId()) - .append("contacterId", getContacterId()) - .append("isFarming", getIsFarming()) - .append("isSelled", getIsSelled()) - .append("isCompleted", getIsCompleted()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + .append("id", getId()) + .append("zoneId", getZoneId()) + .append("code", getCode()) + .append("name", getName()) + .append("m2", getM2()) + .append("memberId", getMemberId()) + .append("managerId", getManagerId()) + .append("workerId", getWorkerId()) + .append("contacterId", getContacterId()) + .append("isFarming", getIsFarming()) + .append("isSelled", getIsSelled()) + .append("isCompleted", getIsCompleted()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/private-farm/src/main/java/com/jlt/csa/mapper/FarmZoneMapper.java b/private-farm/src/main/java/com/jlt/csa/mapper/FarmZoneMapper.java new file mode 100644 index 000000000..656afd68a --- /dev/null +++ b/private-farm/src/main/java/com/jlt/csa/mapper/FarmZoneMapper.java @@ -0,0 +1,61 @@ +package com.jlt.csa.mapper; + +import java.util.List; +import com.jlt.csa.domain.FarmZone; + +/** + * 农场分区Mapper接口 + * + * @author 郏磊涛 + * @date 2022-03-28 + */ +public interface FarmZoneMapper +{ + /** + * 查询农场分区 + * + * @param id 农场分区主键 + * @return 农场分区 + */ + public FarmZone selectFarmZoneById(Long id); + + /** + * 查询农场分区列表 + * + * @param farmZone 农场分区 + * @return 农场分区集合 + */ + public List selectFarmZoneList(FarmZone farmZone); + + /** + * 新增农场分区 + * + * @param farmZone 农场分区 + * @return 结果 + */ + public int insertFarmZone(FarmZone farmZone); + + /** + * 修改农场分区 + * + * @param farmZone 农场分区 + * @return 结果 + */ + public int updateFarmZone(FarmZone farmZone); + + /** + * 删除农场分区 + * + * @param id 农场分区主键 + * @return 结果 + */ + public int deleteFarmZoneById(Long id); + + /** + * 批量删除农场分区 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteFarmZoneByIds(Long[] ids); +} diff --git a/private-farm/src/main/java/com/jlt/csa/mapper/GardenMapper.java b/private-farm/src/main/java/com/jlt/csa/mapper/GardenMapper.java index 53d6bd213..e86d7e076 100644 --- a/private-farm/src/main/java/com/jlt/csa/mapper/GardenMapper.java +++ b/private-farm/src/main/java/com/jlt/csa/mapper/GardenMapper.java @@ -2,18 +2,19 @@ package com.jlt.csa.mapper; import java.util.List; import com.jlt.csa.domain.Garden; +import org.apache.ibatis.annotations.Param; /** * 菜地划分Mapper接口 - * + * * @author 郏磊涛 - * @date 2022-03-24 + * @date 2022-03-29 */ -public interface GardenMapper +public interface GardenMapper { /** * 查询菜地划分 - * + * * @param id 菜地划分主键 * @return 菜地划分 */ @@ -21,7 +22,7 @@ public interface GardenMapper /** * 查询菜地划分列表 - * + * * @param garden 菜地划分 * @return 菜地划分集合 */ @@ -29,7 +30,7 @@ public interface GardenMapper /** * 新增菜地划分 - * + * * @param garden 菜地划分 * @return 结果 */ @@ -37,15 +38,24 @@ public interface GardenMapper /** * 修改菜地划分 - * + * * @param garden 菜地划分 * @return 结果 */ public int updateGarden(Garden garden); + /** + * 更新多个菜地状态 + * + * @param garden 菜地 + * @param ids 菜地id集合 + * @return 结果 + */ + public int updateGardenStatus(@Param("garden") Garden garden, @Param("ids") Long[] ids); + /** * 删除菜地划分 - * + * * @param id 菜地划分主键 * @return 结果 */ @@ -53,7 +63,7 @@ public interface GardenMapper /** * 批量删除菜地划分 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/private-farm/src/main/java/com/jlt/csa/mapper/ZoneMapper.java b/private-farm/src/main/java/com/jlt/csa/mapper/ZoneMapper.java deleted file mode 100644 index 575150bdc..000000000 --- a/private-farm/src/main/java/com/jlt/csa/mapper/ZoneMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jlt.csa.mapper; - -import java.util.List; -import com.jlt.csa.domain.Zone; - -/** - * 农场分区Mapper接口 - * - * @author 郏磊涛 - * @date 2022-03-27 - */ -public interface ZoneMapper -{ - /** - * 查询农场分区 - * - * @param code 农场分区主键 - * @return 农场分区 - */ - public Zone selectZoneByCode(String code); - - /** - * 查询农场分区列表 - * - * @param zone 农场分区 - * @return 农场分区集合 - */ - public List selectZoneList(Zone zone); - - /** - * 新增农场分区 - * - * @param zone 农场分区 - * @return 结果 - */ - public int insertZone(Zone zone); - - /** - * 修改农场分区 - * - * @param zone 农场分区 - * @return 结果 - */ - public int updateZone(Zone zone); - - /** - * 删除农场分区 - * - * @param code 农场分区主键 - * @return 结果 - */ - public int deleteZoneByCode(String code); - - /** - * 批量删除农场分区 - * - * @param codes 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteZoneByCodes(String[] codes); -} diff --git a/private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictDataMapper.java b/private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictDataMapper.java deleted file mode 100644 index 45277cb4c..000000000 --- a/private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictDataMapper.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.jlt.csa.mapper.base; - -import com.ruoyi.common.core.domain.entity.SysDictData; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 字典表 数据层 - * - * @author ruoyi - */ -public interface CsaDictDataMapper -{ - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - public List selectDictDataList(SysDictData dictData); - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - public List selectDictDataByType(String dictType); - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - public SysDictData selectDictDataById(Long dictCode); - - /** - * 查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据 - */ - public int countDictDataByType(String dictType); - - /** - * 通过字典ID删除字典数据信息 - * - * @param dictCode 字典数据ID - * @return 结果 - */ - public int deleteDictDataById(Long dictCode); - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - * @return 结果 - */ - public int deleteDictDataByIds(Long[] dictCodes); - - /** - * 新增字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int insertDictData(SysDictData dictData); - - /** - * 修改字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int updateDictData(SysDictData dictData); - - /** - * 同步修改字典类型 - * - * @param oldDictType 旧字典类型 - * @param newDictType 新旧字典类型 - * @return 结果 - */ - public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); -} diff --git a/private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictTypeMapper.java b/private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictTypeMapper.java deleted file mode 100644 index 05527671c..000000000 --- a/private-farm/src/main/java/com/jlt/csa/mapper/base/CsaDictTypeMapper.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.jlt.csa.mapper.base; - -import com.ruoyi.common.core.domain.entity.SysDictType; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 字典表 数据层 - * - * @author ruoyi - */ -@Mapper -public interface CsaDictTypeMapper -{ - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - public List selectDictTypeList(SysDictType dictType); - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - public List selectDictTypeAll(); - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - public SysDictType selectDictTypeById(Long dictId); - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - public SysDictType selectDictTypeByType(String dictType); - - /** - * 通过字典ID删除字典信息 - * - * @param dictId 字典ID - * @return 结果 - */ - public int deleteDictTypeById(Long dictId); - - /** - * 批量删除字典类型信息 - * - * @param dictIds 需要删除的字典ID - * @return 结果 - */ - public int deleteDictTypeByIds(Long[] dictIds); - - /** - * 新增字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int insertDictType(SysDictType dictType); - - /** - * 修改字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int updateDictType(SysDictType dictType); - - /** - * 校验字典类型称是否唯一 - * - * @param dictType 字典类型 - * @return 结果 - */ - public SysDictType checkDictTypeUnique(String dictType); -} diff --git a/private-farm/src/main/java/com/jlt/csa/service/IFarmZoneService.java b/private-farm/src/main/java/com/jlt/csa/service/IFarmZoneService.java new file mode 100644 index 000000000..b3bfdcd96 --- /dev/null +++ b/private-farm/src/main/java/com/jlt/csa/service/IFarmZoneService.java @@ -0,0 +1,61 @@ +package com.jlt.csa.service; + +import java.util.List; +import com.jlt.csa.domain.FarmZone; + +/** + * 农场分区Service接口 + * + * @author 郏磊涛 + * @date 2022-03-28 + */ +public interface IFarmZoneService +{ + /** + * 查询农场分区 + * + * @param id 农场分区主键 + * @return 农场分区 + */ + public FarmZone selectFarmZoneById(Long id); + + /** + * 查询农场分区列表 + * + * @param farmZone 农场分区 + * @return 农场分区集合 + */ + public List selectFarmZoneList(FarmZone farmZone); + + /** + * 新增农场分区 + * + * @param farmZone 农场分区 + * @return 结果 + */ + public int insertFarmZone(FarmZone farmZone); + + /** + * 修改农场分区 + * + * @param farmZone 农场分区 + * @return 结果 + */ + public int updateFarmZone(FarmZone farmZone); + + /** + * 批量删除农场分区 + * + * @param ids 需要删除的农场分区主键集合 + * @return 结果 + */ + public int deleteFarmZoneByIds(Long[] ids); + + /** + * 删除农场分区信息 + * + * @param id 农场分区主键 + * @return 结果 + */ + public int deleteFarmZoneById(Long id); +} diff --git a/private-farm/src/main/java/com/jlt/csa/service/IGardenService.java b/private-farm/src/main/java/com/jlt/csa/service/IGardenService.java index 96445ea78..061811220 100644 --- a/private-farm/src/main/java/com/jlt/csa/service/IGardenService.java +++ b/private-farm/src/main/java/com/jlt/csa/service/IGardenService.java @@ -5,15 +5,15 @@ import com.jlt.csa.domain.Garden; /** * 菜地划分Service接口 - * + * * @author 郏磊涛 - * @date 2022-03-24 + * @date 2022-03-29 */ -public interface IGardenService +public interface IGardenService { /** * 查询菜地划分 - * + * * @param id 菜地划分主键 * @return 菜地划分 */ @@ -21,7 +21,7 @@ public interface IGardenService /** * 查询菜地划分列表 - * + * * @param garden 菜地划分 * @return 菜地划分集合 */ @@ -29,23 +29,32 @@ public interface IGardenService /** * 新增菜地划分 - * + * * @param garden 菜地划分 * @return 结果 */ public int insertGarden(Garden garden); /** - * 修改菜地划分 - * - * @param garden 菜地划分 + * 修改菜地 + * + * @param garden 菜地 * @return 结果 */ public int updateGarden(Garden garden); + /** + * 批量修改菜地状态 + * + * @param garden 菜地划分 + * @param ids 需要更改的菜地id集合 + * @return 结果 + */ + public int updateGardenStatus(Garden garden, Long[] ids); + /** * 批量删除菜地划分 - * + * * @param ids 需要删除的菜地划分主键集合 * @return 结果 */ @@ -53,7 +62,7 @@ public interface IGardenService /** * 删除菜地划分信息 - * + * * @param id 菜地划分主键 * @return 结果 */ diff --git a/private-farm/src/main/java/com/jlt/csa/service/IZoneService.java b/private-farm/src/main/java/com/jlt/csa/service/IZoneService.java deleted file mode 100644 index ce956efc0..000000000 --- a/private-farm/src/main/java/com/jlt/csa/service/IZoneService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jlt.csa.service; - -import java.util.List; -import com.jlt.csa.domain.Zone; - -/** - * 农场分区Service接口 - * - * @author 郏磊涛 - * @date 2022-03-27 - */ -public interface IZoneService -{ - /** - * 查询农场分区 - * - * @param code 农场分区主键 - * @return 农场分区 - */ - public Zone selectZoneByCode(String code); - - /** - * 查询农场分区列表 - * - * @param zone 农场分区 - * @return 农场分区集合 - */ - public List selectZoneList(Zone zone); - - /** - * 新增农场分区 - * - * @param zone 农场分区 - * @return 结果 - */ - public int insertZone(Zone zone); - - /** - * 修改农场分区 - * - * @param zone 农场分区 - * @return 结果 - */ - public int updateZone(Zone zone); - - /** - * 批量删除农场分区 - * - * @param codes 需要删除的农场分区主键集合 - * @return 结果 - */ - public int deleteZoneByCodes(String[] codes); - - /** - * 删除农场分区信息 - * - * @param code 农场分区主键 - * @return 结果 - */ - public int deleteZoneByCode(String code); -} diff --git a/private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictDataService.java b/private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictDataService.java deleted file mode 100644 index 299a9f2ed..000000000 --- a/private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictDataService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jlt.csa.service.base; - -import com.ruoyi.common.core.domain.entity.SysDictData; - -import java.util.List; - -/** - * 字典 业务层 - * - * @author ruoyi - */ -public interface ICsaDictDataService -{ - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - public List selectDictDataList(SysDictData dictData); - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - public String selectDictLabel(String dictType, String dictValue); - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - public SysDictData selectDictDataById(Long dictCode); - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - */ - public void deleteDictDataByIds(Long[] dictCodes); - - /** - * 新增保存字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int insertDictData(SysDictData dictData); - - /** - * 修改保存字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int updateDictData(SysDictData dictData); -} diff --git a/private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictTypeService.java b/private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictTypeService.java deleted file mode 100644 index c73f1e9f9..000000000 --- a/private-farm/src/main/java/com/jlt/csa/service/base/ICsaDictTypeService.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.jlt.csa.service.base; - -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; - -import java.util.List; - -/** - * 字典 业务层 - * - * @author ruoyi - */ -public interface ICsaDictTypeService -{ - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - public List selectDictTypeList(SysDictType dictType); - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - public List selectDictTypeAll(); - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - public List selectDictDataByType(String dictType); - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - public SysDictType selectDictTypeById(Long dictId); - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - public SysDictType selectDictTypeByType(String dictType); - - /** - * 批量删除字典信息 - * - * @param dictIds 需要删除的字典ID - */ - public void deleteDictTypeByIds(Long[] dictIds); - - /** - * 加载字典缓存数据 - */ - public void loadingDictCache(); - - /** - * 清空字典缓存数据 - */ - public void clearDictCache(); - - /** - * 重置字典缓存数据 - */ - public void resetDictCache(); - - /** - * 新增保存字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int insertDictType(SysDictType dictType); - - /** - * 修改保存字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int updateDictType(SysDictType dictType); - - /** - * 校验字典类型称是否唯一 - * - * @param dictType 字典类型 - * @return 结果 - */ - public String checkDictTypeUnique(SysDictType dictType); -} 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 new file mode 100644 index 000000000..89375b2c7 --- /dev/null +++ b/private-farm/src/main/java/com/jlt/csa/service/impl/FarmZoneServiceImpl.java @@ -0,0 +1,96 @@ +package com.jlt.csa.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.jlt.csa.mapper.FarmZoneMapper; +import com.jlt.csa.domain.FarmZone; +import com.jlt.csa.service.IFarmZoneService; + +/** + * 农场分区Service业务层处理 + * + * @author 郏磊涛 + * @date 2022-03-28 + */ +@Service +public class FarmZoneServiceImpl implements IFarmZoneService +{ + @Autowired + private FarmZoneMapper farmZoneMapper; + + /** + * 查询农场分区 + * + * @param id 农场分区主键 + * @return 农场分区 + */ + @Override + public FarmZone selectFarmZoneById(Long id) + { + return farmZoneMapper.selectFarmZoneById(id); + } + + /** + * 查询农场分区列表 + * + * @param farmZone 农场分区 + * @return 农场分区 + */ + @Override + public List selectFarmZoneList(FarmZone farmZone) + { + return farmZoneMapper.selectFarmZoneList(farmZone); + } + + /** + * 新增农场分区 + * + * @param farmZone 农场分区 + * @return 结果 + */ + @Override + public int insertFarmZone(FarmZone farmZone) + { + farmZone.setCreateTime(DateUtils.getNowDate()); + return farmZoneMapper.insertFarmZone(farmZone); + } + + /** + * 修改农场分区 + * + * @param farmZone 农场分区 + * @return 结果 + */ + @Override + public int updateFarmZone(FarmZone farmZone) + { + farmZone.setUpdateTime(DateUtils.getNowDate()); + return farmZoneMapper.updateFarmZone(farmZone); + } + + /** + * 批量删除农场分区 + * + * @param ids 需要删除的农场分区主键 + * @return 结果 + */ + @Override + public int deleteFarmZoneByIds(Long[] ids) + { + return farmZoneMapper.deleteFarmZoneByIds(ids); + } + + /** + * 删除农场分区信息 + * + * @param id 农场分区主键 + * @return 结果 + */ + @Override + public int deleteFarmZoneById(Long id) + { + return farmZoneMapper.deleteFarmZoneById(id); + } +} 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 cb79c9acb..f618ef4e8 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 @@ -10,19 +10,19 @@ import com.jlt.csa.service.IGardenService; /** * 菜地划分Service业务层处理 - * + * * @author 郏磊涛 - * @date 2022-03-24 + * @date 2022-03-29 */ @Service -public class GardenServiceImpl implements IGardenService +public class GardenServiceImpl implements IGardenService { @Autowired private GardenMapper gardenMapper; /** * 查询菜地划分 - * + * * @param id 菜地划分主键 * @return 菜地划分 */ @@ -34,7 +34,7 @@ public class GardenServiceImpl implements IGardenService /** * 查询菜地划分列表 - * + * * @param garden 菜地划分 * @return 菜地划分 */ @@ -46,7 +46,7 @@ public class GardenServiceImpl implements IGardenService /** * 新增菜地划分 - * + * * @param garden 菜地划分 * @return 结果 */ @@ -59,7 +59,7 @@ public class GardenServiceImpl implements IGardenService /** * 修改菜地划分 - * + * * @param garden 菜地划分 * @return 结果 */ @@ -70,9 +70,21 @@ public class GardenServiceImpl implements IGardenService return gardenMapper.updateGarden(garden); } + /** + * 批量修改菜地状态 + * + * @param garden 菜地划分 + * @param ids 需要更改的菜地id集合 + * @return 结果 + */ + public int updateGardenStatus(Garden garden, Long[] ids) { + garden.setUpdateTime(DateUtils.getNowDate()); + return gardenMapper.updateGardenStatus(garden, ids); + } + /** * 批量删除菜地划分 - * + * * @param ids 需要删除的菜地划分主键 * @return 结果 */ @@ -84,7 +96,7 @@ public class GardenServiceImpl implements IGardenService /** * 删除菜地划分信息 - * + * * @param id 菜地划分主键 * @return 结果 */ diff --git a/private-farm/src/main/java/com/jlt/csa/service/impl/ZoneServiceImpl.java b/private-farm/src/main/java/com/jlt/csa/service/impl/ZoneServiceImpl.java deleted file mode 100644 index 658d009a9..000000000 --- a/private-farm/src/main/java/com/jlt/csa/service/impl/ZoneServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.jlt.csa.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.jlt.csa.mapper.ZoneMapper; -import com.jlt.csa.domain.Zone; -import com.jlt.csa.service.IZoneService; - -/** - * 农场分区Service业务层处理 - * - * @author 郏磊涛 - * @date 2022-03-27 - */ -@Service -public class ZoneServiceImpl implements IZoneService -{ - @Autowired - private ZoneMapper zoneMapper; - - /** - * 查询农场分区 - * - * @param code 农场分区主键 - * @return 农场分区 - */ - @Override - public Zone selectZoneByCode(String code) - { - return zoneMapper.selectZoneByCode(code); - } - - /** - * 查询农场分区列表 - * - * @param zone 农场分区 - * @return 农场分区 - */ - @Override - public List selectZoneList(Zone zone) - { - return zoneMapper.selectZoneList(zone); - } - - /** - * 新增农场分区 - * - * @param zone 农场分区 - * @return 结果 - */ - @Override - public int insertZone(Zone zone) - { - zone.setCreateTime(DateUtils.getNowDate()); - return zoneMapper.insertZone(zone); - } - - /** - * 修改农场分区 - * - * @param zone 农场分区 - * @return 结果 - */ - @Override - public int updateZone(Zone zone) - { - zone.setUpdateTime(DateUtils.getNowDate()); - return zoneMapper.updateZone(zone); - } - - /** - * 批量删除农场分区 - * - * @param codes 需要删除的农场分区主键 - * @return 结果 - */ - @Override - public int deleteZoneByCodes(String[] codes) - { - return zoneMapper.deleteZoneByCodes(codes); - } - - /** - * 删除农场分区信息 - * - * @param code 农场分区主键 - * @return 结果 - */ - @Override - public int deleteZoneByCode(String code) - { - return zoneMapper.deleteZoneByCode(code); - } -} diff --git a/private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictDataServiceImpl.java b/private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictDataServiceImpl.java deleted file mode 100644 index 8479c72d0..000000000 --- a/private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictDataServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.jlt.csa.service.impl.base; - -import com.jlt.csa.mapper.base.CsaDictDataMapper; -import com.jlt.csa.service.base.ICsaDictDataService; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.utils.DictUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 字典 业务层处理 - * - * @author ruoyi - */ -@Service -public class CsaDictDataServiceImpl implements ICsaDictDataService -{ - @Autowired - private CsaDictDataMapper dictDataMapper; - - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - @Override - public List selectDictDataList(SysDictData dictData) - { - return dictDataMapper.selectDictDataList(dictData); - } - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - @Override - public String selectDictLabel(String dictType, String dictValue) - { - return dictDataMapper.selectDictLabel(dictType, dictValue); - } - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - @Override - public SysDictData selectDictDataById(Long dictCode) - { - return dictDataMapper.selectDictDataById(dictCode); - } - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - */ - @Override - public void deleteDictDataByIds(Long[] dictCodes) - { - for (Long dictCode : dictCodes) - { - SysDictData data = selectDictDataById(dictCode); - dictDataMapper.deleteDictDataById(dictCode); - List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); - } - } - - /** - * 新增保存字典数据信息 - * - * @param data 字典数据信息 - * @return 结果 - */ - @Override - public int insertDictData(SysDictData data) - { - int row = dictDataMapper.insertDictData(data); - if (row > 0) - { - List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); - } - return row; - } - - /** - * 修改保存字典数据信息 - * - * @param data 字典数据信息 - * @return 结果 - */ - @Override - public int updateDictData(SysDictData data) - { - int row = dictDataMapper.updateDictData(data); - if (row > 0) - { - List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); - } - return row; - } -} diff --git a/private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictTypeServiceImpl.java b/private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictTypeServiceImpl.java deleted file mode 100644 index 164096fb0..000000000 --- a/private-farm/src/main/java/com/jlt/csa/service/impl/base/CsaDictTypeServiceImpl.java +++ /dev/null @@ -1,224 +0,0 @@ -package com.jlt.csa.service.impl.base; - -import com.jlt.csa.mapper.base.CsaDictDataMapper; -import com.jlt.csa.mapper.base.CsaDictTypeMapper; -import com.jlt.csa.service.base.ICsaDictTypeService; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.PostConstruct; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * 字典 业务层处理 - * - * @author ruoyi - */ -@Service -public class CsaDictTypeServiceImpl implements ICsaDictTypeService -{ - @Autowired - private CsaDictTypeMapper dictTypeMapper; - - @Autowired - private CsaDictDataMapper dictDataMapper; - - /** - * 项目启动时，初始化字典到缓存 - */ - @PostConstruct - public void init() - { - loadingDictCache(); - } - - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - @Override - public List selectDictTypeList(SysDictType dictType) - { - return dictTypeMapper.selectDictTypeList(dictType); - } - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - @Override - public List selectDictTypeAll() - { - return dictTypeMapper.selectDictTypeAll(); - } - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - @Override - public List selectDictDataByType(String dictType) - { - List dictDatas = DictUtils.getDictCache(dictType); - if (StringUtils.isNotEmpty(dictDatas)) - { - return dictDatas; - } - dictDatas = dictDataMapper.selectDictDataByType(dictType); - if (StringUtils.isNotEmpty(dictDatas)) - { - DictUtils.setDictCache(dictType, dictDatas); - return dictDatas; - } - return null; - } - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - @Override - public SysDictType selectDictTypeById(Long dictId) - { - return dictTypeMapper.selectDictTypeById(dictId); - } - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - @Override - public SysDictType selectDictTypeByType(String dictType) - { - return dictTypeMapper.selectDictTypeByType(dictType); - } - - /** - * 批量删除字典类型信息 - * - * @param dictIds 需要删除的字典ID - */ - @Override - public void deleteDictTypeByIds(Long[] dictIds) - { - for (Long dictId : dictIds) - { - SysDictType dictType = selectDictTypeById(dictId); - if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) - { - throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); - } - dictTypeMapper.deleteDictTypeById(dictId); - DictUtils.removeDictCache(dictType.getDictType()); - } - } - - /** - * 加载字典缓存数据 - */ - @Override - public void loadingDictCache() - { - SysDictData dictData = new SysDictData(); - dictData.setStatus("0"); - Map> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType)); - for (Map.Entry> entry : dictDataMap.entrySet()) - { - DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList())); - } - } - - /** - * 清空字典缓存数据 - */ - @Override - public void clearDictCache() - { - DictUtils.clearDictCache(); - } - - /** - * 重置字典缓存数据 - */ - @Override - public void resetDictCache() - { - clearDictCache(); - loadingDictCache(); - } - - /** - * 新增保存字典类型信息 - * - * @param dict 字典类型信息 - * @return 结果 - */ - @Override - public int insertDictType(SysDictType dict) - { - int row = dictTypeMapper.insertDictType(dict); - if (row > 0) - { - DictUtils.setDictCache(dict.getDictType(), null); - } - return row; - } - - /** - * 修改保存字典类型信息 - * - * @param dict 字典类型信息 - * @return 结果 - */ - @Override - @Transactional - public int updateDictType(SysDictType dict) - { - SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId()); - dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType()); - int row = dictTypeMapper.updateDictType(dict); - if (row > 0) - { - List dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType()); - DictUtils.setDictCache(dict.getDictType(), dictDatas); - } - return row; - } - - /** - * 校验字典类型称是否唯一 - * - * @param dict 字典类型 - * @return 结果 - */ - @Override - public String checkDictTypeUnique(SysDictType dict) - { - Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); - SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); - if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } -} diff --git a/private-farm/src/main/resources/mapper/csa/ZoneMapper.xml b/private-farm/src/main/resources/mapper/csa/FarmZoneMapper.xml similarity index 71% rename from private-farm/src/main/resources/mapper/csa/ZoneMapper.xml rename to private-farm/src/main/resources/mapper/csa/FarmZoneMapper.xml index 8d0991bc3..5471cc63f 100644 --- a/private-farm/src/main/resources/mapper/csa/ZoneMapper.xml +++ b/private-farm/src/main/resources/mapper/csa/FarmZoneMapper.xml @@ -2,10 +2,10 @@ - + - - + + @@ -17,28 +17,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select code, type, name, status, del_flag, create_by, create_time, update_by, update_time, remark from csa_zone + + select id, type, name, status, del_flag, create_by, create_time, update_by, update_time, remark from csa_farm_zone - + + and type = #{type} and name = #{name} and status = #{status} - + + where id = #{id} - - insert into csa_zone + + insert into csa_farm_zone - code, type, name, status, @@ -50,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, - #{code}, #{type}, #{name}, #{status}, @@ -63,8 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - update csa_zone + + update csa_farm_zone type = #{type}, name = #{name}, @@ -76,17 +74,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, remark = #{remark}, - where code = #{code} + where id = #{id} - - delete from csa_zone where code = #{code} + + delete from csa_farm_zone where id = #{id} - - delete from csa_zone where code in - - #{code} + + delete from csa_farm_zone where id in + + #{id} \ No newline at end of file diff --git a/private-farm/src/main/resources/mapper/csa/GardenMapper.xml b/private-farm/src/main/resources/mapper/csa/GardenMapper.xml index 283c7bb0f..e21aaf700 100644 --- a/private-farm/src/main/resources/mapper/csa/GardenMapper.xml +++ b/private-farm/src/main/resources/mapper/csa/GardenMapper.xml @@ -1,13 +1,13 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + - @@ -27,15 +27,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, code, zone_code, name, m2, member_id, manager_id, worker_id, contacter_id, is_farming, is_selled, is_completed, status, del_flag, create_by, create_time, update_by, update_time, remark from csa_garden + select id, zone_id, code, name, m2, member_id, manager_id, worker_id, contacter_id, is_farming, is_selled, is_completed, status, del_flag, create_by, create_time, update_by, update_time, remark from csa_garden - + - + insert into csa_garden id, + zone_id, code, - zone_code, name, m2, member_id, manager_id, worker_id, contacter_id, - is_farming, - is_selled, - is_completed, + is_farming, + is_selled, + is_completed, status, del_flag, create_by, @@ -73,20 +75,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, - + #{id}, + #{zoneId}, #{code}, - #{zoneCode}, #{name}, #{m2}, #{memberId}, #{managerId}, #{workerId}, #{contacterId}, - #{isFarming}, - #{isSelled}, - #{isCompleted}, + #{isFarming}, + #{isSelled}, + #{isCompleted}, #{status}, #{delFlag}, #{createBy}, @@ -94,23 +96,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, - + update csa_garden + zone_id = #{zoneId}, code = #{code}, - zone_code = #{zoneCode}, - name = #{name}, + #{name}, m2 = #{m2}, member_id = #{memberId}, manager_id = #{managerId}, worker_id = #{workerId}, contacter_id = #{contacterId}, - is_farming = #{isFarming}, - is_selled = #{isSelled}, - is_completed = #{isCompleted}, + is_farming = #{isFarming}, + is_selled = #{isSelled}, + is_completed = #{isCompleted}, status = #{status}, del_flag = #{delFlag}, create_by = #{createBy}, @@ -122,12 +124,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update csa_garden + + is_farming = #{garden.isFarming}, + is_selled = #{garden.isSelled}, + is_completed = #{garden.isCompleted}, + status = #{garden.status}, + del_flag = #{garden.delFlag}, + update_by = #{garden.updateBy}, + update_time = #{garden.updateTime}, + + where id in + + #{id} + + + delete from csa_garden where id = #{id} - delete from csa_garden where id in + delete from csa_garden where id in #{id} diff --git a/private-farm/src/main/resources/mapper/csa/base/CsaDictDataMapper.xml b/private-farm/src/main/resources/mapper/csa/base/CsaDictDataMapper.xml deleted file mode 100644 index 7edfce74b..000000000 --- a/private-farm/src/main/resources/mapper/csa/base/CsaDictDataMapper.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark - from csa_dict_data - - - - - - - - - - - - - - delete from csa_dict_data where dict_code = #{dictCode} - - - - delete from csa_dict_data where dict_code in - - #{dictCode} - - - - - update csa_dict_data - - dict_sort = #{dictSort}, - dict_label = #{dictLabel}, - dict_value = #{dictValue}, - dict_type = #{dictType}, - css_class = #{cssClass}, - list_class = #{listClass}, - is_default = #{isDefault}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where dict_code = #{dictCode} - - - - update csa_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - - - - insert into csa_dict_data( - dict_sort, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - remark, - create_by, - create_time - )values( - #{dictSort}, - #{dictLabel}, - #{dictValue}, - #{dictType}, - #{cssClass}, - #{listClass}, - #{isDefault}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - \ No newline at end of file diff --git a/private-farm/src/main/resources/mapper/csa/base/CsaDictTypeMapper.xml b/private-farm/src/main/resources/mapper/csa/base/CsaDictTypeMapper.xml deleted file mode 100644 index d2ca275c3..000000000 --- a/private-farm/src/main/resources/mapper/csa/base/CsaDictTypeMapper.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - select dict_id, dict_name, dict_type, status, create_by, create_time, remark - from csa_dict_type - - - - - - - - - - - - - - delete from csa_dict_type where dict_id = #{dictId} - - - - delete from csa_dict_type where dict_id in - - #{dictId} - - - - - update csa_dict_type - - dict_name = #{dictName}, - dict_type = #{dictType}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where dict_id = #{dictId} - - - - insert into csa_dict_type( - dict_name, - dict_type, - status, - remark, - create_by, - create_time - )values( - #{dictName}, - #{dictType}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a1d08a272..ed00cd045 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -94,11 +94,14 @@ token: # MyBatis配置 mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain,com.jlt.**.domain + typeAliasesPackage: com.ruoyi.**.domain, com.jlt.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml + # 在控制台显示sql输出 + #configuration: + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # PageHelper分页插件 pagehelper: diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a57207..62c42835b 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -73,6 +73,7 @@ + diff --git a/ruoyi-ui/src/api/csa/farmzone.js b/ruoyi-ui/src/api/csa/farmzone.js index 5d71b7b86..827dba349 100644 --- a/ruoyi-ui/src/api/csa/farmzone.js +++ b/ruoyi-ui/src/api/csa/farmzone.js @@ -10,9 +10,9 @@ export function listFarmzone(query) { } // 查询农场分区详细 -export function getFarmzone(code) { +export function getFarmzone(id) { return request({ - url: '/csa/farmzone/' + code, + url: '/csa/farmzone/' + id, method: 'get' }) } @@ -36,9 +36,9 @@ export function updateFarmzone(data) { } // 删除农场分区 -export function delFarmzone(code) { +export function delFarmzone(id) { return request({ - url: '/csa/farmzone/' + code, + url: '/csa/farmzone/' + id, method: 'delete' }) } diff --git a/ruoyi-ui/src/api/csa/garden.js b/ruoyi-ui/src/api/csa/garden.js index 4164d8a18..4ba2fe2af 100644 --- a/ruoyi-ui/src/api/csa/garden.js +++ b/ruoyi-ui/src/api/csa/garden.js @@ -35,6 +35,16 @@ export function updateGarden(data) { }) } +// 批量修改菜地划分状态 +export function updateGardenStatus(data, id) { + return request({ + url: '/csa/garden/' + id, + method: 'put', + data: data + }) +} + + // 删除菜地划分 export function delGarden(id) { return request({ diff --git a/ruoyi-ui/src/views/csa/farmzone/index.vue b/ruoyi-ui/src/views/csa/farmzone/index.vue index f35edf4c5..dba747136 100644 --- a/ruoyi-ui/src/views/csa/farmzone/index.vue +++ b/ruoyi-ui/src/views/csa/farmzone/index.vue @@ -1,6 +1,16 @@ diff --git a/ruoyi-ui/src/views/csa/garden/index.vue b/ruoyi-ui/src/views/csa/garden/index.vue index 66a389c78..4b0e19923 100644 --- a/ruoyi-ui/src/views/csa/garden/index.vue +++ b/ruoyi-ui/src/views/csa/garden/index.vue @@ -1,7 +1,17 @@