From 1dfe61fdf1b36061871ead5337172801e64df201 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期一, 03 四月 2023 16:07:36 +0800
Subject: [PATCH] 魅宠、家庭小医生1.0
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 183 ++++++++++++++++++++++++---------------------
1 files changed, 98 insertions(+), 85 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
index 53052b1..4e2f4a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
@@ -1,19 +1,29 @@
package com.ruoyi.web.controller.zhang;
+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.text.Convert;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZfPetNote;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.service.ZfPetNoteService;
+import com.ruoyi.service.ZfPetNoteService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import javax.websocket.server.PathParam;
+import java.util.Arrays;
import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* <p>
@@ -25,96 +35,99 @@
*/
@RestController
@RequestMapping("/family/zfPetNote")
-public class ZfPetNoteController {
-
+@Slf4j
+public class ZfPetNoteController extends BaseController {
@Resource
private ZfPetNoteService zfPetNoteService;
-// @GetMapping("/all")
-// public AjaxResult listAll(ZfProperty zfProperty){
-// Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
-// Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
-// return zfPropertyService.selectUserList(zfProperty, pageNum, pageSize);
-// }
+ @GetMapping("/all")
+ public AjaxResult listAll(ZfPetNote zfPetNote){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfPetNoteService.selectPetNoteList(zfPetNote, pageNum, pageSize);
+ }
+
+ /**
+ * 鏍规嵁瀹犵墿id鑾峰彇鐩稿叧澶囧繕褰�
+ */
+ @GetMapping
+ public AjaxResult getByPetId(@PathParam("pid")Long pid){
+ return zfPetNoteService.getAllPetNoteByPetId(pid);
+ }
+
+ /**
+ * 瀵煎嚭榄呭疇澶囧繕褰曡褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "榄呭疇澶囧繕褰曡褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ZfPetNote zfPetNote)
+ {
+ List<ZfPetNote> list = zfPetNoteService.selectByCondition(zfPetNote);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
+ util.exportExcel(response, list, "榄呭疇澶囧繕褰曡褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎叆榄呭疇澶囧繕褰曡褰曞垪琛�
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
+ List<ZfPetNote> eventList = util.importExcel(file.getInputStream());
+ log.info("榄呭疇澶囧繕褰曞垪琛ㄤ负锛歿}",eventList);
+
+ if (zfPetNoteService.saveBatch(eventList)) {
+ return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
+ }
+
+ /**
+ * 鑾峰彇榄呭疇澶囧繕褰曡褰曡缁嗕俊鎭�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(zfPetNoteService.getById(id));
+ }
//
+ /**
+ * 鏂板榄呭疇澶囧繕褰曡褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "榄呭疇澶囧繕褰曡褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZfPetNote zfPetNote)
+ {
+ return toAjax(zfPetNoteService.save(zfPetNote));
+ }
+
+ /**
+ * 淇敼榄呭疇澶囧繕褰曡褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "榄呭疇澶囧繕褰曡褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZfPetNote zfPetNote)
+ {
+ return toAjax(zfPetNoteService.updateById(zfPetNote));
+ }
//
-// /**
-// * 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
-// */
-//// @PreAuthorize("@ss.hasPermi('system:property:export')")
-// @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.EXPORT)
-// @PostMapping("/export")
-// public void export(HttpServletResponse response, ZfProperty zfProperty)
-// {
-// List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
-// log.info("瀵煎嚭璁板綍涓�:{}",list);
-// ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
-// util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
-// }
-////
-//
-// /**
-// * 瀵煎叆瀹跺涵璧勪骇璁板綍鍒楄〃
-// */
-// @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
-// @PostMapping("/importData")
-// public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
-// {
-// ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
-// List<ZfProperty> propertyList = util.importExcel(file.getInputStream());
-// log.info("璧勪骇鍒楄〃涓猴細{}",propertyList);
-//
-// if (zfPropertyService.saveBatch(propertyList)) {
-// return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
-// }
-//
-// return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
-//
-// }
-//
-//
-// /**
-// * 鑾峰彇瀹跺涵璧勪骇璁板綍璇︾粏淇℃伅
-// */
-//// @PreAuthorize("@ss.hasPermi('system:property:query')")
-// @GetMapping(value = "/{id}")
-// public AjaxResult getInfo(@PathVariable("id") Long id)
-// {
-// return success(zfPropertyService.getById(id));
-// }
-////
-// /**
-// * 鏂板瀹跺涵璧勪骇璁板綍
-// */
-//// @PreAuthorize("@ss.hasPermi('system:property:add')")
-// @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.INSERT)
-// @PostMapping
-// public AjaxResult add(@RequestBody ZfProperty zfProperty)
-// {
-// return toAjax(zfPropertyService.save(zfProperty));
-// }
-//
-// /**
-// * 淇敼瀹跺涵璧勪骇璁板綍
-// */
-//// @PreAuthorize("@ss.hasPermi('system:property:edit')")
-// @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.UPDATE)
-// @PutMapping
-// public AjaxResult edit(@RequestBody ZfProperty zfProperty)
-// {
-// return toAjax(zfPropertyService.updateById(zfProperty));
-// }
-////
-// /**
-// * 鎵归噺鍒犻櫎瀹跺涵璧勪骇璁板綍
-// */
-//// @PreAuthorize("@ss.hasPermi('system:property:remove')")
-// @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.DELETE)
-// @DeleteMapping("/{ids}")
-// public AjaxResult remove(@PathVariable Long[] ids)
-// {
-// return toAjax(zfPropertyService.removeByIds(Arrays.asList(ids)));
-// }
+ /**
+ * 鎵归噺鍒犻櫎榄呭疇澶囧繕褰曡褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "榄呭疇澶囧繕褰曡褰�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(zfPetNoteService.removeByIds(Arrays.asList(ids)));
+ }
}
--
Gitblit v1.9.1