Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

whywhyo

2023-05-19 8e27235844b5640441d810e18e5adc863479735b

Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

# Conflicts:
#	zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java

@@ -50,11 +50,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfCleanExcelBean> list = Collections.singletonList(new ZfCleanExcelBean());
        ExcelUtil<ZfCleanExcelBean> util = new ExcelUtil<>(ZfCleanExcelBean.class);
        util.exportExcel(response,list,"保洁收纳记录数据");
        util.exportExcel(response,list,"保洁收纳导入模板");
    }


@@ -71,6 +71,19 @@
        ExcelUtil<ZfClean> util = new ExcelUtil<>(ZfClean.class);
        util.exportExcel(response, list, "保洁收纳记录数据");
    }
    /**
     * 导出保洁收纳记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "保洁收纳记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfClean> list = zfCleanService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfClean> util = new ExcelUtil<>(ZfClean.class);
        util.exportExcel(response, list, "保洁收纳记录数据");
    }

    /**
     * 导入保洁收纳记录列表

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java

@@ -52,11 +52,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfCollectionExcelBean> list = Collections.singletonList(new ZfCollectionExcelBean());
        ExcelUtil<ZfCollectionExcelBean> util = new ExcelUtil<>(ZfCollectionExcelBean.class);
        util.exportExcel(response,list,"收藏荣誉记录数据");
        util.exportExcel(response,list,"收藏荣誉导入模板");
    }

    /**
@@ -72,6 +72,19 @@
        ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
        util.exportExcel(response, list, "收藏和荣誉记录数据");
    }
    /**
     * 导出收藏和荣誉记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "收藏和荣誉记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfCollection> list = zfCollectionService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
        util.exportExcel(response, list, "收藏和荣誉记录数据");
    }
//

    /**

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java

@@ -50,11 +50,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfContactExcelBean> list = Collections.singletonList(new ZfContactExcelBean());
        ExcelUtil<ZfContactExcelBean> util = new ExcelUtil<>(ZfContactExcelBean.class);
        util.exportExcel(response,list,"通讯录数据");
        util.exportExcel(response,list,"通讯录导入模板");
    }

    /**
@@ -72,6 +72,19 @@
    }

    /**
     * 导出通讯录记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "通讯录记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfContact> list = zfContactService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
        util.exportExcel(response, list, "通讯录记录数据");
    }
    /**
     * 导入通讯录记录列表
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java

@@ -49,11 +49,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfDoctor> list = Collections.singletonList(new ZfDoctor());
        ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
        util.exportExcel(response,list,"小医生记录数据");
        util.exportExcel(response,list,"家庭小医生导入模板");
    }


@@ -70,7 +70,19 @@
        ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
        util.exportExcel(response, list, "家庭小医生记录数据");
    }

    /**
     * 导出家庭小医生记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "家庭小医生记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfDoctor> list = zfDoctorService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
        util.exportExcel(response, list, "家庭小医生记录数据");
    }
    /**
     * 导入家庭小医生记录列表
     */

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java

@@ -50,11 +50,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfEconomyExcelBean> list = Collections.singletonList(new ZfEconomyExcelBean());
        ExcelUtil<ZfEconomyExcelBean> util = new ExcelUtil<>(ZfEconomyExcelBean.class);
        util.exportExcel(response,list,"家庭收支台账记录数据");
        util.exportExcel(response,list,"家庭收支台账导入模板");
    }

    /**
@@ -70,6 +70,19 @@
        ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class);
        util.exportExcel(response, list, "家庭收支台账记录数据");
    }
    /**
     * 导出家庭收支台账记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "家庭收支台账记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfEconomy> list = zfEconomyService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class);
        util.exportExcel(response, list, "家庭收支台账记录数据");
    }
//

    /**

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java

@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.excel.ZfEconomyExcelBean;
import com.ruoyi.domain.excel.ZfEquipmentExcelBean;
import com.ruoyi.service.ZfEquipmentService;
@@ -51,11 +52,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfEquipmentExcelBean> list = Collections.singletonList(new ZfEquipmentExcelBean());
        ExcelUtil<ZfEquipmentExcelBean> util = new ExcelUtil<>(ZfEquipmentExcelBean.class);
        util.exportExcel(response,list,"家庭设备记录数据");
        util.exportExcel(response,list,"家庭设备导入模板");
    }


@@ -72,6 +73,19 @@
        ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
        util.exportExcel(response, list, "家庭设备记录数据");
    }
    /**
     * 导出家庭设备记录列表
     */
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
        List<ZfEquipment> list = zfEquipmentService.selectByIds(ids);
        log.info("导出记录为:{}", list);
        ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
        util.exportExcel(response, list, "家庭大事件记录数据");

    }

