From e5ebd02de9615e2a22694dba7e4207526054b2f8 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 11 七月 2023 23:21:44 +0800
Subject: [PATCH] 123456
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java | 114 ++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java | 115 ++++++++
zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java | 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java | 113 +++++++
zhang-content/src/main/java/com/ruoyi/service/ZSelfNoteService.java | 11
zhang-content/src/main/java/com/ruoyi/domain/ZYearInfo.java | 114 ++-----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java | 113 +++++++
zhang-content/src/main/java/com/ruoyi/domain/ZYearHealth.java | 103 -------
zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java | 95 ++----
zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java | 2
10 files changed, 546 insertions(+), 245 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
index c62d659..aa5e2a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
@@ -1,9 +1,27 @@
package com.ruoyi.web.controller.zhang;
-import org.springframework.web.bind.annotation.RequestMapping;
+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.ZSelfNote;
+import com.ruoyi.service.ZSelfNoteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Collections;
+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>
@@ -15,7 +33,96 @@
*/
@RestController
@RequestMapping("/zSelfNote")
-public class ZSelfNoteController {
+@Slf4j
+public class ZSelfNoteController extends BaseController {
+ @Autowired
+ private ZSelfNoteService zSelfNoteService;
+
+ /**
+ * 鏌ヨ鎵�鏈夎褰�
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(ZSelfNote zSelfNote){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zSelfNoteService.selectDataList(zSelfNote,pageNum,pageSize);
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zSelfNoteService.getById(id));
+ }
+
+ /**
+ * 妯℃澘
+ */
+ @GetMapping("/model")
+ public void getModel(HttpServletResponse response){
+ ZSelfNote zSelfNote = new ZSelfNote();
+ List<ZSelfNote> emptyList = Collections.singletonList(zSelfNote);
+ ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class);
+ util.exportExcel(response, emptyList, "涓汉璁颁簨鏈褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎嚭涓汉璁颁簨鏈褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export/{ids}")
+ public void export(HttpServletResponse response,@PathVariable Long[] ids)
+ {
+ List<ZSelfNote> list = zSelfNoteService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class);
+ util.exportExcel(response, list, "涓汉璁颁簨鏈褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎叆涓汉璁颁簨鏈褰曞垪琛�
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ return zSelfNoteService.importExcel(file);
+ }
+
+ /**
+ * 鏂板涓汉璁颁簨鏈褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZSelfNote zSelfNote)
+ {
+ return zSelfNoteService.mySave(zSelfNote);
+ }
+
+ /**
+ * 淇敼涓汉璁颁簨鏈褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZSelfNote zSelfNote)
+ {
+ return toAjax(zSelfNoteService.updateById(zSelfNote));
+ }
+//
+ /**
+ * 鎵归噺鍒犻櫎涓汉璁颁簨鏈褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(zSelfNoteService.removeByIds(Arrays.asList(ids)));
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
index 84a6307..2d2fe22 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
@@ -1,9 +1,27 @@
package com.ruoyi.web.controller.zhang;
-import org.springframework.web.bind.annotation.RequestMapping;
+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.ZYearInfo;
+import com.ruoyi.service.ZYearInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Collections;
+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>
@@ -15,7 +33,96 @@
*/
@RestController
@RequestMapping("/zYearInfo")
-public class ZYearInfoController {
+@Slf4j
+public class ZYearInfoController extends BaseController {
+ @Autowired
+ private ZYearInfoService zYearInfoService;
+
+ /**
+ * 鏌ヨ鎵�鏈夎褰�
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(ZYearInfo zYearInfo){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zYearInfoService.selectDataList(zYearInfo,pageNum,pageSize);
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zYearInfoService.getById(id));
+ }
+
+ /**
+ * 妯℃澘
+ */
+ @GetMapping("/model")
+ public void getModel(HttpServletResponse response){
+ ZYearInfo zYearInfo = new ZYearInfo();
+ List<ZYearInfo> emptyList = Collections.singletonList(zYearInfo);
+ ExcelUtil<ZYearInfo> util = new ExcelUtil<>(ZYearInfo.class);
+ util.exportExcel(response, emptyList, "骞村害鍋ュ悍璁板綍鏁版嵁");
+ }
+
+ /**
+ * 瀵煎嚭骞村害鍋ュ悍璁板綍鍒楄〃
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "骞村害鍋ュ悍璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export/{ids}")
+ public void export(HttpServletResponse response,@PathVariable Long[] ids)
+ {
+ List<ZYearInfo> list = zYearInfoService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZYearInfo> util = new ExcelUtil<>(ZYearInfo.class);
+ util.exportExcel(response, list, "骞村害鍋ュ悍璁板綍鏁版嵁");
+ }
+
+ /**
+ * 瀵煎叆骞村害鍋ュ悍璁板綍鍒楄〃
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ return zYearInfoService.importExcel(file);
+ }
+
+ /**
+ * 鏂板骞村害鍋ュ悍璁板綍
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "骞村害鍋ュ悍璁板綍", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZYearInfo zYearInfo)
+ {
+ return zYearInfoService.mySave(zYearInfo);
+ }
+
+ /**
+ * 淇敼骞村害鍋ュ悍璁板綍
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "骞村害鍋ュ悍璁板綍", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZYearInfo zYearInfo)
+ {
+ return toAjax(zYearInfoService.updateById(zYearInfo));
+ }
+//
+ /**
+ * 鎵归噺鍒犻櫎骞村害鍋ュ悍璁板綍
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "骞村害鍋ュ悍璁板綍", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(zYearInfoService.removeByIds(Arrays.asList(ids)));
+ }
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
index 8bb6aba..adadbe6 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -113,4 +113,6 @@
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenEndTime;
+
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
index a072ff2..ecef979 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
@@ -1,10 +1,16 @@
package com.ruoyi.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -15,27 +21,23 @@
* @since 2023-03-14
*/
@TableName("z_self_note")
+@Data
public class ZSelfNote implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 鐢ㄦ埛id
*/
- private Integer userId;
+ private Long uid;
/**
* 鍦扮偣
*/
private String address;
-
- /**
- * 鏃堕棿
- */
- private LocalDateTime noteDate;
/**
* 鏍囬
@@ -47,64 +49,35 @@
*/
private String remark;
+ /**
+ * 浜虹墿
+ */
+ private String people;
- public Integer getId() {
- return id;
- }
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
- public void setId(Integer id) {
- this.id = id;
- }
+ /**
+ * 鍙戠敓鏃堕棿
+ */
+ @Excel(name = "鍙戠敓鏃堕棿",dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenTime;
- public Integer getUserId() {
- return userId;
- }
+ /**
+ * 鐢靛瓙鏂囦欢璺緞
+ */
+ private String url;
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenStartTime;
- public String getAddress() {
- return address;
- }
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenEndTime;
- public void setAddress(String address) {
- this.address = address;
- }
-
- public LocalDateTime getNoteDate() {
- return noteDate;
- }
-
- public void setNoteDate(LocalDateTime noteDate) {
- this.noteDate = noteDate;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "ZSelfNote{" +
- "id=" + id +
- ", userId=" + userId +
- ", address=" + address +
- ", noteDate=" + noteDate +
- ", title=" + title +
- ", remark=" + remark +
- "}";
- }
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZYearHealth.java b/zhang-content/src/main/java/com/ruoyi/domain/ZYearHealth.java
index 9f0069b..662190a 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZYearHealth.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZYearHealth.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
import java.io.Serializable;
/**
@@ -14,17 +16,18 @@
* @since 2023-03-14
*/
@TableName("z_year_health")
+@Data
public class ZYearHealth implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 骞村害鍋ュ悍琛ㄦ寔鏈夎�卛d
*/
- private Integer uid;
+ private Long uid;
/**
* 鐢熸椿涔犳儻
@@ -66,100 +69,4 @@
*/
private String diseaseOutcome;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUid() {
- return uid;
- }
-
- public void setUid(Integer uid) {
- this.uid = uid;
- }
-
- public String getLifeHabit() {
- return lifeHabit;
- }
-
- public void setLifeHabit(String lifeHabit) {
- this.lifeHabit = lifeHabit;
- }
-
- public String getTreatment() {
- return treatment;
- }
-
- public void setTreatment(String treatment) {
- this.treatment = treatment;
- }
-
- public String getFamilyDisease() {
- return familyDisease;
- }
-
- public void setFamilyDisease(String familyDisease) {
- this.familyDisease = familyDisease;
- }
-
- public String getNowDisease() {
- return nowDisease;
- }
-
- public void setNowDisease(String nowDisease) {
- this.nowDisease = nowDisease;
- }
-
- public String getDiseaseHappen() {
- return diseaseHappen;
- }
-
- public void setDiseaseHappen(String diseaseHappen) {
- this.diseaseHappen = diseaseHappen;
- }
-
- public String getDiseaseDevelop() {
- return diseaseDevelop;
- }
-
- public void setDiseaseDevelop(String diseaseDevelop) {
- this.diseaseDevelop = diseaseDevelop;
- }
-
- public String getDiseaseTreat() {
- return diseaseTreat;
- }
-
- public void setDiseaseTreat(String diseaseTreat) {
- this.diseaseTreat = diseaseTreat;
- }
-
- public String getDiseaseOutcome() {
- return diseaseOutcome;
- }
-
- public void setDiseaseOutcome(String diseaseOutcome) {
- this.diseaseOutcome = diseaseOutcome;
- }
-
- @Override
- public String toString() {
- return "ZYearHealth{" +
- "id=" + id +
- ", uid=" + uid +
- ", lifeHabit=" + lifeHabit +
- ", treatment=" + treatment +
- ", familyDisease=" + familyDisease +
- ", nowDisease=" + nowDisease +
- ", diseaseHappen=" + diseaseHappen +
- ", diseaseDevelop=" + diseaseDevelop +
- ", diseaseTreat=" + diseaseTreat +
- ", diseaseOutcome=" + diseaseOutcome +
- "}";
- }
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZYearInfo.java b/zhang-content/src/main/java/com/ruoyi/domain/ZYearInfo.java
index 38ea31a..b77691f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZYearInfo.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZYearInfo.java
@@ -1,10 +1,17 @@
package com.ruoyi.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -15,124 +22,71 @@
* @since 2023-03-14
*/
@TableName("z_year_info")
+@Data
public class ZYearInfo implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 骞村害鍋ュ悍琛╥d
*/
- private Integer hid;
+ private Long uid;
/**
* 浣撴鏃堕棿
*/
- private LocalDateTime checkTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浣撴鏃堕棿")
+ private Date checkTime;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenStartTime;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenEndTime;
/**
- * 鐪嬬梾锛�0銆佷綋妫�锛�1
+ * 绫诲瀷
*/
- private Integer type;
+ @Excel(name = "绫诲瀷")
+ private String type;
/**
* 灏辫瘖鍖婚櫌
*/
+ @Excel(name = "灏辫瘖鍖婚櫌")
private String hospital;
/**
* 棰樺悕
*/
+ @Excel(name = "棰樺悕")
private String title;
/**
* 娉ㄦ剰浜嬮」
*/
+ @Excel(name = "娉ㄦ剰浜嬮」")
private String notice;
/**
* 澶囨敞
*/
+ @Excel(name = "澶囨敞")
private String remark;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
- public Integer getId() {
- return id;
- }
+ private String url;
- public void setId(Integer id) {
- this.id = id;
- }
- public Integer getHid() {
- return hid;
- }
-
- public void setHid(Integer hid) {
- this.hid = hid;
- }
-
- public LocalDateTime getCheckTime() {
- return checkTime;
- }
-
- public void setCheckTime(LocalDateTime checkTime) {
- this.checkTime = checkTime;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getHospital() {
- return hospital;
- }
-
- public void setHospital(String hospital) {
- this.hospital = hospital;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getNotice() {
- return notice;
- }
-
- public void setNotice(String notice) {
- this.notice = notice;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "ZYearInfo{" +
- "id=" + id +
- ", hid=" + hid +
- ", checkTime=" + checkTime +
- ", type=" + type +
- ", hospital=" + hospital +
- ", title=" + title +
- ", notice=" + notice +
- ", remark=" + remark +
- "}";
- }
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZSelfNoteService.java b/zhang-content/src/main/java/com/ruoyi/service/ZSelfNoteService.java
index 5c7cd8c..4a459f1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZSelfNoteService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZSelfNoteService.java
@@ -2,7 +2,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZSelfNote;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* <p>
@@ -14,4 +18,11 @@
*/
public interface ZSelfNoteService extends IService<ZSelfNote> {
+ AjaxResult selectDataList(ZSelfNote zSelfNote, Integer pageNum, Integer pageSize);
+
+ List<ZSelfNote> selectByIds(Long[] ids);
+
+ AjaxResult importExcel(MultipartFile file);
+
+ AjaxResult mySave(ZSelfNote zSelfNote);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java b/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java
index c167682..0f3154e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZYearInfoService.java
@@ -2,7 +2,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZYearInfo;
+import com.ruoyi.domain.ZYearInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* <p>
@@ -13,5 +18,11 @@
* @since 2023-03-14
*/
public interface ZYearInfoService extends IService<ZYearInfo> {
+ AjaxResult selectDataList(ZYearInfo zYearInfo, Integer pageNum, Integer pageSize);
+ List<ZYearInfo> selectByIds(Long[] ids);
+
+ AjaxResult importExcel(MultipartFile file);
+
+ AjaxResult mySave(ZYearInfo zYearInfo);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
index e4fce98..150b5b9 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
@@ -1,11 +1,28 @@
package com.ruoyi.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZSelfNote;
import com.ruoyi.domain.ZSelfNote;
import com.ruoyi.mapper.ZSelfNoteMapper;
import com.ruoyi.service.ZSelfNoteService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
/**
* <p>
@@ -18,4 +35,101 @@
@Service
public class ZSelfNoteServiceImpl extends ServiceImpl<ZSelfNoteMapper, ZSelfNote> implements ZSelfNoteService {
+ @Autowired
+ ZSelfNoteServiceImpl zSelfNoteService;
+
+ private LambdaQueryWrapper<ZSelfNote> uniqueCondition(ZSelfNote zSelfNote) {
+ LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(StringUtils.isNotEmpty(zSelfNote.getAddress()), ZSelfNote::getAddress, zSelfNote.getAddress())
+ .eq(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople())
+ .eq(zSelfNote.getHappenTime() != null, ZSelfNote::getHappenTime, zSelfNote.getHappenTime())
+ .eq(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle())
+ .eq(StringUtils.isNotEmpty(zSelfNote.getRemark()), ZSelfNote::getRemark, zSelfNote.getRemark())
+ .eq(zSelfNote.getUid() != null, ZSelfNote::getUid, zSelfNote.getUid());
+ return lqw;
+ }
+
+ private LambdaQueryWrapper<ZSelfNote> buildCondition(ZSelfNote zSelfNote, Long userId) {
+ LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(userId != null, ZSelfNote::getUid, userId)
+ .like(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople())
+ .like(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle())
+ .between(zSelfNote.getHappenStartTime() != null && zSelfNote.getHappenEndTime() != null, ZSelfNote::getHappenTime, zSelfNote.getHappenStartTime(), zSelfNote.getHappenEndTime())
+ .orderByDesc(ZSelfNote::getCreateTime);
+ return lqw;
+ }
+
+ /**
+ * 鍒嗛〉鏌ユ壘
+ */
+ @Override
+ public AjaxResult selectDataList(ZSelfNote zSelfNote, Integer pageNum, Integer pageSize) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote, userId);
+
+ Page<ZSelfNote> pageBean = new Page<>(pageNum, pageSize);
+ Page<ZSelfNote> pageResult = page(pageBean, lqw);
+
+ List<ZSelfNote> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data);
+
+ }
+
+
+ @Override
+ public List<ZSelfNote> selectByIds(Long[] ids) {
+ List<ZSelfNote> list = new ArrayList<>();
+ if (ids.length != 0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
+ public AjaxResult mySave(ZSelfNote zSelfNote) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ zSelfNote.setUid(userId);
+
+ //妫�鏌ユ槸鍚︽湁閲嶅鏁版嵁鎻掑叆
+ LambdaQueryWrapper<ZSelfNote> lqw = uniqueCondition(zSelfNote);
+ List<ZSelfNote> list = list(lqw);
+ if (list.size() > 0) {
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+ }
+
+ if (save(zSelfNote)) {
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+ }
+
+ }
+
+ @Override
+ @Transactional
+ public AjaxResult importExcel(MultipartFile file) {
+
+ ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class);
+ List<ZSelfNote> dataList = null;
+ try {
+ dataList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException("娌℃湁鎸夌収瑙勫垯瀵煎叆鏁版嵁");
+ }
+
+ assert dataList != null;
+
+ for (ZSelfNote zSelfNote : dataList) {
+ zSelfNoteService.mySave(zSelfNote);
+ }
+
+ return AjaxResult.success();
+
+ }
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
index 7b7fcd3..e924156 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
@@ -1,11 +1,28 @@
package com.ruoyi.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZYearInfo;
import com.ruoyi.domain.ZYearInfo;
import com.ruoyi.mapper.ZYearInfoMapper;
import com.ruoyi.service.ZYearInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
/**
* <p>
@@ -18,4 +35,102 @@
@Service
public class ZYearInfoServiceImpl extends ServiceImpl<ZYearInfoMapper, ZYearInfo> implements ZYearInfoService {
+ @Autowired
+ ZYearInfoServiceImpl zYearInfoService;
+
+ private LambdaQueryWrapper<ZYearInfo> uniqueCondition(ZYearInfo zYearInfo) {
+ LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(StringUtils.isNotEmpty(zYearInfo.getType()), ZYearInfo::getType, zYearInfo.getType())
+ .eq(StringUtils.isNotEmpty(zYearInfo.getHospital()), ZYearInfo::getHospital, zYearInfo.getHospital())
+ .eq(StringUtils.isNotEmpty(zYearInfo.getTitle()), ZYearInfo::getTitle, zYearInfo.getTitle())
+ .eq(zYearInfo.getCheckTime() != null, ZYearInfo::getCheckTime, zYearInfo.getCheckTime())
+ .eq(StringUtils.isNotEmpty(zYearInfo.getNotice()), ZYearInfo::getNotice, zYearInfo.getNotice())
+ .eq(StringUtils.isNotEmpty(zYearInfo.getRemark()), ZYearInfo::getRemark, zYearInfo.getRemark())
+ .eq(zYearInfo.getUid() != null, ZYearInfo::getUid, zYearInfo.getUid());
+ return lqw;
+ }
+
+ private LambdaQueryWrapper<ZYearInfo> buildCondition(ZYearInfo zYearInfo, Long userId) {
+ LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(userId != null, ZYearInfo::getUid, userId)
+ .like(StringUtils.isNotEmpty(zYearInfo.getType()), ZYearInfo::getType, zYearInfo.getType())
+ .like(StringUtils.isNotEmpty(zYearInfo.getHospital()), ZYearInfo::getHospital, zYearInfo.getHospital())
+ .like(StringUtils.isNotEmpty(zYearInfo.getTitle()), ZYearInfo::getTitle, zYearInfo.getTitle())
+ .between(zYearInfo.getHappenStartTime() != null && zYearInfo.getHappenEndTime() != null, ZYearInfo::getCheckTime, zYearInfo.getHappenStartTime(), zYearInfo.getHappenEndTime())
+ .orderByDesc(ZYearInfo::getCreateTime);
+ return lqw;
+ }
+
+ /**
+ * 鍒嗛〉鏌ユ壘
+ */
+ @Override
+ public AjaxResult selectDataList(ZYearInfo zYearInfo, Integer pageNum, Integer pageSize) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ LambdaQueryWrapper<ZYearInfo> lqw = buildCondition(zYearInfo, userId);
+
+ Page<ZYearInfo> pageBean = new Page<>(pageNum, pageSize);
+ Page<ZYearInfo> pageResult = page(pageBean, lqw);
+
+ List<ZYearInfo> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data);
+
+ }
+
+
+ @Override
+ public List<ZYearInfo> selectByIds(Long[] ids) {
+ List<ZYearInfo> list = new ArrayList<>();
+ if (ids.length != 0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
+ public AjaxResult mySave(ZYearInfo zYearInfo) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ zYearInfo.setUid(userId);
+
+ //妫�鏌ユ槸鍚︽湁閲嶅鏁版嵁鎻掑叆
+ LambdaQueryWrapper<ZYearInfo> lqw = uniqueCondition(zYearInfo);
+ List<ZYearInfo> list = list(lqw);
+ if (list.size() > 0) {
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+ }
+
+ if (save(zYearInfo)) {
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+ }
+
+ }
+
+ @Override
+ @Transactional
+ public AjaxResult importExcel(MultipartFile file) {
+
+ ExcelUtil<ZYearInfo> util = new ExcelUtil<>(ZYearInfo.class);
+ List<ZYearInfo> dataList = null;
+ try {
+ dataList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException("娌℃湁鎸夌収瑙勫垯瀵煎叆鏁版嵁");
+ }
+
+ assert dataList != null;
+
+ for (ZYearInfo zYearInfo : dataList) {
+ zYearInfoService.mySave(zYearInfo);
+ }
+
+ return AjaxResult.success();
+
+ }
}
--
Gitblit v1.9.1