完成家根网

whywhyo

2023-05-03 ab06f7043e4192556c4d9881b0430bcb6cc75f50

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

@@ -3,14 +3,11 @@
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.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
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.ZfProperty;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.service.IZfPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,27 +34,12 @@
    @Autowired
    private IZfPropertyService zfPropertyService;

    @Autowired
    private TokenService tokenService;

    @GetMapping("/all")
    public AjaxResult  listAll(ZfProperty zfProperty){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zfPropertyService.selectUserList(zfProperty, pageNum, pageSize);
        return zfPropertyService.selectPropertyList(zfProperty, pageNum, pageSize);
    }

//    /**
//     * 查询家庭资产记录列表
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:list')")
//    @GetMapping("/list")
//    public TableDataInfo list(ZfProperty zfProperty)
//    {
//        startPage();
//        List<ZfProperty> list = zfPropertyService.selectZfPropertyList(zfProperty);
//        return getDataTable(list);
//    }

    /**
     * 导出家庭资产记录列表
@@ -69,7 +51,7 @@
    {
        List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
        ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
        util.exportExcel(response, list, "家庭资产记录数据");
    }
//
@@ -81,18 +63,8 @@
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport")MultipartFile file) throws Exception
    {
        ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
        List<ZfProperty> propertyList = util.importExcel(file.getInputStream());
        log.info("资产列表为：{}",propertyList);

        if (zfPropertyService.saveBatch(propertyList)) {
            return AjaxResult.success("导入数据成功");
        }

        return AjaxResult.error("导入数据失败");

        return zfPropertyService.importExcel(file);
    }


    /**
     * 获取家庭资产记录详细信息
@@ -112,7 +84,7 @@
    @PostMapping
    public AjaxResult add(@RequestBody ZfProperty zfProperty)
    {
        return toAjax(zfPropertyService.save(zfProperty));
        return zfPropertyService.addData2(zfProperty);
    }

    /**