代码生成

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java

@@ -16,17 +16,15 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
-import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcDangerousChemicalsDTO;
 import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO;
 import com.epmet.dto.form.IcDangerousChemicalsListFormDTO;
 import com.epmet.dto.result.IcDangerousChemicalsListResultDTO;
 import com.epmet.excel.IcDangerousChemicalsExcel;
-import com.epmet.excel.IcDangerousChemicalsExcel;
 import com.epmet.service.IcDangerousChemicalsService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -43,7 +41,6 @@ import java.io.PrintWriter;
 import java.net.URLEncoder;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 
 /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java

@@ -21,8 +21,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.IcSuperiorResourceDTO;
-import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
 import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO;
+import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
 import com.epmet.dto.result.IcSuperiorResourceListResultDTO;
 import com.epmet.excel.IcSuperiorResourceExcel;
 import com.epmet.service.IcSuperiorResourceService;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java

@@ -1,12 +1,9 @@
 package com.epmet.excel;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 城市管理图层
  *

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java

@@ -1,10 +1,9 @@
 package com.epmet.excel;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 重点危化品企业
  *
@@ -14,68 +13,36 @@ import java.util.Date;
 @Data
 public class IcDangerousChemicalsExcel {
 
-    @Excel(name = "ID")
-    private String id;
-
-    @Excel(name = "客户Id")
-    private String customerId;
-
-    @Excel(name = "所属组织机构Id")
-    private String agencyId;
-
-    @Excel(name = "agencyId的所有上级，包含自己")
-    private String agencyIdPath;
-
-    @Excel(name = "来源【新增:add 导入:import 】")
-    private String sourceType;
-
-    @Excel(name = "企业名称")
+    @ExcelProperty(value = "企业名称")
+    @ColumnWidth(25)
     private String name;
 
-    @Excel(name = "企业类型【字典表ic_coverage_category_dict  key:dangerous_chemicals】")
-    private String category;
-
-    @Excel(name = "周边安全距离，单位公里")
-    private String safeDistance;
+    @ExcelProperty(value = "企业类型")
+    @ColumnWidth(20)
+    private String categoryName;
 
-    @Excel(name = "危化品种类【字典表 ic_danger_type】")
-    private Integer dangerType;
+    @ExcelProperty(value = "周边安全距离")
+    @ColumnWidth(20)
+    private String safeDistanceName;
 
-    @Excel(name = "负责人姓名")
-    private String principalName;
-
-    @Excel(name = "负责人电话")
-    private String principalMobile;
+    @ExcelProperty(value = "危化品种类")
+    @ColumnWidth(20)
+    private String dangerTypeName;
 
-    @Excel(name = "经营地址")
+    @ExcelProperty(value = "经营地址")
+    @ColumnWidth(25)
     private String address;
 
-    @Excel(name = "经度")
-    private String longitude;
+    @ExcelProperty(value = "负责人")
+    @ColumnWidth(20)
+    private String principalName;
 
-    @Excel(name = "纬度")
-    private String latitude;
+    @ExcelProperty(value = "联系电话")
+    @ColumnWidth(20)
+    private String principalMobile;
 
-    @Excel(name = "备注")
+    @ExcelProperty(value = "备注")
+    @ColumnWidth(25)
     private String remark;
 
-    @Excel(name = "删除标识")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java

@@ -1,12 +1,9 @@
 package com.epmet.excel;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 公共服务图层
  *

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java

@@ -8,9 +8,6 @@ import com.epmet.dto.form.IcCityManagementListFormDTO;
 import com.epmet.dto.result.IcCityManagementListResultDTO;
 import com.epmet.entity.IcCityManagementEntity;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 城市管理图层
  *

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java

@@ -3,8 +3,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcSuperiorResourceDTO;
-import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
 import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO;
+import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
 import com.epmet.dto.result.IcSuperiorResourceListResultDTO;
 import com.epmet.entity.IcSuperiorResourceEntity;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java

@@ -2,7 +2,6 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.result.CustomerStaffInfoCacheResult;
@@ -17,7 +16,6 @@ import com.epmet.dto.form.IcCityManagementAddEditFormDTO;
 import com.epmet.dto.form.IcCityManagementListFormDTO;
 import com.epmet.dto.result.IcCityManagementListResultDTO;
 import com.epmet.entity.IcCityManagementEntity;
-import com.epmet.entity.IcCityManagementEntity;
 import com.epmet.service.IcCityManagementService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -26,7 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@@ -2,7 +2,6 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.result.CustomerStaffInfoCacheResult;
@@ -17,7 +16,6 @@ import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO;
 import com.epmet.dto.form.IcDangerousChemicalsListFormDTO;
 import com.epmet.dto.result.IcDangerousChemicalsListResultDTO;
 import com.epmet.entity.IcDangerousChemicalsEntity;
-import com.epmet.entity.IcDangerousChemicalsEntity;
 import com.epmet.service.IcDangerousChemicalsService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -26,7 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java

@@ -12,8 +12,8 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcSuperiorResourceDao;
 import com.epmet.dto.IcSuperiorResourceDTO;
-import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
 import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO;
+import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
 import com.epmet.dto.result.IcSuperiorResourceListResultDTO;
 import com.epmet.entity.IcSuperiorResourceEntity;
 import com.epmet.service.IcSuperiorResourceService;