whywhyo
2023-07-30 2f165d7451198c69080d667853e97701ea466318
51896
12个文件已修改
108 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZIdeaService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
@@ -68,13 +68,23 @@
        util.exportExcel(response, emptyList, "百年心愿记录数据");
    }
    @Log(title = "百年心愿记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response)
    {
        List<ZIdea> list = zIdeaService.selectByCondition();
        log.info("导出记录为:{}",list);
        ExcelUtil<ZIdea> util = new ExcelUtil<>(ZIdea.class);
        util.exportExcel(response, list, "百年心愿记录数据");
    }
    /**
     * 导出百年心愿记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "百年心愿记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response,@PathVariable Long[] ids)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response,@PathVariable Long[] ids)
    {
        List<ZIdea> list = zIdeaService.selectByIds(ids);
        log.info("导出记录为:{}",list);
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -73,8 +73,18 @@
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "个人财产记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response,@PathVariable Long[] ids)
    @PostMapping("/export")
    public void export(HttpServletResponse response)
    {
        List<ZProperty> list = zPropertyService.selectByCondition();
        log.info("导出记录为:{}",list);
        ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
        util.exportExcel(response, list, "个人财产记录数据");
    }
    @Log(title = "个人财产记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response,@PathVariable Long[] ids)
    {
        List<ZProperty> list = zPropertyService.selectByIds(ids);
        log.info("导出记录为:{}",list);
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -67,13 +67,23 @@
        util.exportExcel(response, emptyList, "藏心密语记录数据");
    }
    @Log(title = "藏心密语记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response)
    {
        List<ZSecret> list = zSecretService.selectByCondition();
        log.info("导出记录为:{}",list);
        ExcelUtil<ZSecret> util = new ExcelUtil<>(ZSecret.class);
        util.exportExcel(response, list, "藏心密语记录数据");
    }
    /**
     * 导出藏心密语记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "藏心密语记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response,@PathVariable Long[] ids)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response,@PathVariable Long[] ids)
    {
        List<ZSecret> list = zSecretService.selectByIds(ids);
        log.info("导出记录为:{}",list);
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
@@ -85,6 +85,17 @@
        util.exportExcel(response, list, "魅宠备忘录记录数据");
    }
    @Log(title = "魅宠备忘录记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response, ZfPetNote zfPetNote, @PathVariable Long[] ids)
    {
        List<ZfPetNote> list = zfPetNoteService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
        util.exportExcel(response, list, "魅宠备忘录记录数据");
    }
    /**
     * 导入魅宠备忘录记录列表
     */
zhang-content/src/main/java/com/ruoyi/service/ZIdeaService.java
@@ -25,6 +25,8 @@
    AjaxResult importExcel(MultipartFile file);
    AjaxResult mySave(ZIdea zIdea);
    List<ZIdea> selectByCondition();
}
zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java
@@ -27,4 +27,6 @@
    AjaxResult mySave(ZProperty zProperty);
    List<ZProperty> selectByCondition();
}
zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java
@@ -26,4 +26,7 @@
    AjaxResult mySave(ZSecret zSecret);
    List<ZSecret> selectByCondition();
}
zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
@@ -24,4 +24,6 @@
    AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,String pid,ZfPetNote zfPetNote);
    AjaxResult mySave(ZfPetNote zfPetNote);
    List<ZfPetNote> selectByIds(Long[] ids);
}
zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
@@ -115,6 +115,16 @@
    }
    @Override
    public List<ZIdea> selectByCondition() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        ZIdea zIdea = new ZIdea();
        LambdaQueryWrapper<ZIdea> lqw = buildCondition(zIdea, userId);
        return list(lqw);
    }
    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {
zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZPropertyMapper;
import com.ruoyi.service.ZPropertyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -116,6 +117,15 @@
    }
    @Override
    public List<ZProperty> selectByCondition() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        ZProperty zProperty = new ZProperty();
        LambdaQueryWrapper<ZProperty> lqw = buildCondition(zProperty, userId);
        return list(lqw);
    }
    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -116,6 +116,17 @@
    }
    @Override
    public List<ZSecret> selectByCondition() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        ZSecret zSecret = new ZSecret();
        LambdaQueryWrapper<ZSecret> lqw = buildCondition(zSecret, userId);
        return list(lqw);
    }
    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
@@ -10,11 +10,14 @@
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfPet;
import com.ruoyi.domain.ZfPetNote;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPetNoteMapper;
import com.ruoyi.service.ZfPetNoteService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -81,6 +84,16 @@
        }
    }
    @Override
    public List<ZfPetNote> selectByIds(Long[] ids) {
        List<ZfPetNote> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }
    private LambdaQueryWrapper<ZfPetNote> uniqueCondition(ZfPetNote zfPetNote) {
        LambdaQueryWrapper<ZfPetNote> lqw = new LambdaQueryWrapper<>();
        lqw.eq(StringUtils.isNotEmpty(zfPetNote.getTitle()),ZfPetNote::getTitle,zfPetNote.getTitle());