From 1471397a3a917494d13f46c4b7ef7549f933f083 Mon Sep 17 00:00:00 2001 From: CYF <1590648573@qq.com> Date: Mon, 10 Mar 2025 13:53:38 +0800 Subject: [PATCH 1/4] CYF --- .../java/com/ruoyi/applet/contoller/AppletExaminationController.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletExaminationController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletExaminationController.java index 5208ae4..c5f9a54 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletExaminationController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletExaminationController.java @@ -9,10 +9,7 @@ import com.ruoyi.model.service.IAppExaminationInstructionsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Api(description = "考核") @RestController From 58b2ca5168f51e0fa63deab9f0bbc3216306a3ae Mon Sep 17 00:00:00 2001 From: CYF <1590648573@qq.com> Date: Mon, 10 Mar 2025 14:05:32 +0800 Subject: [PATCH 2/4] CYF --- ruoyi-admin/src/main/resources/application-druid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9f60246..0951946 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -29,7 +29,7 @@ spring: # 数据库索引 database: 5 # 密码 - # password: 123456 + password: 123456 redisson: address: "redis://ip" password: "password" # 如果有密码的话 From f0a2f3f10ba2a5506d45862eadeefd08e76d6507 Mon Sep 17 00:00:00 2001 From: cc <3431368173@qq.com> Date: Mon, 10 Mar 2025 18:01:09 +0800 Subject: [PATCH 3/4] 123 --- .../applet/contoller/AppletPetTypeController.java | 26 ----- .../ruoyi/model/controller/PetTypeController.java | 104 -------------------- .../main/java/com/ruoyi/model/domain/PetType.java | 96 ------------------- .../java/com/ruoyi/model/mapper/PetTypeMapper.java | 68 ------------- .../com/ruoyi/model/service/IPetTypeService.java | 68 ------------- .../service/impl/AppCheckImageServiceImpl.java | 1 + .../service/impl/AppCheckImageTypeServiceImpl.java | 1 + .../service/impl/AppFeedingFoodServiceImpl.java | 1 + .../impl/AppFeedingFoodTypeServiceImpl.java | 1 + .../model/service/impl/AppOrderServiceImpl.java | 1 + .../model/service/impl/AppPetTypeServiceImpl.java | 1 + .../service/impl/AppPetsBreadServiceImpl.java | 1 + .../model/service/impl/AppPetsServiceImpl.java | 1 + .../model/service/impl/PetTypeServiceImpl.java | 106 --------------------- .../main/resources/mapper/model/PetTypeMapper.xml | 91 ------------------ 15 files changed, 8 insertions(+), 559 deletions(-) delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletPetTypeController.java delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/controller/PetTypeController.java delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/domain/PetType.java delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/PetTypeMapper.java delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/IPetTypeService.java delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/PetTypeServiceImpl.java delete mode 100644 ruoyi-catdog/src/main/resources/mapper/model/PetTypeMapper.xml diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletPetTypeController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletPetTypeController.java deleted file mode 100644 index f93667b..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletPetTypeController.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ruoyi.applet.contoller; - -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.model.service.IPetTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(description = "宠物类型管理") -@RestController -@RequestMapping("/applet/petType") -public class AppletPetTypeController extends BaseController { - - @Autowired - private IPetTypeService petTypeService; - - @ApiOperation("宠物类型列表") - @GetMapping("/list") - public TableDataInfo list(){ - return getDataTable(petTypeService.getPetTypeList()); - } -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/PetTypeController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/PetTypeController.java deleted file mode 100644 index 103309b..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/PetTypeController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.model.controller; - -import java.io.IOException; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -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.ruoyi.model.domain.PetType; -import com.ruoyi.model.service.IPetTypeService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 宠物类型Controller - * - * @author ruoyi - * @date 2025-03-05 - */ -@RestController -@RequestMapping("/model/petType") -public class PetTypeController extends BaseController -{ - @Autowired - private IPetTypeService petTypeService; - - /** - * 查询宠物类型列表 - */ - @PreAuthorize("@ss.hasPermi('model:petType:list')") - @GetMapping("/list") - public TableDataInfo list(PetType petType) - { - startPage(); - List list = petTypeService.selectPetTypeList(petType); - return getDataTable(list); - } - - /** - * 导出宠物类型列表 - */ - @PreAuthorize("@ss.hasPermi('model:petType:export')") - @Log(title = "宠物类型", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, PetType petType) throws IOException { - List list = petTypeService.selectPetTypeList(petType); - ExcelUtil util = new ExcelUtil(PetType.class); - util.exportExcel(response, list, "宠物类型数据"); - } - - /** - * 获取宠物类型详细信息 - */ - @PreAuthorize("@ss.hasPermi('model:petType:query')") - @GetMapping(value = "/{petTypeId}") - public AjaxResult getInfo(@PathVariable("petTypeId") Long petTypeId) - { - return success(petTypeService.selectPetTypeByPetTypeId(petTypeId)); - } - - /** - * 新增宠物类型 - */ - @PreAuthorize("@ss.hasPermi('model:petType:add')") - @Log(title = "宠物类型", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody PetType petType) - { - return toAjax(petTypeService.insertPetType(petType)); - } - - /** - * 修改宠物类型 - */ - @PreAuthorize("@ss.hasPermi('model:petType:edit')") - @Log(title = "宠物类型", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody PetType petType) - { - return toAjax(petTypeService.updatePetType(petType)); - } - - /** - * 删除宠物类型 - */ - @PreAuthorize("@ss.hasPermi('model:petType:remove')") - @Log(title = "宠物类型", businessType = BusinessType.DELETE) - @DeleteMapping("/{petTypeIds}") - public AjaxResult remove(@PathVariable Long[] petTypeIds) - { - return toAjax(petTypeService.deletePetTypeByPetTypeIds(petTypeIds)); - } -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/PetType.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/PetType.java deleted file mode 100644 index fe73a01..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/PetType.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.model.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 宠物类型对象 pet_type - * - * @author ruoyi - * @date 2025-03-05 - */ -public class PetType extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 宠物类型编号 */ - private Long petTypeId; - - /** 宠物类型图片 */ - @Excel(name = "宠物类型图片") - private String petTypeImage; - - /** 宠物类型名 */ - @Excel(name = "宠物类型名") - private String petTypeName; - - /** 备注 */ - @Excel(name = "备注") - private String reamk; - - /** 删除标识 */ - private Integer delFlag; - - public void setPetTypeId(Long petTypeId) - { - this.petTypeId = petTypeId; - } - - public Long getPetTypeId() - { - return petTypeId; - } - public void setPetTypeImage(String petTypeImage) - { - this.petTypeImage = petTypeImage; - } - - public String getPetTypeImage() - { - return petTypeImage; - } - public void setPetTypeName(String petTypeName) - { - this.petTypeName = petTypeName; - } - - public String getPetTypeName() - { - return petTypeName; - } - public void setReamk(String reamk) - { - this.reamk = reamk; - } - - public String getReamk() - { - return reamk; - } - public void setDelFlag(Integer delFlag) - { - this.delFlag = delFlag; - } - - public Integer getDelFlag() - { - return delFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("petTypeId", getPetTypeId()) - .append("petTypeImage", getPetTypeImage()) - .append("petTypeName", getPetTypeName()) - .append("reamk", getReamk()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .append("delFlag", getDelFlag()) - .toString(); - } -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/PetTypeMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/PetTypeMapper.java deleted file mode 100644 index 0b989b5..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/PetTypeMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.model.mapper; - -import java.util.List; -import com.ruoyi.model.domain.PetType; - -/** - * 宠物类型Mapper接口 - * - * @author ruoyi - * @date 2025-03-05 - */ -public interface PetTypeMapper -{ - /** - * 查询宠物类型 - * - * @param petTypeId 宠物类型主键 - * @return 宠物类型 - */ - public PetType selectPetTypeByPetTypeId(Long petTypeId); - - /** - * 查询宠物类型列表 - * - * @param petType 宠物类型 - * @return 宠物类型集合 - */ - public List selectPetTypeList(PetType petType); - - /** - * 新增宠物类型 - * - * @param petType 宠物类型 - * @return 结果 - */ - public int insertPetType(PetType petType); - - /** - * 修改宠物类型 - * - * @param petType 宠物类型 - * @return 结果 - */ - public int updatePetType(PetType petType); - - /** - * 删除宠物类型 - * - * @param petTypeId 宠物类型主键 - * @return 结果 - */ - public int deletePetTypeByPetTypeId(Long petTypeId); - - /** - * 批量删除宠物类型 - * - * @param petTypeIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deletePetTypeByPetTypeIds(Long[] petTypeIds); - - /** - * 查询宠物类型列表 - * - * @return 宠物类型集合 - */ - List getPetTypeList(); -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IPetTypeService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IPetTypeService.java deleted file mode 100644 index 3487761..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IPetTypeService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.model.service; - -import java.util.List; -import com.ruoyi.model.domain.PetType; - -/** - * 宠物类型Service接口 - * - * @author ruoyi - * @date 2025-03-05 - */ -public interface IPetTypeService -{ - /** - * 查询宠物类型 - * - * @param petTypeId 宠物类型主键 - * @return 宠物类型 - */ - public PetType selectPetTypeByPetTypeId(Long petTypeId); - - /** - * 查询宠物类型列表 - * - * @param petType 宠物类型 - * @return 宠物类型集合 - */ - public List selectPetTypeList(PetType petType); - - /** - * 新增宠物类型 - * - * @param petType 宠物类型 - * @return 结果 - */ - public int insertPetType(PetType petType); - - /** - * 修改宠物类型 - * - * @param petType 宠物类型 - * @return 结果 - */ - public int updatePetType(PetType petType); - - /** - * 批量删除宠物类型 - * - * @param petTypeIds 需要删除的宠物类型主键集合 - * @return 结果 - */ - public int deletePetTypeByPetTypeIds(Long[] petTypeIds); - - /** - * 删除宠物类型信息 - * - * @param petTypeId 宠物类型主键 - * @return 结果 - */ - public int deletePetTypeByPetTypeId(Long petTypeId); - - /** - * 查询宠物类型列表 - * - * @return 宠物类型集合 - */ - public List getPetTypeList(); -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageServiceImpl.java index 8fbffb9..29e97b7 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageServiceImpl.java @@ -98,6 +98,7 @@ public class AppCheckImageServiceImpl implements IAppCheckImageService * * @return 打卡图片及其类型集合 */ + @Override public List getAppCheckImageList(){ return appCheckImageMapper.getAppCheckImageList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageTypeServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageTypeServiceImpl.java index bc8cdbc..322292b 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageTypeServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCheckImageTypeServiceImpl.java @@ -99,6 +99,7 @@ public class AppCheckImageTypeServiceImpl implements IAppCheckImageTypeService * * @return 打卡图片类型集合 */ + @Override public List getAppCheckImageTypeList(){ return appCheckImageTypeMapper.getAppCheckImageTypeList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodServiceImpl.java index 835b517..e6b2144 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodServiceImpl.java @@ -96,6 +96,7 @@ public class AppFeedingFoodServiceImpl implements IAppFeedingFoodService * * @return 喂养要求集合 */ + @Override public List getAppFeedingFoodList(){ return appFeedingFoodMapper.getAppFeedingFoodList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodTypeServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodTypeServiceImpl.java index e55701e..9977e9d 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodTypeServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppFeedingFoodTypeServiceImpl.java @@ -99,6 +99,7 @@ public class AppFeedingFoodTypeServiceImpl implements IAppFeedingFoodTypeService * * @return 喂养食品类型集合 */ + @Override public List getAppFeedingFoodTypeList(){ return appFeedingFoodTypeMapper.getAppFeedingFoodTypeList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppOrderServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppOrderServiceImpl.java index f64595f..c510d7e 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppOrderServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppOrderServiceImpl.java @@ -99,6 +99,7 @@ public class AppOrderServiceImpl implements IAppOrderService * * @return 订单集合 */ + @Override public List getAppOrderList(){ return appOrderMapper.getAppOrderList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetTypeServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetTypeServiceImpl.java index 5695b6b..37723a0 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetTypeServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetTypeServiceImpl.java @@ -96,6 +96,7 @@ public class AppPetTypeServiceImpl implements IAppPetTypeService * * @return 宠物类型集合 */ + @Override public List getAppPetTypeList(){ return appPetTypeMapper.getAppPetTypeList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsBreadServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsBreadServiceImpl.java index 3ee6b26..a4578c2 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsBreadServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsBreadServiceImpl.java @@ -96,6 +96,7 @@ public class AppPetsBreadServiceImpl implements IAppPetsBreadService * * @return 宠物品种集合 */ + @Override public List getAppPetsBreadList(){ return appPetsBreadMapper.getAppPetsBreadList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsServiceImpl.java index 6c6ae25..f3a155e 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppPetsServiceImpl.java @@ -99,6 +99,7 @@ public class AppPetsServiceImpl implements IAppPetsService * * @return 宠物信息集合 */ + @Override public List getAppPetsList(){ return appPetsMapper.getAppPetsList(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/PetTypeServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/PetTypeServiceImpl.java deleted file mode 100644 index c92789e..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/PetTypeServiceImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.ruoyi.model.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.ruoyi.model.mapper.PetTypeMapper; -import com.ruoyi.model.domain.PetType; -import com.ruoyi.model.service.IPetTypeService; - -/** - * 宠物类型Service业务层处理 - * - * @author ruoyi - * @date 2025-03-05 - */ -@Service -public class PetTypeServiceImpl implements IPetTypeService -{ - @Autowired - private PetTypeMapper petTypeMapper; - - /** - * 查询宠物类型 - * - * @param petTypeId 宠物类型主键 - * @return 宠物类型 - */ - @Override - public PetType selectPetTypeByPetTypeId(Long petTypeId) - { - return petTypeMapper.selectPetTypeByPetTypeId(petTypeId); - } - - /** - * 查询宠物类型列表 - * - * @param petType 宠物类型 - * @return 宠物类型 - */ - @Override - public List selectPetTypeList(PetType petType) - { - return petTypeMapper.selectPetTypeList(petType); - } - - /** - * 新增宠物类型 - * - * @param petType 宠物类型 - * @return 结果 - */ - @Override - public int insertPetType(PetType petType) - { - petType.setCreateTime(DateUtils.getNowDate()); - return petTypeMapper.insertPetType(petType); - } - - /** - * 修改宠物类型 - * - * @param petType 宠物类型 - * @return 结果 - */ - @Override - public int updatePetType(PetType petType) - { - petType.setUpdateTime(DateUtils.getNowDate()); - return petTypeMapper.updatePetType(petType); - } - - /** - * 批量删除宠物类型 - * - * @param petTypeIds 需要删除的宠物类型主键 - * @return 结果 - */ - @Override - public int deletePetTypeByPetTypeIds(Long[] petTypeIds) - { - return petTypeMapper.deletePetTypeByPetTypeIds(petTypeIds); - } - - /** - * 删除宠物类型信息 - * - * @param petTypeId 宠物类型主键 - * @return 结果 - */ - @Override - public int deletePetTypeByPetTypeId(Long petTypeId) - { - return petTypeMapper.deletePetTypeByPetTypeId(petTypeId); - } - - /** - * 查询宠物类型列表 - * - * @return 宠物类型集合 - */ - @Override - public List getPetTypeList() { - return petTypeMapper.getPetTypeList(); - } -} diff --git a/ruoyi-catdog/src/main/resources/mapper/model/PetTypeMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/PetTypeMapper.xml deleted file mode 100644 index 20fc004..0000000 --- a/ruoyi-catdog/src/main/resources/mapper/model/PetTypeMapper.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - select pet_type_id, pet_type_image, pet_type_name, reamk, create_time, create_by, update_time, update_by, del_flag from pet_type - - - - - - - - - insert into pet_type - - pet_type_id, - pet_type_image, - pet_type_name, - reamk, - create_time, - create_by, - update_time, - update_by, - del_flag, - - - #{petTypeId}, - #{petTypeImage}, - #{petTypeName}, - #{reamk}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, - #{delFlag}, - - - - - update pet_type - - pet_type_image = #{petTypeImage}, - pet_type_name = #{petTypeName}, - reamk = #{reamk}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - del_flag = #{delFlag}, - - where pet_type_id = #{petTypeId} - - - - delete from pet_type where pet_type_id = #{petTypeId} - - - - delete from pet_type where pet_type_id in - - #{petTypeId} - - - \ No newline at end of file From 33fd94867c7be01909fd1fa4566a5ffbb09cc1f4 Mon Sep 17 00:00:00 2001 From: cc <3431368173@qq.com> Date: Mon, 10 Mar 2025 18:01:29 +0800 Subject: [PATCH 4/4] 123 --- .../src/api/model/AppCleanItems.js | 44 +++ .../src/api/model/AppCleanRequest.js | 44 +++ .../src/views/model/AppCleanItems/index.vue | 277 +++++++++++++++++ .../src/views/model/AppCleanRequest/index.vue | 338 +++++++++++++++++++++ .../contoller/AppletAppCleanItemsController.java | 38 +++ .../model/controller/AppCleanItemsController.java | 104 +++++++ .../controller/AppCleanRequestController.java | 104 +++++++ .../java/com/ruoyi/model/domain/AppCleanItems.java | 68 +++++ .../com/ruoyi/model/domain/AppCleanRequest.java | 108 +++++++ .../ruoyi/model/mapper/AppCleanItemsMapper.java | 68 +++++ .../ruoyi/model/mapper/AppCleanRequestMapper.java | 68 +++++ .../ruoyi/model/service/IAppCleanItemsService.java | 68 +++++ .../model/service/IAppCleanRequestService.java | 68 +++++ .../service/impl/AppCleanItemsServiceImpl.java | 106 +++++++ .../service/impl/AppCleanRequestServiceImpl.java | 103 +++++++ .../resources/mapper/model/AppCleanItemsMapper.xml | 81 +++++ .../mapper/model/AppCleanRequestMapper.xml | 85 ++++++ 17 files changed, 1772 insertions(+) create mode 100644 CatmDogd-Mall-Front-test/src/api/model/AppCleanItems.js create mode 100644 CatmDogd-Mall-Front-test/src/api/model/AppCleanRequest.js create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppCleanItems/index.vue create mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppCleanRequest/index.vue create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletAppCleanItemsController.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanItemsController.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanRequestController.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanItems.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanRequest.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanItemsMapper.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanRequestMapper.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanItemsService.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanRequestService.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanItemsServiceImpl.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanRequestServiceImpl.java create mode 100644 ruoyi-catdog/src/main/resources/mapper/model/AppCleanItemsMapper.xml create mode 100644 ruoyi-catdog/src/main/resources/mapper/model/AppCleanRequestMapper.xml diff --git a/CatmDogd-Mall-Front-test/src/api/model/AppCleanItems.js b/CatmDogd-Mall-Front-test/src/api/model/AppCleanItems.js new file mode 100644 index 0000000..59a477a --- /dev/null +++ b/CatmDogd-Mall-Front-test/src/api/model/AppCleanItems.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询清洁物品列表 +export function listAppCleanItems(query) { + return request({ + url: '/model/AppCleanItems/list', + method: 'get', + params: query + }) +} + +// 查询清洁物品详细 +export function getAppCleanItems(cleanItemsId) { + return request({ + url: '/model/AppCleanItems/' + cleanItemsId, + method: 'get' + }) +} + +// 新增清洁物品 +export function addAppCleanItems(data) { + return request({ + url: '/model/AppCleanItems', + method: 'post', + data: data + }) +} + +// 修改清洁物品 +export function updateAppCleanItems(data) { + return request({ + url: '/model/AppCleanItems', + method: 'put', + data: data + }) +} + +// 删除清洁物品 +export function delAppCleanItems(cleanItemsId) { + return request({ + url: '/model/AppCleanItems/' + cleanItemsId, + method: 'delete' + }) +} diff --git a/CatmDogd-Mall-Front-test/src/api/model/AppCleanRequest.js b/CatmDogd-Mall-Front-test/src/api/model/AppCleanRequest.js new file mode 100644 index 0000000..803cda1 --- /dev/null +++ b/CatmDogd-Mall-Front-test/src/api/model/AppCleanRequest.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询清洁要求列表 +export function listAppCleanRequest(query) { + return request({ + url: '/model/AppCleanRequest/list', + method: 'get', + params: query + }) +} + +// 查询清洁要求详细 +export function getAppCleanRequest(cleanRequestId) { + return request({ + url: '/model/AppCleanRequest/' + cleanRequestId, + method: 'get' + }) +} + +// 新增清洁要求 +export function addAppCleanRequest(data) { + return request({ + url: '/model/AppCleanRequest', + method: 'post', + data: data + }) +} + +// 修改清洁要求 +export function updateAppCleanRequest(data) { + return request({ + url: '/model/AppCleanRequest', + method: 'put', + data: data + }) +} + +// 删除清洁要求 +export function delAppCleanRequest(cleanRequestId) { + return request({ + url: '/model/AppCleanRequest/' + cleanRequestId, + method: 'delete' + }) +} diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppCleanItems/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppCleanItems/index.vue new file mode 100644 index 0000000..5be0449 --- /dev/null +++ b/CatmDogd-Mall-Front-test/src/views/model/AppCleanItems/index.vue @@ -0,0 +1,277 @@ + + + diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppCleanRequest/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppCleanRequest/index.vue new file mode 100644 index 0000000..abe4a17 --- /dev/null +++ b/CatmDogd-Mall-Front-test/src/views/model/AppCleanRequest/index.vue @@ -0,0 +1,338 @@ + + + diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletAppCleanItemsController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletAppCleanItemsController.java new file mode 100644 index 0000000..7f5d756 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletAppCleanItemsController.java @@ -0,0 +1,38 @@ +package com.ruoyi.applet.contoller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.model.service.IAppCleanItemsService; +import com.ruoyi.model.service.IAppCleanRequestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(description = "清洁物品及其要求") +@RestController +@RequestMapping("/applet/cleanItem") +public class AppletAppCleanItemsController extends BaseController { + @Autowired + private IAppCleanItemsService appCleanItemsService; + + @ApiOperation("查询所有清洁物品") + @GetMapping("/getAppCleanItemsList") + public TableDataInfo getAppCleanItemsList(){ + return getDataTable(appCleanItemsService.getAppCleanItemsList()); + } + + + @Autowired + private IAppCleanRequestService appCleanRequestService; + + @ApiOperation("查询所有清洁要求") + @GetMapping("/getAppCleanRequestList") + public TableDataInfo getAppCleanRequestList(){ + return getDataTable(appCleanRequestService.getAppCleanRequestList()); + } + + +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanItemsController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanItemsController.java new file mode 100644 index 0000000..c2157aa --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanItemsController.java @@ -0,0 +1,104 @@ +package com.ruoyi.model.controller; + +import java.io.IOException; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +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.ruoyi.model.domain.AppCleanItems; +import com.ruoyi.model.service.IAppCleanItemsService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 清洁物品Controller + * + * @author ruoyi + * @date 2025-03-10 + */ +@RestController +@RequestMapping("/model/AppCleanItems") +public class AppCleanItemsController extends BaseController +{ + @Autowired + private IAppCleanItemsService appCleanItemsService; + + /** + * 查询清洁物品列表 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanItems:list')") + @GetMapping("/list") + public TableDataInfo list(AppCleanItems appCleanItems) + { + startPage(); + List list = appCleanItemsService.selectAppCleanItemsList(appCleanItems); + return getDataTable(list); + } + + /** + * 导出清洁物品列表 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanItems:export')") + @Log(title = "清洁物品", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AppCleanItems appCleanItems) throws IOException { + List list = appCleanItemsService.selectAppCleanItemsList(appCleanItems); + ExcelUtil util = new ExcelUtil(AppCleanItems.class); + util.exportExcel(response, list, "清洁物品数据"); + } + + /** + * 获取清洁物品详细信息 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanItems:query')") + @GetMapping(value = "/{cleanItemsId}") + public AjaxResult getInfo(@PathVariable("cleanItemsId") Long cleanItemsId) + { + return success(appCleanItemsService.selectAppCleanItemsByCleanItemsId(cleanItemsId)); + } + + /** + * 新增清洁物品 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanItems:add')") + @Log(title = "清洁物品", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AppCleanItems appCleanItems) + { + return toAjax(appCleanItemsService.insertAppCleanItems(appCleanItems)); + } + + /** + * 修改清洁物品 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanItems:edit')") + @Log(title = "清洁物品", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppCleanItems appCleanItems) + { + return toAjax(appCleanItemsService.updateAppCleanItems(appCleanItems)); + } + + /** + * 删除清洁物品 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanItems:remove')") + @Log(title = "清洁物品", businessType = BusinessType.DELETE) + @DeleteMapping("/{cleanItemsIds}") + public AjaxResult remove(@PathVariable Long[] cleanItemsIds) + { + return toAjax(appCleanItemsService.deleteAppCleanItemsByCleanItemsIds(cleanItemsIds)); + } +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanRequestController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanRequestController.java new file mode 100644 index 0000000..b73dfdf --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppCleanRequestController.java @@ -0,0 +1,104 @@ +package com.ruoyi.model.controller; + +import java.io.IOException; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +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.ruoyi.model.domain.AppCleanRequest; +import com.ruoyi.model.service.IAppCleanRequestService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 清洁要求Controller + * + * @author ruoyi + * @date 2025-03-10 + */ +@RestController +@RequestMapping("/model/AppCleanRequest") +public class AppCleanRequestController extends BaseController +{ + @Autowired + private IAppCleanRequestService appCleanRequestService; + + /** + * 查询清洁要求列表 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanRequest:list')") + @GetMapping("/list") + public TableDataInfo list(AppCleanRequest appCleanRequest) + { + startPage(); + List list = appCleanRequestService.selectAppCleanRequestList(appCleanRequest); + return getDataTable(list); + } + + /** + * 导出清洁要求列表 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanRequest:export')") + @Log(title = "清洁要求", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AppCleanRequest appCleanRequest) throws IOException { + List list = appCleanRequestService.selectAppCleanRequestList(appCleanRequest); + ExcelUtil util = new ExcelUtil(AppCleanRequest.class); + util.exportExcel(response, list, "清洁要求数据"); + } + + /** + * 获取清洁要求详细信息 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanRequest:query')") + @GetMapping(value = "/{cleanRequestId}") + public AjaxResult getInfo(@PathVariable("cleanRequestId") Long cleanRequestId) + { + return success(appCleanRequestService.selectAppCleanRequestByCleanRequestId(cleanRequestId)); + } + + /** + * 新增清洁要求 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanRequest:add')") + @Log(title = "清洁要求", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AppCleanRequest appCleanRequest) + { + return toAjax(appCleanRequestService.insertAppCleanRequest(appCleanRequest)); + } + + /** + * 修改清洁要求 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanRequest:edit')") + @Log(title = "清洁要求", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppCleanRequest appCleanRequest) + { + return toAjax(appCleanRequestService.updateAppCleanRequest(appCleanRequest)); + } + + /** + * 删除清洁要求 + */ + @PreAuthorize("@ss.hasPermi('model:AppCleanRequest:remove')") + @Log(title = "清洁要求", businessType = BusinessType.DELETE) + @DeleteMapping("/{cleanRequestIds}") + public AjaxResult remove(@PathVariable Long[] cleanRequestIds) + { + return toAjax(appCleanRequestService.deleteAppCleanRequestByCleanRequestIds(cleanRequestIds)); + } +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanItems.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanItems.java new file mode 100644 index 0000000..57c0d68 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanItems.java @@ -0,0 +1,68 @@ +package com.ruoyi.model.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 清洁物品对象 app_clean_items + * + * @author ruoyi + * @date 2025-03-10 + */ +public class AppCleanItems extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 清洁物品编号 */ + private Long cleanItemsId; + + /** 清洁物品名称 */ + @Excel(name = "清洁物品名称") + private Long cleanItemsName; + + /** 删除标识 */ + private Integer delFlag; + + public void setCleanItemsId(Long cleanItemsId) + { + this.cleanItemsId = cleanItemsId; + } + + public Long getCleanItemsId() + { + return cleanItemsId; + } + public void setCleanItemsName(Long cleanItemsName) + { + this.cleanItemsName = cleanItemsName; + } + + public Long getCleanItemsName() + { + return cleanItemsName; + } + public void setDelFlag(Integer delFlag) + { + this.delFlag = delFlag; + } + + public Integer getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("cleanItemsId", getCleanItemsId()) + .append("cleanItemsName", getCleanItemsName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanRequest.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanRequest.java new file mode 100644 index 0000000..308f4e2 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppCleanRequest.java @@ -0,0 +1,108 @@ +package com.ruoyi.model.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 清洁要求对象 app_clean_request + * + * @author ruoyi + * @date 2025-03-10 + */ +public class AppCleanRequest extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 清洁要求编号 */ + private Long cleanRequestId; + + /** 清洁物品编号 */ + @Excel(name = "清洁物品编号") + private Long cleanItemsId; + + /** 服务档案编号 */ + @Excel(name = "服务档案编号") + private Long serviceFileId; + + /** 清洁物品摆放位置 */ + @Excel(name = "清洁物品摆放位置") + private String cleanRequestImage; + + /** 更换频率天 */ + @Excel(name = "更换频率天") + private Long cleanRequestFrequencyDay; + + /** 更换频率次 */ + @Excel(name = "更换频率次") + private Long cleanRequestFrequencyTimes; + + public void setCleanRequestId(Long cleanRequestId) + { + this.cleanRequestId = cleanRequestId; + } + + public Long getCleanRequestId() + { + return cleanRequestId; + } + public void setCleanItemsId(Long cleanItemsId) + { + this.cleanItemsId = cleanItemsId; + } + + public Long getCleanItemsId() + { + return cleanItemsId; + } + public void setServiceFileId(Long serviceFileId) + { + this.serviceFileId = serviceFileId; + } + + public Long getServiceFileId() + { + return serviceFileId; + } + public void setCleanRequestImage(String cleanRequestImage) + { + this.cleanRequestImage = cleanRequestImage; + } + + public String getCleanRequestImage() + { + return cleanRequestImage; + } + public void setCleanRequestFrequencyDay(Long cleanRequestFrequencyDay) + { + this.cleanRequestFrequencyDay = cleanRequestFrequencyDay; + } + + public Long getCleanRequestFrequencyDay() + { + return cleanRequestFrequencyDay; + } + public void setCleanRequestFrequencyTimes(Long cleanRequestFrequencyTimes) + { + this.cleanRequestFrequencyTimes = cleanRequestFrequencyTimes; + } + + public Long getCleanRequestFrequencyTimes() + { + return cleanRequestFrequencyTimes; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("cleanRequestId", getCleanRequestId()) + .append("cleanItemsId", getCleanItemsId()) + .append("serviceFileId", getServiceFileId()) + .append("cleanRequestImage", getCleanRequestImage()) + .append("cleanRequestFrequencyDay", getCleanRequestFrequencyDay()) + .append("cleanRequestFrequencyTimes", getCleanRequestFrequencyTimes()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanItemsMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanItemsMapper.java new file mode 100644 index 0000000..729fbcc --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanItemsMapper.java @@ -0,0 +1,68 @@ +package com.ruoyi.model.mapper; + +import java.util.List; +import com.ruoyi.model.domain.AppCleanItems; + +/** + * 清洁物品Mapper接口 + * + * @author ruoyi + * @date 2025-03-10 + */ +public interface AppCleanItemsMapper +{ + /** + * 查询清洁物品 + * + * @param cleanItemsId 清洁物品主键 + * @return 清洁物品 + */ + public AppCleanItems selectAppCleanItemsByCleanItemsId(Long cleanItemsId); + + /** + * 查询清洁物品列表 + * + * @param appCleanItems 清洁物品 + * @return 清洁物品集合 + */ + public List selectAppCleanItemsList(AppCleanItems appCleanItems); + + /** + * 新增清洁物品 + * + * @param appCleanItems 清洁物品 + * @return 结果 + */ + public int insertAppCleanItems(AppCleanItems appCleanItems); + + /** + * 修改清洁物品 + * + * @param appCleanItems 清洁物品 + * @return 结果 + */ + public int updateAppCleanItems(AppCleanItems appCleanItems); + + /** + * 删除清洁物品 + * + * @param cleanItemsId 清洁物品主键 + * @return 结果 + */ + public int deleteAppCleanItemsByCleanItemsId(Long cleanItemsId); + + /** + * 批量删除清洁物品 + * + * @param cleanItemsIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppCleanItemsByCleanItemsIds(Long[] cleanItemsIds); + + /** + * 查询清洁物品列表 + * + * @return 清洁物品集合 + */ + public List getAppCleanItemsList(); +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanRequestMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanRequestMapper.java new file mode 100644 index 0000000..fd99ba6 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppCleanRequestMapper.java @@ -0,0 +1,68 @@ +package com.ruoyi.model.mapper; + +import java.util.List; +import com.ruoyi.model.domain.AppCleanRequest; + +/** + * 清洁要求Mapper接口 + * + * @author ruoyi + * @date 2025-03-10 + */ +public interface AppCleanRequestMapper +{ + /** + * 查询清洁要求 + * + * @param cleanRequestId 清洁要求主键 + * @return 清洁要求 + */ + public AppCleanRequest selectAppCleanRequestByCleanRequestId(Long cleanRequestId); + + /** + * 查询清洁要求列表 + * + * @param appCleanRequest 清洁要求 + * @return 清洁要求集合 + */ + public List selectAppCleanRequestList(AppCleanRequest appCleanRequest); + + /** + * 新增清洁要求 + * + * @param appCleanRequest 清洁要求 + * @return 结果 + */ + public int insertAppCleanRequest(AppCleanRequest appCleanRequest); + + /** + * 修改清洁要求 + * + * @param appCleanRequest 清洁要求 + * @return 结果 + */ + public int updateAppCleanRequest(AppCleanRequest appCleanRequest); + + /** + * 删除清洁要求 + * + * @param cleanRequestId 清洁要求主键 + * @return 结果 + */ + public int deleteAppCleanRequestByCleanRequestId(Long cleanRequestId); + + /** + * 批量删除清洁要求 + * + * @param cleanRequestIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppCleanRequestByCleanRequestIds(Long[] cleanRequestIds); + + /** + * 查询清洁要求列表 + * + * @return 清洁要求集合 + */ + public List getAppCleanRequestList(); +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanItemsService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanItemsService.java new file mode 100644 index 0000000..a38e94f --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanItemsService.java @@ -0,0 +1,68 @@ +package com.ruoyi.model.service; + +import java.util.List; +import com.ruoyi.model.domain.AppCleanItems; + +/** + * 清洁物品Service接口 + * + * @author ruoyi + * @date 2025-03-10 + */ +public interface IAppCleanItemsService +{ + /** + * 查询清洁物品 + * + * @param cleanItemsId 清洁物品主键 + * @return 清洁物品 + */ + public AppCleanItems selectAppCleanItemsByCleanItemsId(Long cleanItemsId); + + /** + * 查询清洁物品列表 + * + * @param appCleanItems 清洁物品 + * @return 清洁物品集合 + */ + public List selectAppCleanItemsList(AppCleanItems appCleanItems); + + /** + * 新增清洁物品 + * + * @param appCleanItems 清洁物品 + * @return 结果 + */ + public int insertAppCleanItems(AppCleanItems appCleanItems); + + /** + * 修改清洁物品 + * + * @param appCleanItems 清洁物品 + * @return 结果 + */ + public int updateAppCleanItems(AppCleanItems appCleanItems); + + /** + * 批量删除清洁物品 + * + * @param cleanItemsIds 需要删除的清洁物品主键集合 + * @return 结果 + */ + public int deleteAppCleanItemsByCleanItemsIds(Long[] cleanItemsIds); + + /** + * 删除清洁物品信息 + * + * @param cleanItemsId 清洁物品主键 + * @return 结果 + */ + public int deleteAppCleanItemsByCleanItemsId(Long cleanItemsId); + + /** + * 查询清洁物品列表 + * + * @return 清洁物品集合 + */ + public List getAppCleanItemsList(); +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanRequestService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanRequestService.java new file mode 100644 index 0000000..2185045 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppCleanRequestService.java @@ -0,0 +1,68 @@ +package com.ruoyi.model.service; + +import java.util.List; +import com.ruoyi.model.domain.AppCleanRequest; + +/** + * 清洁要求Service接口 + * + * @author ruoyi + * @date 2025-03-10 + */ +public interface IAppCleanRequestService +{ + /** + * 查询清洁要求 + * + * @param cleanRequestId 清洁要求主键 + * @return 清洁要求 + */ + public AppCleanRequest selectAppCleanRequestByCleanRequestId(Long cleanRequestId); + + /** + * 查询清洁要求列表 + * + * @param appCleanRequest 清洁要求 + * @return 清洁要求集合 + */ + public List selectAppCleanRequestList(AppCleanRequest appCleanRequest); + + /** + * 新增清洁要求 + * + * @param appCleanRequest 清洁要求 + * @return 结果 + */ + public int insertAppCleanRequest(AppCleanRequest appCleanRequest); + + /** + * 修改清洁要求 + * + * @param appCleanRequest 清洁要求 + * @return 结果 + */ + public int updateAppCleanRequest(AppCleanRequest appCleanRequest); + + /** + * 批量删除清洁要求 + * + * @param cleanRequestIds 需要删除的清洁要求主键集合 + * @return 结果 + */ + public int deleteAppCleanRequestByCleanRequestIds(Long[] cleanRequestIds); + + /** + * 删除清洁要求信息 + * + * @param cleanRequestId 清洁要求主键 + * @return 结果 + */ + public int deleteAppCleanRequestByCleanRequestId(Long cleanRequestId); + + /** + * 查询清洁要求列表 + * + * @return 清洁要求集合 + */ + public List getAppCleanRequestList(); +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanItemsServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanItemsServiceImpl.java new file mode 100644 index 0000000..7a305aa --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanItemsServiceImpl.java @@ -0,0 +1,106 @@ +package com.ruoyi.model.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.ruoyi.model.mapper.AppCleanItemsMapper; +import com.ruoyi.model.domain.AppCleanItems; +import com.ruoyi.model.service.IAppCleanItemsService; + +/** + * 清洁物品Service业务层处理 + * + * @author ruoyi + * @date 2025-03-10 + */ +@Service +public class AppCleanItemsServiceImpl implements IAppCleanItemsService +{ + @Autowired + private AppCleanItemsMapper appCleanItemsMapper; + + /** + * 查询清洁物品 + * + * @param cleanItemsId 清洁物品主键 + * @return 清洁物品 + */ + @Override + public AppCleanItems selectAppCleanItemsByCleanItemsId(Long cleanItemsId) + { + return appCleanItemsMapper.selectAppCleanItemsByCleanItemsId(cleanItemsId); + } + + /** + * 查询清洁物品列表 + * + * @param appCleanItems 清洁物品 + * @return 清洁物品 + */ + @Override + public List selectAppCleanItemsList(AppCleanItems appCleanItems) + { + return appCleanItemsMapper.selectAppCleanItemsList(appCleanItems); + } + + /** + * 新增清洁物品 + * + * @param appCleanItems 清洁物品 + * @return 结果 + */ + @Override + public int insertAppCleanItems(AppCleanItems appCleanItems) + { + appCleanItems.setCreateTime(DateUtils.getNowDate()); + return appCleanItemsMapper.insertAppCleanItems(appCleanItems); + } + + /** + * 修改清洁物品 + * + * @param appCleanItems 清洁物品 + * @return 结果 + */ + @Override + public int updateAppCleanItems(AppCleanItems appCleanItems) + { + appCleanItems.setUpdateTime(DateUtils.getNowDate()); + return appCleanItemsMapper.updateAppCleanItems(appCleanItems); + } + + /** + * 批量删除清洁物品 + * + * @param cleanItemsIds 需要删除的清洁物品主键 + * @return 结果 + */ + @Override + public int deleteAppCleanItemsByCleanItemsIds(Long[] cleanItemsIds) + { + return appCleanItemsMapper.deleteAppCleanItemsByCleanItemsIds(cleanItemsIds); + } + + /** + * 删除清洁物品信息 + * + * @param cleanItemsId 清洁物品主键 + * @return 结果 + */ + @Override + public int deleteAppCleanItemsByCleanItemsId(Long cleanItemsId) + { + return appCleanItemsMapper.deleteAppCleanItemsByCleanItemsId(cleanItemsId); + } + + /** + * 查询清洁物品列表 + * + * @return 清洁物品集合 + */ + @Override + public List getAppCleanItemsList(){ + return appCleanItemsMapper.getAppCleanItemsList(); + } +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanRequestServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanRequestServiceImpl.java new file mode 100644 index 0000000..035ff5d --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppCleanRequestServiceImpl.java @@ -0,0 +1,103 @@ +package com.ruoyi.model.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.model.mapper.AppCleanRequestMapper; +import com.ruoyi.model.domain.AppCleanRequest; +import com.ruoyi.model.service.IAppCleanRequestService; + +/** + * 清洁要求Service业务层处理 + * + * @author ruoyi + * @date 2025-03-10 + */ +@Service +public class AppCleanRequestServiceImpl implements IAppCleanRequestService +{ + @Autowired + private AppCleanRequestMapper appCleanRequestMapper; + + /** + * 查询清洁要求 + * + * @param cleanRequestId 清洁要求主键 + * @return 清洁要求 + */ + @Override + public AppCleanRequest selectAppCleanRequestByCleanRequestId(Long cleanRequestId) + { + return appCleanRequestMapper.selectAppCleanRequestByCleanRequestId(cleanRequestId); + } + + /** + * 查询清洁要求列表 + * + * @param appCleanRequest 清洁要求 + * @return 清洁要求 + */ + @Override + public List selectAppCleanRequestList(AppCleanRequest appCleanRequest) + { + return appCleanRequestMapper.selectAppCleanRequestList(appCleanRequest); + } + + /** + * 新增清洁要求 + * + * @param appCleanRequest 清洁要求 + * @return 结果 + */ + @Override + public int insertAppCleanRequest(AppCleanRequest appCleanRequest) + { + return appCleanRequestMapper.insertAppCleanRequest(appCleanRequest); + } + + /** + * 修改清洁要求 + * + * @param appCleanRequest 清洁要求 + * @return 结果 + */ + @Override + public int updateAppCleanRequest(AppCleanRequest appCleanRequest) + { + return appCleanRequestMapper.updateAppCleanRequest(appCleanRequest); + } + + /** + * 批量删除清洁要求 + * + * @param cleanRequestIds 需要删除的清洁要求主键 + * @return 结果 + */ + @Override + public int deleteAppCleanRequestByCleanRequestIds(Long[] cleanRequestIds) + { + return appCleanRequestMapper.deleteAppCleanRequestByCleanRequestIds(cleanRequestIds); + } + + /** + * 删除清洁要求信息 + * + * @param cleanRequestId 清洁要求主键 + * @return 结果 + */ + @Override + public int deleteAppCleanRequestByCleanRequestId(Long cleanRequestId) + { + return appCleanRequestMapper.deleteAppCleanRequestByCleanRequestId(cleanRequestId); + } + + /** + * 查询清洁要求列表 + * + * @return 清洁要求集合 + */ + @Override + public List getAppCleanRequestList(){ + return appCleanRequestMapper.getAppCleanRequestList(); + } +} diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppCleanItemsMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppCleanItemsMapper.xml new file mode 100644 index 0000000..34836f2 --- /dev/null +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppCleanItemsMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + select clean_items_id, clean_items_name, create_by, create_time, update_by, update_time, del_flag from app_clean_items + + + + + + + + + insert into app_clean_items + + clean_items_id, + clean_items_name, + create_by, + create_time, + update_by, + update_time, + del_flag, + + + #{cleanItemsId}, + #{cleanItemsName}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + + + + + update app_clean_items + + clean_items_name = #{cleanItemsName}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + + where clean_items_id = #{cleanItemsId} + + + + delete from app_clean_items where clean_items_id = #{cleanItemsId} + + + + delete from app_clean_items where clean_items_id in + + #{cleanItemsId} + + + \ No newline at end of file diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppCleanRequestMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppCleanRequestMapper.xml new file mode 100644 index 0000000..2390345 --- /dev/null +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppCleanRequestMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + select clean_request_id, clean_items_id, service_file_id, clean_request_image, clean_request_frequency_day, clean_request_frequency_times, remark from app_clean_request + + + + + + + + + insert into app_clean_request + + clean_request_id, + clean_items_id, + service_file_id, + clean_request_image, + clean_request_frequency_day, + clean_request_frequency_times, + remark, + + + #{cleanRequestId}, + #{cleanItemsId}, + #{serviceFileId}, + #{cleanRequestImage}, + #{cleanRequestFrequencyDay}, + #{cleanRequestFrequencyTimes}, + #{remark}, + + + + + update app_clean_request + + clean_items_id = #{cleanItemsId}, + service_file_id = #{serviceFileId}, + clean_request_image = #{cleanRequestImage}, + clean_request_frequency_day = #{cleanRequestFrequencyDay}, + clean_request_frequency_times = #{cleanRequestFrequencyTimes}, + remark = #{remark}, + + where clean_request_id = #{cleanRequestId} + + + + delete from app_clean_request where clean_request_id = #{cleanRequestId} + + + + delete from app_clean_request where clean_request_id in + + #{cleanRequestId} + + + \ No newline at end of file