//

    /**

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java

@@ -18,6 +18,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -51,11 +52,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfEventExcelBean> list = Collections.singletonList(new ZfEventExcelBean());
        ExcelUtil<ZfEventExcelBean> util = new ExcelUtil<>(ZfEventExcelBean.class);
        util.exportExcel(response,list,"家大事记记录数据");
        util.exportExcel(response,list,"家大事记导入模板");
    }


@@ -66,7 +67,22 @@
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZfEvent zfEvent) {
        List<ZfEvent> list = zfEventService.selectByCondition(zfEvent);
        List<ZfEvent> list = new ArrayList<>();

        list = zfEventService.selectByCondition(zfEvent);
        log.info("导出记录为:{}", list);
        ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
        util.exportExcel(response, list, "家庭大事件记录数据");

    }
    /**
     * 导出家庭大事件记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
        List<ZfEvent> list = zfEventService.selectByIds(ids);
        log.info("导出记录为:{}", list);
        ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
        util.exportExcel(response, list, "家庭大事件记录数据");

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java

@@ -49,11 +49,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfPet> list = Collections.singletonList(new ZfPet());
        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
        util.exportExcel(response,list,"魅宠记录数据");
        util.exportExcel(response,list,"魅宠记录导入模板");
    }

    /**
@@ -69,6 +69,19 @@
        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
        util.exportExcel(response, list, "魅宠记录数据");
    }
    /**
     * 导出魅宠记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "魅宠记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfPet> list = zfPetService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
        util.exportExcel(response, list, "魅宠记录数据");
    }

    /**
     * 导入魅宠记录列表

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java

@@ -61,11 +61,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfPetNote> list = Collections.singletonList(new ZfPetNote());
        ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
        util.exportExcel(response,list,"魅宠备忘录记录数据");
        util.exportExcel(response,list,"魅宠备忘录导入模板");
    }



 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.excel.ZfEconomyExcelBean;
import com.ruoyi.domain.excel.ZfPropertyExcelBean;
@@ -47,11 +48,11 @@
    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfPropertyExcelBean> list = Collections.singletonList(new ZfPropertyExcelBean());
        ExcelUtil<ZfPropertyExcelBean> util = new ExcelUtil<>(ZfPropertyExcelBean.class);
        util.exportExcel(response,list,"家庭资产记录数据");
        util.exportExcel(response,list,"家庭资产导入模板");
    }

    /**
@@ -67,6 +68,18 @@
        ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
        util.exportExcel(response, list, "家庭资产记录数据");
    }
    /**
     * 导出家庭资产记录列表
     */
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
        List<ZfProperty> list = zfPropertyService.selectByIds(ids);
        log.info("导出记录为:{}", list);
        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
        util.exportExcel(response, list, "家庭大事件记录数据");

    }
//

    /**

 zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java

@@ -5,6 +5,7 @@
import lombok.ToString;

import java.io.Serializable;
import java.util.Date;

/**
 * @Author Jinquan_Ou
@@ -52,6 +53,11 @@
     */
    @Excel(name = "放置地点")
    private String location;
    /**
     * 发生时间
     */
    @Excel(name = "发生时间")
    private Date happenTime;

    /**
     * 备注

 zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java

@@ -19,13 +19,19 @@
    /**
     * 类别
     */
    @Excel(name = "类别")
    private String type;
