ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/resources/application-druid.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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))); } } 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 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 # 数据库索引 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 + "}"; } } 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); } 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; } }