From fa4aaa8ec7af6ef7a6ddc63ae69e923723c3febc Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 08 四月 2023 12:45:45 +0800
Subject: [PATCH] bbb
---
zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java | 6 +
ruoyi-admin/src/main/resources/application-druid.yml | 4
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | 42 ++++++++
zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java | 122 +++--------------------
ruoyi-admin/src/main/resources/application.yml | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java | 108 +++++++++++++++++++++
6 files changed, 175 insertions(+), 111 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
index bf6a6df..548a05b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
@@ -1,9 +1,26 @@
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.ZfContact;
+import com.ruoyi.service.ZfContactService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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>
@@ -15,7 +32,92 @@
*/
@RestController
@RequestMapping("/zfContact")
-public class ZfContactController {
+@Slf4j
+public class ZfContactController extends BaseController {
+ @Resource
+ private ZfContactService zfContactService;
+
+ @GetMapping("/all")
+ public AjaxResult listAll(ZfContact zfContact){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfContactService.selectContactList(zfContact, pageNum, pageSize);
+ }
+
+
+ /**
+ * 瀵煎嚭閫氳褰曡褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "閫氳褰曡褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ZfContact zfContact)
+ {
+ List<ZfContact> list = zfContactService.selectByCondition(zfContact);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
+ util.exportExcel(response, list, "閫氳褰曡褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎叆閫氳褰曡褰曞垪琛�
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
+ List<ZfContact> eventList = util.importExcel(file.getInputStream());
+ log.info("閫氳褰曞垪琛ㄤ负锛歿}",eventList);
+ if (zfContactService.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(zfContactService.getById(id));
+ }
+//
+ /**
+ * 鏂板閫氳褰曡褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "閫氳褰曡褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZfContact zfContact)
+ {
+ return toAjax(zfContactService.save(zfContact));
+ }
+
+ /**
+ * 淇敼閫氳褰曡褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "閫氳褰曡褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZfContact zfContact)
+ {
+ return toAjax(zfContactService.updateById(zfContact));
+ }
+//
+ /**
+ * 鎵归噺鍒犻櫎閫氳褰曡褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "閫氳褰曡褰�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(zfContactService.removeByIds(Arrays.asList(ids)));
+ }
+
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 045d564..b2e66b2 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,8 +6,8 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: ZhangApp123!
# password: 123456
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ebd475f..2a71b7e 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -70,8 +70,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: localhost
-# host: 192.168.88.68
+# host: localhost
+ host: 192.168.88.68
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java
index 9f81c43..2e15a8b 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import lombok.ToString;
+
import java.io.Serializable;
/**
@@ -14,166 +18,76 @@
* @since 2023-03-12
*/
@TableName("zf_contact")
+@Data
+@ToString
public class ZfContact implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 鎴愬憳濮撳悕
*/
+ @Excel(name = "鎴愬憳濮撳悕")
private String myName;
/**
* 绉板懠
*/
+ @Excel(name = "绉板懠")
private String nickName;
/**
* 绉板懠鑰呭鍚�
*/
+ @Excel(name = "绉板懠鑰呭鍚�")
private String name;
/**
* 宸ヤ綔鍗曚綅
*/
+ @Excel(name = "宸ヤ綔鍗曚綅")
private String work;
/**
* 鎵嬫満鍙风爜
*/
+ @Excel(name = "鎵嬫満鍙风爜")
private String phone;
/**
* 寰俊鍙�
*/
+ @Excel(name = "寰俊鍙�")
private String wx;
/**
* qq鍙�
*/
+ @Excel(name = "qq鍙�")
private String qq;
/**
* 鎺ㄧ壒鍙�
*/
+ @Excel(name = "鎺ㄧ壒鍙�")
private String twitter;
/**
* 鏄惁甯歌仈绯�,0:鍚�,1:鏄�
*/
+ @Excel(name = "鏄惁甯歌仈绯�",readConverterExp = "0=鍚�,1=鏄�")
private Integer isAlways;
/**
* 澶囨敞
*/
+ @Excel(name = "澶囨敞")
private String remark;
+ private String url;
- public Integer getId() {
- return id;
- }
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getMyName() {
- return myName;
- }
-
- public void setMyName(String myName) {
- this.myName = myName;
- }
-
- public String getNickName() {
- return nickName;
- }
-
- public void setNickName(String nickName) {
- this.nickName = nickName;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getWork() {
- return work;
- }
-
- public void setWork(String work) {
- this.work = work;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getWx() {
- return wx;
- }
-
- public void setWx(String wx) {
- this.wx = wx;
- }
-
- public String getQq() {
- return qq;
- }
-
- public void setQq(String qq) {
- this.qq = qq;
- }
-
- public String getTwitter() {
- return twitter;
- }
-
- public void setTwitter(String twitter) {
- this.twitter = twitter;
- }
-
- public Integer getIsAlways() {
- return isAlways;
- }
-
- public void setIsAlways(Integer isAlways) {
- this.isAlways = isAlways;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "ZfContact{" +
- "id=" + id +
- ", myName=" + myName +
- ", nickName=" + nickName +
- ", name=" + name +
- ", work=" + work +
- ", phone=" + phone +
- ", wx=" + wx +
- ", qq=" + qq +
- ", twitter=" + twitter +
- ", isAlways=" + isAlways +
- ", remark=" + remark +
- "}";
- }
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java
index a003036..4979954 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZfContact;
+
+import java.util.List;
/**
* <p>
@@ -14,4 +17,7 @@
*/
public interface ZfContactService extends IService<ZfContact> {
+ AjaxResult selectContactList(ZfContact zfContact, Integer pageNum, Integer pageSize);
+
+ List<ZfContact> selectByCondition(ZfContact zfContact);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index ef01af8..9420b3e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -1,11 +1,21 @@
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.utils.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.ZfContact;
import com.ruoyi.domain.ZfContact;
import com.ruoyi.mapper.ZfContactMapper;
import com.ruoyi.service.ZfContactService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
/**
* <p>
@@ -16,6 +26,38 @@
* @since 2023-03-12
*/
@Service
+@Slf4j
public class ZfContactServiceImpl extends ServiceImpl<ZfContactMapper, ZfContact> implements ZfContactService {
+ @Override
+ public AjaxResult selectContactList(ZfContact zfContact, Integer pageNum, Integer pageSize) {
+ LambdaQueryWrapper<ZfContact> lqw = buildCondition(zfContact);
+ Page<ZfContact> ZfContactPage = new Page<>(pageNum,pageSize);
+ Page<ZfContact> pageResult = page(ZfContactPage, lqw);
+ HashMap<String, Object> data = MapUtils.getResult(pageResult);
+ return AjaxResult.success(data);
+ }
+
+ @Override
+ public List<ZfContact> selectByCondition(ZfContact zfContact) {
+ LambdaQueryWrapper<ZfContact> lambdaQueryWrapper = buildCondition(zfContact);
+ List<ZfContact> list = list(lambdaQueryWrapper);
+ log.info("杩斿洖鐨勬暟鎹负:{}",list);
+ return list;
+ }
+
+ private LambdaQueryWrapper<ZfContact> buildCondition(ZfContact zfContact) {
+ LambdaQueryWrapper<ZfContact> lqw = new LambdaQueryWrapper<>();
+ lqw.like(StringUtils.isNotEmpty(zfContact.getMyName()),ZfContact::getMyName,zfContact.getMyName());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getNickName()),ZfContact::getNickName,zfContact.getNickName());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getName()),ZfContact::getName,zfContact.getName());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getWork()),ZfContact::getWork,zfContact.getWork());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getPhone()),ZfContact::getPhone,zfContact.getPhone());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getWx()),ZfContact::getWx,zfContact.getWx());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getQq()),ZfContact::getQq,zfContact.getQq());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getTwitter()),ZfContact::getTwitter,zfContact.getTwitter());
+ lqw.like(StringUtils.isNotEmpty(zfContact.getRemark()),ZfContact::getRemark,zfContact.getRemark());
+ return lqw;
+ }
+
}
--
Gitblit v1.9.1