//    @Excel(name = "类别")
//    private String type;
    /**
     * 获得时间
     */
    @Excel(name = "获得时间", dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;

    /**
     * 名字
     */
    @Excel(name = "名字")
    @Excel(name = "名称")
    private String name;

    /**
@@ -58,11 +64,5 @@
    @Excel(name = "备注")
    private String remark;

    /**
     * 获得时间
     */
    @Excel(name = "发生时间", dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;

}

 zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java

@@ -21,6 +21,12 @@
    @Excel(name = "收支类型",readConverterExp = "0=基金,1=台账")
    private Integer type;
    /**
     * 发生时间
     */
    @Excel(name = "发生时间", dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;
    /**
     * 收入/支出
     */
    @Excel(name = "收入/支出")
@@ -56,10 +62,5 @@
    @Excel(name = "备注")
    private String remark;

    /**
     * 发生时间
     */
    @Excel(name = "时间", dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;

}

 zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java

@@ -22,6 +22,17 @@
     */
    @Excel(name = "设备名称")
    private String name;
    /**
     * 记录时间
     */
    @Excel(name = "时间", dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;
    /**
     * 是否注销
     */
    @Excel(name = "是否注销")
    private Integer status;

    /**
     * 购买人
@@ -47,12 +58,7 @@
    @Excel(name = "备注")
    private String remark;

    /**
     * 记录时间
     */
    @Excel(name = "时间", dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;



}

 zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @Author Jinquan_Ou
@@ -39,4 +40,11 @@
     */
    @Excel(name="备注信息")
    private String remark;


    /**
     * 发生时间
     */
    @Excel(name="发生时间")
    private Date happenTime;;
}

 zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfProperty;
import org.springframework.web.multipart.MultipartFile;

@@ -19,7 +20,7 @@
    List<ZfProperty> selectByCondition(ZfProperty zfProperty);

    AjaxResult selectPropertyList(ZfProperty zfProperty,Integer pageNum,Integer pageSize);

    List<ZfProperty> selectByIds( Long[] ids);
    AjaxResult addData(ZfProperty zfProperty);

    AjaxResult addData2(ZfProperty zfProperty);

 zhang-content/src/main/java/com/ruoyi/service/ZfCleanService.java

@@ -23,6 +23,7 @@

    List<ZfClean> selectByCondition(ZfClean zfClean);

    List<ZfClean> selectByIds(Long[] ids);
    AjaxResult addData(ZfClean zfClean);

    AjaxResult addData2(ZfClean zfClean);

 zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java

@@ -22,6 +22,7 @@

    List<ZfCollection> selectByCondition(ZfCollection zfCollection);

    List<ZfCollection> selectByIds(Long[] ids);
    AjaxResult importExcel(MultipartFile file);

    AjaxResult addData2(ZfCollection zfCollection);

 zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java

@@ -22,7 +22,7 @@
    AjaxResult selectDataList(ZfContact zfContact, Integer pageNum, Integer pageSize);

    List<ZfContact> selectByCondition(ZfContact zfContact);

    List<ZfContact> selectByIds(Long [] ids);
    AjaxResult addData(ZfContact zfContact);

    AjaxResult addData2(ZfContact zfContact);

 zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java

@@ -20,6 +20,7 @@
    AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize);

    List<ZfDoctor> selectByCondition(ZfDoctor zfDoctor);
    List<ZfDoctor> selectByIds(Long[] ids);

    AjaxResult mySave(ZfDoctor zfDoctor);


 zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java

@@ -21,7 +21,7 @@
    AjaxResult selectDataList(ZfEconomy zfEconomy, Integer pageNum, Integer pageSize);

    List<ZfEconomy> selectByCondition(ZfEconomy zfEconomy);

    List<ZfEconomy> selectByIds(Long [] ids);
    AjaxResult importExcel(MultipartFile file);

    AjaxResult addData2(ZfEconomy zfEconomy);

 zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfEvent;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
@@ -21,7 +22,7 @@
    AjaxResult selectDataList(ZfEquipment zfEquipment, Integer pageNum, Integer pageSize);

    List<ZfEquipment> selectByCondition(ZfEquipment zfEquipment);

    List<ZfEquipment> selectByIds(Long[] ids);
    AjaxResult addData(ZfEquipment zfEquipment);
    AjaxResult addData2(ZfEquipment zfEquipment);


 zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java

@@ -21,6 +21,7 @@
    AjaxResult selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize);

    List<ZfEvent> selectByCondition(ZfEvent zfEvent);
    List<ZfEvent> selectByIds(Long[] ids);

    AjaxResult addData(ZfEvent zfEvent);


 zhang-content/src/main/java/com/ruoyi/service/ZfPetService.java

