45648

whywhyo

2023-07-22 dfdd4bd5d112a17ccd1483ad11fe023817d54d26

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

@@ -3,14 +3,14 @@
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.ZfEquipment;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.domain.excel.ZfEconomyExcelBean;
import com.ruoyi.domain.excel.ZfPropertyExcelBean;
import com.ruoyi.service.IZfPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +19,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -37,27 +38,22 @@
    @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.selectDataList(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);
//    }
    /**
     * 获取导入模板
     */
    @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,"家庭资产导入模板");
    }

    /**
     * 导出家庭资产记录列表
@@ -69,6 +65,17 @@
    {
        List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
        log.info("导出记录为:{}",list);
        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, "家庭资产记录数据");
    }
@@ -81,18 +88,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 +109,7 @@
    @PostMapping
    public AjaxResult add(@RequestBody ZfProperty zfProperty)
    {
        return toAjax(zfPropertyService.save(zfProperty));
        return zfPropertyService.addData(zfProperty);
    }

    /**
@@ -123,7 +120,7 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ZfProperty zfProperty)
    {
        return toAjax(zfPropertyService.updateById(zfProperty));
        return zfPropertyService.updateData(zfProperty);
    }
//
    /**
@@ -134,6 +131,6 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(zfPropertyService.removeByIds(Arrays.asList(ids)));
        return zfPropertyService.deleteData(ids);
    }
}