通用日志说明修改

zhongrj

2024-05-17 5437586ac6cae38b00a69132c4f89f4844ece902

 src/main/java/org/springblade/modules/house/controller/HouseholdController.java

@@ -34,6 +34,7 @@
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.ExportHouseholdExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.excel.HouseHoldImporter;
import org.springblade.modules.house.service.IHouseholdService;
@@ -71,7 +72,7 @@
   @ApiLog("住户 详情")
   @ApiOperation(value = "详情", notes = "传入household")
   public R<HouseholdVO> detail(HouseholdEntity household) {
      bladeLogger.info("住户 详情", JsonUtil.toJson(household));
      bladeLogger.info("住户详情查询", JsonUtil.toJson(household));
      HouseholdEntity detail = householdService.getOne(Condition.getQueryWrapper(household).last("limit 1"));
      return R.data(HouseholdWrapper.build().entityVO(detail));
   }
@@ -86,7 +87,7 @@
   @ApiLog("住户 详情")
   @ApiOperation(value = "详情", notes = "传入household")
   public R getDetail(HouseholdEntity household) {
      bladeLogger.info("住户 详情", JsonUtil.toJson(household));
      bladeLogger.info("住户详情查询", JsonUtil.toJson(household));
      return R.data(householdService.getDetail(household));
   }

@@ -109,7 +110,7 @@
   @ApiLog("住户 自定义分页")
   @ApiOperation(value = "分页", notes = "传入household")
   public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
      bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
      bladeLogger.info("住户列表信息查询", JsonUtil.toJson(household));
      IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
      return R.data(pages);
   }
@@ -122,7 +123,7 @@
   @ApiLog("住户 自定义分页")
   @ApiOperation(value = "分页", notes = "传入household")
   public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) {
      bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
      bladeLogger.info("住户列表信息查询", JsonUtil.toJson(household));
      IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household);
      return R.data(pages);
   }
@@ -194,7 +195,7 @@
   @ApiLog("住户 自定义新增或修改")
   @ApiOperation(value = "自定义新增或修改", notes = "传入household")
   public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
      bladeLogger.info("住户 自定义新增或修改", JsonUtil.toJson(household));
      bladeLogger.info("住户信息新增或修改", JsonUtil.toJson(household));
      return R.status(householdService.saveOrUpdateHousehold(household));
   }

@@ -207,7 +208,7 @@
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   @Transactional(rollbackFor = Exception.class)
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      bladeLogger.info("住户 删除", JsonUtil.toJson(ids));
      bladeLogger.info("住户信息删除", JsonUtil.toJson(ids));
      // 返回
      return R.status(householdService.removeHousehold(ids));
   }
@@ -231,6 +232,7 @@
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入住户", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      bladeLogger.info("住户信息导入", JsonUtil.toJson(isCovered));
      String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class),isCovered==1);
      return R.data(200,data,null);
   }
@@ -242,8 +244,8 @@
   @ApiOperationSupport(order = 13)
   @ApiOperation(value = "导出住户", notes = "传入user")
   public void exportUser(HouseholdVO household, HttpServletResponse response) {
      List<ImportHouseholdExcel> list = householdService.export(household);
      ExcelUtil.export(response, "住户户数据" + DateUtil.time(), "住户数据表", list, ImportHouseholdExcel.class);
      List<ExportHouseholdExcel> list = householdService.export(household);
      ExcelUtil.export(response, "住户户数据" + DateUtil.time(), "住户数据表", list, ExportHouseholdExcel.class);
   }

   /**