@@ -20,6 +20,6 @@
    AjaxResult selectPetList(ZfPet zfPet, Integer pageNum, Integer pageSize);

    List<ZfPet> selectByCondition(ZfPet zfPet);

    List<ZfPet> selectByIds(Long[] ids);
    AjaxResult mySave(ZfPet zfPet);
}

 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java

@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPropertyMapper;
@@ -25,9 +26,7 @@
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

import static com.ruoyi.constant.MenuAuthority.PROPERTY_LIST;
@@ -230,6 +229,16 @@
    }

    @Override
    public List<ZfProperty> selectByIds(Long[] ids) {
        List<ZfProperty> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    @Override
    public AjaxResult addData(ZfProperty zfProperty) {

        String familyIds = listFamilyIds();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java

@@ -10,11 +10,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.*;

import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfCleanMapper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfCleanService;
@@ -26,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -208,6 +208,16 @@
        return markOwnData(familyIds, beanRecords);
    }

    @Override
    public List<ZfClean> selectByIds(Long[] ids) {
        List<ZfClean> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    private static List<ZfClean> markOwnData(String familyIds, List<ZfClean> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java

@@ -23,6 +23,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -205,6 +207,16 @@
        return markOwnData(familyIds, beanRecords);
    }

    @Override
    public List<ZfCollection> selectByIds(Long[] ids) {
        List<ZfCollection> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    private List<ZfCollection> markOwnData(String familyIds, List<ZfCollection> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java

@@ -24,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -196,6 +198,16 @@
        return markOwnData(familyIds, beanRecords);
    }

    @Override
    public List<ZfContact> selectByIds(Long[] ids) {
        List<ZfContact> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    private static List<ZfContact> markOwnData(String familyIds, List<ZfContact> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java

@@ -8,12 +8,15 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfPet;
import com.ruoyi.mapper.ZfDoctorMapper;
import com.ruoyi.service.ZfDoctorService;
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;

@@ -51,6 +54,16 @@
    }

    @Override
    public List<ZfDoctor> selectByIds(Long[] ids) {
        List<ZfDoctor> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    @Override
    public AjaxResult mySave(ZfDoctor zfDoctor) {
        //判断是否有重复数据
        LambdaQueryWrapper<ZfDoctor> lqw = uniqueCondition(zfDoctor);

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java

@@ -23,6 +23,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -205,6 +207,16 @@
        return markOwnData(familyIds, beanRecords);
    }

    @Override
    public List<ZfEconomy> selectByIds(Long[] ids) {
        List<ZfEconomy> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    private List<ZfEconomy> markOwnData(String familyIds, List<ZfEconomy> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java

@@ -22,6 +22,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -203,6 +205,15 @@
        return markOwnData(familyIds, beanRecords);
    }

    @Override
    public List<ZfEquipment> selectByIds(Long[] ids) {
        List<ZfEquipment> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;    }

    private static List<ZfEquipment> markOwnData(String familyIds, List<ZfEquipment> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java

@@ -24,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -201,6 +203,16 @@
        return markOwnData(familyIds, beanRecords);
    }

    @Override
    public List<ZfEvent> selectByIds(Long[] ids) {
        List<ZfEvent> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    private static List<ZfEvent> markOwnData(String familyIds, List<ZfEvent> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfMaster;
import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfPet;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPetMapper;
@@ -24,6 +25,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

@@ -67,6 +70,16 @@
    }

    @Override
    public List<ZfPet> selectByIds(Long[] ids) {
        List<ZfPet> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    @Override
    @Transactional
    public AjaxResult mySave(ZfPet zfPet) {
        SysUser user = SecurityUtils.getLoginUser().getUser();