功能类别字典

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.22__jmreport_category.sql

@@ -0,0 +1,5 @@
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1556509011061993473', 'jmreport_category', '报表应用类别', '居民信息、房屋信息', 32, 0, 0, '1', '2022-08-08 13:14:01', '1', '2022-08-08 13:14:01');
+
+
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1556509175185108994', 1556509011061993473, '房屋信息', 'house_info', '0', '', 2, 0, 0, '1', '2022-08-08 13:14:41', '1', '2022-08-08 13:14:41');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1556509102015475714', 1556509011061993473, '居民信息', 'resi_info', '0', '', 1, 0, 0, '1', '2022-08-08 13:14:23', '1', '2022-08-08 13:14:23');

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/PreviewReportFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/8/8 13:31
+ */
+@Data
+public class PreviewReportFormDTO {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "reportId不能为空", groups = AddUserInternalGroup.class)
+    private String reportId;
+    @NotBlank(message = "categoryKey不能为空", groups = AddUserInternalGroup.class)
+    private String categoryKey;
+    private Map<String, Object> paramMap;
+
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+    @NotBlank(message = "staffId不能为空", groups = AddUserInternalGroup.class)
+    private String staffId;
+}
+

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/PreviewReportResDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/8/8 13:37
+ */
+@Data
+public class PreviewReportResDTO {
+    private String reportId;
+    /**
+     * rediskey格式：customerId:reportId:resiinfo:staffId
+     */
+    private String paramKey;
+}
+

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java

@@ -1,7 +1,9 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -9,6 +11,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcCustomerReportDTO;
+import com.epmet.dto.form.PreviewReportFormDTO;
+import com.epmet.dto.result.PreviewReportResDTO;
 import com.epmet.service.IcCustomerReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -67,4 +71,18 @@ public class IcCustomerReportController {
         return new Result();
     }
 
+
+    /**
+     * 在居民信息或者房屋信息等页面点击填表，存储入参到redis,返给前端key
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("preview")
+    public Result<PreviewReportResDTO> previewReport(@LoginUser TokenDto tokenDto, @RequestBody PreviewReportFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, PreviewReportFormDTO.AddUserInternalGroup.class);
+        return new Result<PreviewReportResDTO>().ok(icCustomerReportService.previewReport(formDTO));
+    }
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java

@@ -3,6 +3,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcCustomerReportDTO;
+import com.epmet.dto.form.PreviewReportFormDTO;
+import com.epmet.dto.result.PreviewReportResDTO;
 import com.epmet.entity.IcCustomerReportEntity;
 
 import java.util.List;
@@ -75,4 +77,11 @@ public interface IcCustomerReportService extends BaseService<IcCustomerReportEnt
      * @date 2022-08-08
      */
     void delete(String[] ids);
+
+    /**
+     * 在居民信息或者房屋信息等页面点击填表，存储入参到redis,返给前端key
+     * @param formDTO
+     * @return
+     */
+    PreviewReportResDTO previewReport(PreviewReportFormDTO formDTO);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java

@@ -4,13 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcCustomerReportDao;
 import com.epmet.dto.IcCustomerReportDTO;
+import com.epmet.dto.form.PreviewReportFormDTO;
+import com.epmet.dto.result.PreviewReportResDTO;
 import com.epmet.entity.IcCustomerReportEntity;
 import com.epmet.service.IcCustomerReportService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,7 +31,8 @@ import java.util.Map;
  */
 @Service
 public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerReportDao, IcCustomerReportEntity> implements IcCustomerReportService {
-
+    @Autowired
+    private RedisUtils redisUtils;
     @Override
     public PageData<IcCustomerReportDTO> page(Map<String, Object> params) {
         IPage<IcCustomerReportEntity> page = baseDao.selectPage(
@@ -79,4 +85,20 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 在居民信息或者房屋信息等页面点击填表，存储入参到redis,返给前端key
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PreviewReportResDTO previewReport(PreviewReportFormDTO formDTO) {
+        // rediskey格式：customerId:reportId:resiinfo:staffId
+        PreviewReportResDTO reportResDTO = new PreviewReportResDTO();
+        reportResDTO.setReportId(formDTO.getReportId());
+        String key = formDTO.getCustomerId().concat(StrConstant.COLON).concat(formDTO.getReportId()).concat(StrConstant.COLON).concat(formDTO.getCategoryKey()).concat(StrConstant.COLON).concat(formDTO.getStaffId());
+        redisUtils.hMSet(key, formDTO.getParamMap(), RedisUtils.DEFAULT_EXPIRE);
+        return reportResDTO;
+    }
+
 }