From c518d4b5d816a515b6c811c75b2ed639b4d1f595 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Aug 2022 10:43:48 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddSocietyOrgFormDTO.java | 9 +++++++-- .../com/epmet/dto/form/EditSocietyOrgFormDTO.java | 9 ++++++++- .../dto/result/GetListSocietyOrgResultDTO.java | 4 ++++ .../epmet/dto/result/SocietyOrgListResultDTO.java | 4 ++++ .../java/com/epmet/entity/IcSocietyOrgEntity.java | 4 ++++ .../epmet/service/impl/IcSocietyOrgServiceImpl.java | 13 +++++++++++-- .../src/main/resources/mapper/IcSocietyOrgDao.xml | 3 ++- 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 1217c647c5..3473fde8c0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -23,6 +23,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -48,6 +49,11 @@ public class AddSocietyOrgFormDTO implements Serializable { * agency_id的所有上级 */ private String pids; + /** + * 社会组织头像 + */ + @NotEmpty(message = "组织头像不能为空", groups = { AddSocietyOrgFormDTO.Add.class}) + private String[] imageList; /** * 社会组织名称 */ @@ -87,7 +93,6 @@ public class AddSocietyOrgFormDTO implements Serializable { /** * 绑定管理员[组织下录入的工作人员] */ - @NotBlank(message = "绑定管理员名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) private String adminStaffId; /** * 地址 @@ -106,4 +111,4 @@ public class AddSocietyOrgFormDTO implements Serializable { public interface Add extends CustomerClientShowGroup {} -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 2acad633c0..044d8ae3f0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -22,6 +22,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.Date; @@ -40,6 +41,12 @@ public class EditSocietyOrgFormDTO implements Serializable { */ @NotBlank(message = "社会组织Id不能为空", groups = { Edit.class, Del.class }) private String societyId; + + /** + * 社会组织头像 + */ + @NotEmpty(message = "组织头像不能为空", groups = { Edit.class}) + private String[] imageList; /** * 社会组织名称 */ @@ -92,4 +99,4 @@ public class EditSocietyOrgFormDTO implements Serializable { public interface Edit {} public interface Del {} -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java index 0130b246a7..0edc99c42f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java @@ -44,6 +44,10 @@ public class GetListSocietyOrgResultDTO implements Serializable { private String agencyId; //社会组织Id private String societyId; + /** + * 社会组织头像 + */ + private String imgUrl; //社会组织名称 private String societyName; //服务事项 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java index 38a081d2bc..b5ed492b5d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java @@ -35,6 +35,10 @@ public class SocietyOrgListResultDTO implements Serializable { private String agencyName; //社会组织Id private String societyId; + /** + * 图像 + */ + private String imgUrl; //社会组织名称 private String societyName; //服务事项 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index 7c6dcc0316..cc694cd625 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -87,6 +87,10 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { */ private String adminStaffId; + /** + * 地址 + */ + private String imgUrl; /** * 地址 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 6542740821..08725a6a1c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -80,6 +80,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl%s", formDTO.getSocietyId())); } + //图片必填 + if(formDTO.getImageList() != null&& StringUtils.isNotBlank(formDTO.getImageList()[0])){ + entity.setImgUrl(formDTO.getImageList()[0]); + } entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); entity.setId(formDTO.getSocietyId()); baseDao.updateById(entity); @@ -115,7 +123,8 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl - \ No newline at end of file + From 98144e3d0e3143f911ba796e24f9ed3c933fe46f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Aug 2022 17:21:37 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AC=AC=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/AddSocietyOrgFormDTO.java | 8 +++++--- .../java/com/epmet/dto/form/EditSocietyOrgFormDTO.java | 6 ++++++ .../com/epmet/dto/result/GetListSocietyOrgResultDTO.java | 4 ++++ .../com/epmet/dto/result/SocietyOrgListResultDTO.java | 4 ++++ .../main/java/com/epmet/entity/IcSocietyOrgEntity.java | 5 +++++ .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 4 +++- .../src/main/resources/mapper/IcSocietyOrgDao.xml | 1 + 7 files changed, 28 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 3473fde8c0..391652762d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -24,7 +24,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -78,16 +77,19 @@ public class AddSocietyOrgFormDTO implements Serializable { @NotBlank(message = "负责人电话不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Add.class}) private String mobile; + /** + * 服务时间 + */ + @NotBlank(message = "服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) + private String serviceTimeStr; /** * 起始服务时间 */ - @NotNull(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date serviceStartTime; /** * 终止服务时间 */ - @NotNull(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date serviceEndTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 044d8ae3f0..4dfe1df9b2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -67,6 +67,12 @@ public class EditSocietyOrgFormDTO implements Serializable { */ @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Edit.class}) private String mobile; + + /** + * 服务时间 + */ + @NotBlank(message = "服务时间不能为空",groups = {Edit.class}) + private String serviceTimeStr; /** * 起始服务时间 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java index 0edc99c42f..08404eff6d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java @@ -56,6 +56,10 @@ public class GetListSocietyOrgResultDTO implements Serializable { private String personInCharge; //负责人电话 private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; //起始服务时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java index b5ed492b5d..2d77374893 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java @@ -47,6 +47,10 @@ public class SocietyOrgListResultDTO implements Serializable { private String personInCharge; //负责人电话 private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; //起始服务时间 //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") //private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index cc694cd625..20cd08c3b1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -73,6 +73,11 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { private String mobile; /** + * 服务时间 + */ + private String serviceTimeStr; + + /** * 起始服务时间 */ private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 08725a6a1c..800d2e447c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -131,7 +131,9 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO)); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml index 9ac12b6b1a..4939225de6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml @@ -12,6 +12,7 @@ service_matters serviceMatters, person_in_charge personInCharge, mobile mobile, + service_time_str, service_start_time serviceStartTime, service_end_time serviceEndTime, admin_staff_id adminStaffId, From 7694d3e9afd85bd5ce08acc58bab062139ce0c69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Aug 2022 09:42:56 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcSocietyOrgDTO.java | 39 +++++-------------- .../controller/IcSocietyOrgController.java | 11 ++++++ .../com/epmet/entity/IcSocietyOrgEntity.java | 2 +- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java index f0304874e5..8b1d9f8a57 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java @@ -39,6 +39,11 @@ public class IcSocietyOrgDTO implements Serializable { */ private String id; + /** + * 图片地址 + */ + private String imgUrl; + /** * 客户Id */ @@ -74,6 +79,11 @@ public class IcSocietyOrgDTO implements Serializable { */ private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; + /** * 起始服务时间 */ @@ -109,34 +119,5 @@ public class IcSocietyOrgDTO implements Serializable { */ private String remarks; - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 2b07959e33..831fc62b3c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.IcSocietyOrgDTO; import com.epmet.dto.form.AddSocietyOrgFormDTO; import com.epmet.dto.form.EditSocietyOrgFormDTO; import com.epmet.dto.form.GetListSocietyOrgFormDTO; @@ -87,6 +88,16 @@ public class IcSocietyOrgController { return new Result(); } + /** + * @Author sun + * @Description 删除社会组织 + **/ + @RequestMapping("detail/{id}") + public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { + IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); + return new Result().ok(icSocietyOrgDTO); + } + /** * @Author sun * @Description 删除社会组织 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index 20cd08c3b1..f97113dd58 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -93,7 +93,7 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { private String adminStaffId; /** - * 地址 + * 图片地址 */ private String imgUrl; /** From 06fc4b5c76ef5898a1f0b3217bd6e22dc5746c3d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 10:03:19 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E3=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcSocietyOrgController.java | 82 ++++++++++++++++-- .../com/epmet/excel/IcSocietyOrgExcel.java | 27 ++---- .../epmet/excel/IcSocietyOrgExportExcel.java | 42 +++++++++ .../service/impl/IcSocietyOrgServiceImpl.java | 72 ++++++++------- .../templates/societyorg_import_template.xlsx | Bin 0 -> 8953 bytes 5 files changed, 164 insertions(+), 59 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 2b07959e33..ca877fda19 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -18,13 +18,17 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ExcelPoiUtils; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.AddSocietyOrgFormDTO; import com.epmet.dto.form.EditSocietyOrgFormDTO; @@ -33,18 +37,26 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.GetListSocietyOrgResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcSocietyOrgExcel; +import com.epmet.excel.IcSocietyOrgExportExcel; import com.epmet.service.IcSocietyOrgService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.URLEncoder; import java.text.ParseException; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -129,11 +141,46 @@ public class IcSocietyOrgController { **/ @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO, HttpServletResponse response) throws Exception { + //废弃原来的导出 + // formDTO.setCustomerId(tokenDto.getCustomerId()); + // formDTO.setStaffId(tokenDto.getUserId()); + // formDTO.setIsPage(false); + // GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO); + // ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExportExcel.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setIsPage(false); - GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO); - ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExcel.class); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "社会组织" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcSocietyOrgExportExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + GetListSocietyOrgResultDTO data = null; + List list = null; + do { + data = societyOrgService.getList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcSocietyOrgExportExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("社会组织export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } } /** @@ -168,4 +215,29 @@ public class IcSocietyOrgController { return new Result().ok(str); } + + /** + * 下载社会组织导入模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "import-template-download", method = {RequestMethod.GET, RequestMethod.POST}) + public void downloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("社区组织导入模板", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/societyorg_import_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java index c4392b5e5a..e48c6cb6d6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java @@ -34,37 +34,28 @@ import java.io.Serializable; @Data public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable { - @Excel(name = "组织名称") + @Excel(name = "所属组织") @NotBlank(message = "不能为空") private String agencyName; - @Excel(name = "社会组织名称") + @Excel(name = "组织名称") @NotBlank(message = "不能为空") @Length(max=50,message = "不能超过50个字") private String societyName; - @Excel(name = "服务事项") + @Excel(name = "服务内容") @NotBlank(message = "不能为空") @Length(max=1000,message = "不能超过1000个字") private String serviceMatters; - @Excel(name = "负责人") - @NotBlank(message = "不能为空") - @Length(max=20,message = "不能超过20个字") - private String personInCharge; - - @Excel(name = "负责人电话") + @Excel(name = "服务电话") @NotBlank(message = "不能为空") @Length(max=11,message = "不能超过11个字") private String mobile; - @Excel(name = "起始服务时间") + @Excel(name = "服务时间") @NotBlank(message = "不能为空") - private String serviceStartTime; - - @Excel(name = "终止服务时间") - @NotBlank(message = "不能为空") - private String serviceEndTime; + private String serviceTimeStr; @Excel(name = "管理员姓名") private String adminStaffName; @@ -72,10 +63,4 @@ public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable { @Excel(name = "地址") private String address; - @Excel(name = "经度") - private String longitude; - - @Excel(name = "维度") - private String latitude; - } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java new file mode 100644 index 0000000000..bf914d42d6 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java @@ -0,0 +1,42 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/8/24 8:41 + */ +@Data +public class IcSocietyOrgExportExcel { + @ExcelProperty(value = "所属组织") + @ColumnWidth(30) + private String agencyName; + + @ExcelProperty(value = "组织名称") + @ColumnWidth(30) + private String societyName; + + @ColumnWidth(50) + @ExcelProperty(value = "服务内容") + private String serviceMatters; + + @ColumnWidth(20) + @ExcelProperty(value = "服务电话") + private String mobile; + + @ColumnWidth(20) + @ExcelProperty(value = "服务时间") + private String serviceTimeStr; + + @ColumnWidth(20) + @ExcelProperty(value = "管理员姓名") + private String adminStaffName; + + @ColumnWidth(30) + @ExcelProperty(value = "地址") + private String address; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 800d2e447c..16e1cee8f4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -43,6 +43,7 @@ import com.epmet.service.IcSocietyOrgService; import com.epmet.service.IcUserDemandRecService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -232,53 +232,59 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl map=new HashMap<>(); //2.查询绑定的管理员信息 - Set staffNames = list.stream().map(item -> item.getAdminStaffName().trim()).collect(Collectors.toSet()); - GetByRealNamesFormDTO dto = new GetByRealNamesFormDTO(); - dto.setCustomerId(customerId); - dto.setRealNames(staffNames); - Result> staffResult = epmetUserOpenFeignClient.getByRealNames(dto); - if (!staffResult.success()) { - throw new RenException("获取工作人员基础信息失败......"); - } - if (null == staffResult.getData()) { - Iterator iter = list.iterator(); - while (iter.hasNext()) { - IcSocietyOrgExcel obj = iter.next(); - numList.add(obj.getRowNum()); - iterator.remove(); + Set staffNames = list.stream().filter(t -> StringUtils.isNotBlank(t.getAdminStaffName())).map(item -> item.getAdminStaffName().trim()).collect(Collectors.toSet()); + if(!CollectionUtils.isEmpty(staffNames)){ + GetByRealNamesFormDTO dto = new GetByRealNamesFormDTO(); + dto.setCustomerId(customerId); + dto.setRealNames(staffNames); + Result> staffResult = epmetUserOpenFeignClient.getByRealNames(dto); + if (!staffResult.success()) { + throw new RenException("获取工作人员基础信息失败......"); } - return numList; + if (null == staffResult.getData()) { + Iterator iter = list.iterator(); + while (iter.hasNext()) { + IcSocietyOrgExcel obj = iter.next(); + numList.add(obj.getRowNum()); + iterator.remove(); + } + return numList; + } + map= staffResult.getData().stream().collect(Collectors.toMap(CustomerStaffDTO::getRealName, CustomerStaffDTO::getUserId)); } - Map map = staffResult.getData().stream().collect(Collectors.toMap(CustomerStaffDTO::getRealName, CustomerStaffDTO::getUserId)); //3.遍历封装有效数据 List houseEntityList = new ArrayList<>(); Iterator iterator1 = list.iterator(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); while (iterator1.hasNext()) { - IcSocietyOrgExcel icHouseExcel = iterator1.next(); + IcSocietyOrgExcel icSocietyOrgExcel = iterator1.next(); IcSocietyOrgEntity entity = new IcSocietyOrgEntity(); entity.setCustomerId(customerId); entity.setAgencyId(staffInfoCache.getAgencyId()); entity.setPids(staffInfoCache.getAgencyPIds()); - entity.setSocietyName(icHouseExcel.getSocietyName()); - entity.setServiceMatters(icHouseExcel.getServiceMatters()); - entity.setPersonInCharge(icHouseExcel.getPersonInCharge()); - entity.setMobile(icHouseExcel.getMobile()); - entity.setServiceStartTime(sdf.parse(icHouseExcel.getServiceStartTime())); - entity.setServiceEndTime(sdf.parse(icHouseExcel.getServiceEndTime())); - entity.setAdminStaffId(map.containsKey(icHouseExcel.getAdminStaffName().trim()) ? map.get(icHouseExcel.getAdminStaffName().trim()) : ""); - if ("".equals(entity.getAdminStaffId())) { - numList.add(icHouseExcel.getRowNum()); - log.warn(String.format("绑定的管理员不存在,管理员名称->%s,行号->%s", icHouseExcel.getAdminStaffName(), icHouseExcel.getRowNum())); + entity.setSocietyName(icSocietyOrgExcel.getSocietyName()); + entity.setServiceMatters(icSocietyOrgExcel.getServiceMatters()); + //负责人去掉 + // entity.setPersonInCharge(icSocietyOrgExcel.getPersonInCharge()); + entity.setMobile(icSocietyOrgExcel.getMobile()); + //服务时间手动输入 + entity.setServiceTimeStr(icSocietyOrgExcel.getServiceTimeStr()); + // entity.setServiceStartTime(sdf.parse(icHouseExcel.getServiceStartTime())); + // entity.setServiceEndTime(sdf.parse(icHouseExcel.getServiceEndTime())); + entity.setAdminStaffId(MapUtils.isNotEmpty(map)&&map.containsKey(icSocietyOrgExcel.getAdminStaffName().trim()) ? map.get(icSocietyOrgExcel.getAdminStaffName().trim()) : ""); + if (StringUtils.isBlank(entity.getAdminStaffId())) { + numList.add(icSocietyOrgExcel.getRowNum()); + log.warn(String.format("绑定的管理员不存在,管理员名称->%s,行号->%s", icSocietyOrgExcel.getAdminStaffName(), icSocietyOrgExcel.getRowNum())); iterator1.remove(); continue; } - entity.setAddress(icHouseExcel.getAddress()); - entity.setLongitude(icHouseExcel.getLongitude()); - entity.setLatitude(icHouseExcel.getLatitude()); + entity.setAddress(icSocietyOrgExcel.getAddress()); + //经纬度不能导入 + // entity.setLongitude(icHouseExcel.getLongitude()); + // entity.setLatitude(icHouseExcel.getLatitude()); houseEntityList.add(entity); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..5d02dae502b5326319fb9578a340a4d624c0fea2 GIT binary patch literal 8953 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 literal 0 HcmV?d00001 From 2d36e077aae02f484d5c29dd34b8e6917c96c69c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 11:06:06 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 5 + .../controller/IcSocietyOrgController.java | 76 ++++++++++- .../excel/IcSocietyOrgImportExcelDTO.java | 75 +++++++++++ .../epmet/service/IcSocietyOrgService.java | 10 ++ .../service/impl/IcSocietyOrgServiceImpl.java | 120 +++++++++++++++++- .../templates/societyorg_import_template.xlsx | Bin 8953 -> 8928 bytes 6 files changed, 276 insertions(+), 10 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 2108042cd6..705b037699 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -62,4 +62,9 @@ public interface ImportTaskConstants { * 城市管理 */ String IC_CITY_MANAGEMENT = "ic_city_management"; + + /** + * 社会组织 + */ + String IC_SOCIETY_ORG="ic_society_org"; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index b08541a972..8c30990fc9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -23,22 +23,30 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcSocietyOrgDTO; import com.epmet.dto.form.AddSocietyOrgFormDTO; import com.epmet.dto.form.EditSocietyOrgFormDTO; import com.epmet.dto.form.GetListSocietyOrgFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.GetListSocietyOrgResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcSocietyOrgExcel; import com.epmet.excel.IcSocietyOrgExportExcel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcSocietyOrgService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; @@ -50,15 +58,14 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @@ -71,11 +78,12 @@ import java.util.stream.Collectors; @Slf4j @RestController @RequestMapping("societyorg") -public class IcSocietyOrgController { +public class IcSocietyOrgController implements ResultDataResolver { @Autowired private IcSocietyOrgService societyOrgService; - + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; /** * @Author sun * @Description 新增社会组织 @@ -195,6 +203,7 @@ public class IcSocietyOrgController { } /** + * 废弃此方法用下面的importV2 * @Author sun * @Description 九小场所下组织列表导入 **/ @@ -250,5 +259,60 @@ public class IcSocietyOrgController { } } + /** + * + * @param tokenDto + * @param file + * @return + */ + @PostMapping("importV2") + public Result importExcelV2(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { + String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); + + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_society_org", "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【社会组织】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社会组织导入文件上传失败", "社会组织导入文件上传失败"); + } + + InputStream is = null; + FileOutputStream os = null; + + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error("【社会组织】导入method exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOperatorId(userId); + importTaskForm.setBizType(ImportTaskConstants.IC_SOCIETY_ORG); + importTaskForm.setOriginFileName(originalFilename); + + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入社会组织错误", + "社会组织导入失败"); + + // 3.执行导入 + societyOrgService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); + return new Result(); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java new file mode 100644 index 0000000000..284f6d024d --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgImportExcelDTO.java @@ -0,0 +1,75 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; + +/** + * @Description + * @Author yzm + * @Date 2022/8/24 10:46 + */ +@Data +public class IcSocietyOrgImportExcelDTO { + + @ExcelProperty(value = "组织名称") + @NotBlank(message = "不能为空") + @Length(max=50,message = "不能超过50个字") + private String societyName; + + @ExcelProperty(value = "服务内容") + @NotBlank(message = "不能为空") + @Length(max=1000,message = "不能超过1000个字") + private String serviceMatters; + + @ExcelProperty(value = "服务电话") + @NotBlank(message = "不能为空") + @Length(max=11,message = "不能超过11个字") + private String mobile; + + @ExcelProperty(value = "服务时间") + @NotBlank(message = "不能为空") + private String serviceTimeStr; + + @ExcelProperty(value = "管理员姓名") + private String adminStaffName; + + @ExcelProperty(value = "地址") + private String address; + + @Data + public static class ErrorRow { + + @ColumnWidth(40) + @ExcelProperty(value = "组织名称") + private String societyName; + + @ColumnWidth(50) + @ExcelProperty(value = "服务内容") + private String serviceMatters; + + @ColumnWidth(20) + @ExcelProperty(value = "服务电话") + private String mobile; + + @ColumnWidth(25) + @ExcelProperty(value = "服务时间") + private String serviceTimeStr; + + @ColumnWidth(20) + @ExcelProperty(value = "管理员姓名") + private String adminStaffName; + + @ColumnWidth(50) + @ExcelProperty(value = "地址") + private String address; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java index 747ff6f14b..8685acaeef 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java @@ -28,6 +28,7 @@ import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcSocietyOrgEntity; import com.epmet.excel.IcSocietyOrgExcel; +import java.nio.file.Path; import java.text.ParseException; import java.util.List; @@ -79,4 +80,13 @@ public interface IcSocietyOrgService extends BaseService { List queryListById(List socialOrgIds); IcSocietyOrgDTO get(String id); + + /** + * 导入社会组织，之前的废弃了 + * @param fileSavePath + * @param taskId + * @param customerId + * @param userId + */ + void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 16e1cee8f4..332db0bae7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -17,41 +17,56 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserDemandConstant; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcSocietyOrgDao; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.IcSocietyOrgDTO; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.ServiceQueryFormDTO; -import com.epmet.dto.result.GetListSocietyOrgResultDTO; -import com.epmet.dto.result.OrgInfoResultDTO; -import com.epmet.dto.result.SocietyOrgListResultDTO; -import com.epmet.dto.result.StaffSinGridResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcSocietyOrgEntity; import com.epmet.excel.IcSocietyOrgExcel; +import com.epmet.excel.IcSocietyOrgImportExcelDTO; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.IcSocietyOrgService; import com.epmet.service.IcUserDemandRecService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.multipart.commons.CommonsMultipartFile; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @@ -71,6 +86,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl errorRows = null;// todo listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + if (failed) { + // 生成并上传错误文件 + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_enterprise", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + errorDescFile = errorDescDir.resolve(fileName); + + FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); + OutputStream os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcSocietyOrgImportExcelDTO.ErrorRow.class).sheet("导入失败列表").doWrite(errorRows); + + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + } finally { + if (Files.exists(errorDescFile)) { + Files.delete(errorDescFile); + } + } + } + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc(""); + importFinishTaskForm.setResultDescFilePath(errorDesFileUrl); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【社会组织】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【社会组织】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc("导入失败"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【社会组织】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + log.error("method exception", e); + } + } + } + } + + private CustomerStaffInfoCacheResult queryCurrentStaff(String customerId, String userId) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询工作人员缓存信息异常", EpmetErrorCode.SERVER_ERROR.getMsg()); + } + return staffInfo; + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx index 5d02dae502b5326319fb9578a340a4d624c0fea2..a5562c9247c0f6f5d763faa99fbefc3f2ccd1f07 100644 GIT binary patch delta 1446 zcmV;X1zGy}Mc_rSlK}+`u`aqvlb8W4e-x;!B$WVlMI|JPKXP`nhmTBqoCIrpc?GnOgAic&#} z8Zc;<9UmpUqP)~_t;-6u&B1t%qzvU%iZ<3(6l23TAejlALpgC(YRRlC^%_@!6Oi7%qQ^?-y4$-Ku`B+FNlzSt2;)8kjA0*1X6BkLvbz1v7Tx z&b-P&oHyCm$Lr_YdxC!}4%FrDI%yz0mxT7Y_sU&-ak-qMEFw|llc^s~mL#Ongc9=5 z4nF8_ll2dBH~yc*h{iEJIU5o8fUL`X_#3jb`U1282~Vz3y@CP&02hFZ{(T1mV>9gMu5TDk$+LRl497fAxPUFqHhT;QIMo-J#+NgFDJx+E*8D=MdO`dg{7nb!C_+TQ3F)iWULb-PwOwRqVOtbh~jC zc+$aklSs^BQ+lEyjp<{wK13AH9paaS+6?x@^5b{NL0CwzRVZm%;HcDd1N@9fVWZmt z8jW07d4V0|c}x!x_LceLj5K>R5%e~O`_A6Mwat?z38eg-+nvgP%fx0eU9#m+RnQ#PeUoo#64a@Yu(Z#HXq31CjGvptOZqjEh9oLQ?vc*7f z_HV>KZ|S(U^y!Mt27(u3df*G-s^9eEcB55Ia8|Jr_=@1yb9{dXxPzvoliruU$cV3a z^YTRNId-0ClstMZSPtYEJiTngO>n^$6D{Jy7!h3~c4Nfk8nGWE?ynIa$B5}Q0tc;$ zcj)P?M+BIYZY+F~Dt>~mT%TlVNDe7Rho!>8Y2Wew$EwOD?5HeGyU!iIxPXZX8G=)# zZ1;nskh!~qJ8TCgvVYRIe*uslvxo<^5DC57<*n`j002dkMi?u9iz1Sw3&9iU0m4k| z1ZG~wc^T223#}j&DhhScF1qTjc3}nSdD7@Dnj#{UF8}}I=fUHho3bF+x<+F`(8E?j ziH6i>2D*Y?oSz*WQ-V%GrV0yM&|8hPBlq_>q9bt&C}{3nb;1~?xh@s9Y^5Q}rL9Zl zVywFit6HlJbFE!pS+JudX|qxppd_^oI6>Q#G+?e8efpOrMZ5O za<=JzZ8hrqr-|=9_}SNP3$Kgs_wjC94L^T|AKMmYlQ8J{=QlrniC4GTkLG@S_usPk z2Dt{aSQ)Mb0xKPpU>y~c9Um$LlNta3li?s1lVKkk0k@NUACm*cz1roi?f?J)MF9W+6aWAK z000000RSKX001A8S|LFJjgy=qIssaf*C93mfs+m*Kmk9KPa-@4c9V=EAskPxQN4l! z000*T000;O0000000031AOHXWq6Cw?1R54lO9ci10000H01*HO1ONcT9smFU0GSPu AtN;K2 delta 1447 zcmV;Y1z7svMfpXrlK}#F}m6d`F zHDJ*!KR!yiro1w6Z7L1M6<`BTQkHU^p^bBzVr=;aB(srsC@-!mBboE1S!2!ke05*!oEG28+}JrL0jDfocYPp0euf@3H_f^rteQH+1Q4ve&aHgw9!DGS$Vztb-6 zm@RlO4(_cj24h{SYZ^Z%Sso<0wV6HNG^CD9`s@vO@%({g? z^Qr)G-sE2&ub*%4DgLc^P?x)>IDrU!658k9D|eHN%jF#92}zQWoQ27BNn)BzDIpK- z;Di1)S^pq+wy|6uvOT+%c*g;ZU#Y?C&r+V$BnhhWuUW;>z%_dD3Yh?t`8Jj7tW?>kpJ z>-*VK{afU5Onb2)K!!i2poHWnqBJ6z(pF4khH#U!&q>!iw>zA zZj89SM7$p(rk9BQ7;$%rz?0lmWSGmWM}%0l?%eq@R_q90m_CZq5D6LPkIlr%(EdpI z7pp2)(u1;io%rhFl@|_Jx+p+!rj+eo@Qml~+um(9N522h*prbO9J6!>xey6=MctP7 z0001ClQtMDe+v~!(uLp&^Z;Qdb_OQNI4>i*>q09Eg^EI5v_e{Pt^Gw{Fn)(|ObCQQtjGT<_M+mYdB#e}27< zH(Nbid=EdG=4TT>=()!iH+>3Mo9sq&H}3woB)o|K0JA?Ct_1-^lkOfs0j!fRA2R{a zlVcx~1>b+B6-Sf%A5;PRlTaW)0aKHaATR;=lfoc20Uwk3AT1krMctP70001C0RR9L z000000000103ZMW056k4AwdnD4FCXmY%g Date: Wed, 24 Aug 2022 11:21:14 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=94=BE=E5=BC=80del?= =?UTF-8?q?=5Fflag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 976ab930d6..9373743976 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1205,7 +1205,7 @@ + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 3f9abd5e70..ecfcade3fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -617,25 +617,23 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffInfoList = new ArrayList<>(); userIds.forEach(staffId -> { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), staffId); - if (staffInfo == null) { - log.error("getStaffInfoList fail customerId:{}, staffId:{} not exist in db", formDTO.getCustomerId(), staffId); - return; + if (null != staffInfo) { + StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO(); + resultDTO.setStaffId(staffId); + resultDTO.setStaffName(staffInfo.getRealName()); + resultDTO.setHeadPhoto(staffInfo.getHeadPhoto()); + resultDTO.setGender(staffInfo.getGender()); + + List roleInfoList = new ArrayList<>(); + staffInfo.getRoleMap().forEach((key, value) -> { + RoleResultDTO dto = new RoleResultDTO(); + dto.setRoleKey(key); + dto.setRoleName(value); + roleInfoList.add(dto); + }); + resultDTO.setRoleList(roleInfoList); + staffInfoList.add(resultDTO); } - StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO(); - resultDTO.setStaffId(staffId); - resultDTO.setStaffName(staffInfo.getRealName()); - resultDTO.setHeadPhoto(staffInfo.getHeadPhoto()); - resultDTO.setGender(staffInfo.getGender()); - - List roleInfoList = new ArrayList<>(); - staffInfo.getRoleMap().forEach((key, value) -> { - RoleResultDTO dto = new RoleResultDTO(); - dto.setRoleKey(key); - dto.setRoleName(value); - roleInfoList.add(dto); - }); - resultDTO.setRoleList(roleInfoList); - staffInfoList.add(resultDTO); }); /*List staffInfoList = customerStaffDao.getStaffInfoList(userIds); From 521345a403e6bf5fce22469083d7d55f8b051d4e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Aug 2022 15:04:48 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java | 2 +- .../java/com/epmet/dto/form/EditSocietyOrgFormDTO.java | 2 +- .../main/java/com/epmet/excel/IcSocietyOrgExportExcel.java | 4 ++-- .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 391652762d..a78b42a471 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -68,7 +68,7 @@ public class AddSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) + //@NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Add.class}) private String personInCharge; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 4dfe1df9b2..1e65306066 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -60,7 +60,7 @@ public class EditSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) + //@Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) private String personInCharge; /** * 负责人电话 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java index bf914d42d6..5f0c8bdb79 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java @@ -35,8 +35,8 @@ public class IcSocietyOrgExportExcel { @ExcelProperty(value = "管理员姓名") private String adminStaffName; - @ColumnWidth(30) + /*@ColumnWidth(30) @ExcelProperty(value = "地址") - private String address; + private String address;*/ } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index be5ccf565b..ebbc75615b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -174,13 +174,6 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImplStringUtils.isNotBlank(f.getAdminStaffId())).forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); - /* result.getList().forEach(dto1->{ - listResult.getData().forEach(staff->{ - if(dto1.getAdminStaffId().equals(staff.getStaffId())){ - dto1.setAdminStaffName(staff.getStaffName()); - } - }); - });*/ } //3.查询被绑定管理员信息 From 3c12af0ee8c9078b25435aec40de41858097322e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 25 Aug 2022 16:26:46 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/grid/controller/ResiMineGridController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index e39bd2182c..c9a2f9996e 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.modules.grid.service.ResiMineGridService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -63,7 +64,12 @@ public class ResiMineGridController { //formDTO.setAppId(appId); formDTO.setCustomerId(token.getCustomerId()); formDTO.setUserId(token.getUserId()); - return new Result().ok(resiMineGridService.latestGridInfo(formDTO)); + LatestGridInfoResultDTO data = resiMineGridService.latestGridInfo(formDTO); + //todo 兼容 一个老的 等删除这个if就行 + if ((data == null || StringUtils.isBlank(data.getGridId())&&"c2527f3d5cb8958583cc1348c328a784".equals(token.getCustomerId()))){ + return new Result().ok(null); + } + return new Result().ok(data); } /** From 71ddd6839452a031cbe61e51b606cf445a63d67f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 14:25:18 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/societyorg_import_template.xlsx | Bin 8928 -> 8977 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/societyorg_import_template.xlsx index a5562c9247c0f6f5d763faa99fbefc3f2ccd1f07..9ca4a73e2ff45ff4064c93823d38f0441b04667f 100644 GIT binary patch delta 4982 zcmZ9QWmME%yT)f2U>J0iZfQw@p+h8<8tDcRkS>vMX#Ubj!_eK`k|JHwDbkI!fOH6l z=Y2n%^PGFFeXq6mUi;o_{nqv6x|Ux>%T%JlFs|XHmX}}PUTPG2nbA%T>p?v4!DWgdgT+8|p`Re4 zPK`&_;iU>FhV^ZqT?BQ%W`l&!M-4|kc9^hrd$yT_cRY6*kJ<7t3%p0u2%;P#U?w8_ zeA79k%IrDbq|72+Gti(aqq2$o(w$sQ`V}h`&(Q}U(;5nj2lX%&A|ELU3J|O>(8T za{dT4wXkXz%E`s}o8mJa$Gpk!6MeegnBxAYC6u49%lHfkCN&d12>#OT?}|y}^?Ra1 z#S@}}gkTbZKp-4YkkYEex^{%z(|f)TF+dq`$vFCf`!q z^-iH^sfkjX6ZjTz71d&#MY`@5!i2m1NH@}`4+erpJh=3mL-45@1^i-!Pe?E^IFoj; z8%I`---i<5gxQ(>j8OPPmEPb}vUwM(Z;CR=(i{_a7OMfXG1(8ZH@)Py!{!$|hs?^9ch*jKC(H4B=H`OO2o(IM_&N)W z6_;dEGnVm0kknIbawEJO8byJ&$CP~ZuEk%->mFVW76?QJLRZpL0O1!0qA;tUs=2yY z{6Dg6v)a*W#mN*mfJU!eJ+9@7Ty5~UP`WJt2K)%u=9C1k8=u<#wptw?engLp$)DI- z?pgw^Em&1_56FHpC9=*d?{J_j)6Ce^U-9d;JO`4HM^{#?c9%_iY$tm-*#P#pK$l-L zvfvCmK>ykAHY~xB@_9Ns1eb`x&j5oG>8TUl*A%hO=n+k5K%jb2UAhmo#&npOy`R54 z{p$IZgk%!>ao?4?)Q2THZ>O!3^%sbfLkK1Uf~6OLIfVgbrQtYy@V;AX4qQra7MNiS zmC`YG9$OL%gyV(d=O0MdcvvJuiHTIk(TL})w}%}X!n%P2W&+CZEp8j>A?rc$hXS13lPdre=iaiOpZ{%`B;y;mIu~@f8QHO6?c*sd4J`$iPL$ zeRjfO-`$;Hc=JobL&LlgcaicJFLVQR9@o_);Ad@nqb^?`SO1iB1g%G7Ya>U>aP@ zZ#?x1rKarSmW0ITMib_$ihjy*fNbU~iYm9gWb3(Kt8`oS8eV%|toemRf!6Q6MZ4Jt zytnrC7MyQP25hV_C8oSmbS9hvScsg{AqHeufyy`S(%r9ZdoOpC@|}51tn#qR zCh6(G#iE~iP5P>!y{x>UT5Qe(ZQ1l$oJ3meReQy;P?0v@Y3mu(T@urf=n>b4-_2*I z&BLd%b6rQTse4eK!&mGkskY-cBJD=@`*-r`k@0iq*mWMGajh;u=d|U( zxDaB&XWO;>N1SqLmFLInUBfvFD09TezoXR{Fr9|Aa!)c$S#9fDhr3aVq&3BZ?~W@e zS(}lAAf>;4vlrj%2iwW;!&8&v%3(w|lwuF8sS(f@u?EciI=nCTA{z*@lKLgs<}=AsTNQp4Lv+%Ddn_^!_pU5D`xLS<^R{%}N(;cdIOwm?{2Hp_k< z#l$elG|y;(ifBv7IYlsV%(ma>W-Kezhi0DB#MN2fj=F~i|4uSLb>F}VdIRFDScm3#>S+-k+BK%Z4037lly zuT(Lk6OWkZ49iNYeiC#xI*K37KBq5hj;GUN)Am!%)pKnfCmCQTb$8FThpYZt^jc0~ zE)FdD!0lVLISuh&%?#2PnYEPMg{qyS6H*%Fi@869N+A_+d0QBeKH=0Xu|qP@+ns$S z_1zjxEOyo68_L7jv&Fo+c-~Yasb+{Kva_$giq?g0;*sZXCsf(zDr zw0M34E)9@h;fXD7>tt`NYu?c51kLZvL4&q{}MN zBx6R+rR>lk*XGc{cgg6s2iii`TlrBQznjS*fl(gpZDA_E7Ll=iKe3#Nbm>;btFg~a zG2uhlICsD9oQ;f;~^C=^lWNw&E-ci)|B*!#q zdJ~b_>h01j#ZpxhZ1d85znS;~JqTQ#Tr+Vm5J+RPd4$yGBO zs2wma)eJw&cu)|e@xuJF{<@uR1z8ufQtt+ zO?reM(WMf}G<+%F^p53rxG|IFBxMxR*}AX|`?iLZD9te)PD9d1tE2_JG~X+qa?N3= zHxzQ>QS8BD1tZK2{r50zWX9V3ZOv@r0}n%FN$u1_XVEtuzM{NM?Qz6HpDzeaqJ#KOPqn6!$f@7^LREtE0;(MVV!xEix$NJx zA{NCIj}JzV_gykad9MjcT%O5^9}VSDPH{g|k5Oc>yv8^qbq$^oYPV0xyp0_V-7s*w zTJO6V^9UokCY3P62#S8G@%SCC zKIMLjvyrt zHiy6aBeLj}kqaF4T1*(;zB@aAOrKP^8}|7S`-)M~y5SSh`9X3UpmZu)BMp4;1?&`L zdr>(Nz(lA++tV)lChbN>s^eGD&ZiSRD2;2St{k3Bk*(!LHk>6)(`eWC)6mV{2-h&R zN}uOevI4qmS6t-|YCl1`MbI0`sJ$Z)0G0JE1*b^1IaW;PVnno<|-Q{<` zAtf$`c(yR=19FB=;0za>G9#{RQGZ7%FN1V@2y=Vj+WtKwW9<5}(3b;BkDsxa{&#!j zWbq*1JQfnro=QKzU+_$$jajbkx+ikuKf#yeHy*!r9NY7{y zZ~BW9a=Vw)s_Nr8$mdU{4*A4Hvl!A&1U7C6YOsn}&Z|uXg1-%>oODxZ_tCJ3X9r(S z`~T((Rd-n9Q*z{}TgY7uSsc!)8io!5M@1OQ*x>1?IyE(nk(>7Pa z@wDaq1eXboEezj|Jh8i@`L}896KL<>xVNxe_r~=fE9+{@XlAPJ>}d7g!im$> z&em?ET>-+4hrQgi{M^40m@Du~-n=Q1BkO z8Vo?$(=BE=1f_Jzh(iu(;6M3_d!X7h@L9eP%t`v_ zzte0qS$g~mYwy1W!wwAn>6Vz`uR{~5^AuQ+iTKV>-Uee;emFUo&9ibB9B^FzaS%Nx zk=cqWs0<}-2`W|B`ubbCZ!$iLD}mfh$Z@3b%r0B!SU8%o{mv5cP%>&tCF#kVma~=D ztVb>HzvG-{sZ9EZr#`~nw5T0D6{u`^7YNU?p@kEdm3N3f)P|4;DmU z(sEG#e+B>V6CJc99W(QPj2kWpw4)3H!T-6uum6tpx!?YycV{yV87rpOJ^mLT}jw$}{z!Y=^Jv;UZ^*?9-0~Ib%UH||9 delta 4937 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 From 9063b1542f5d5c0d509596e2642cafec3545f7bb Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 14:52:16 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index ebbc75615b..063064f9cd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -120,11 +120,11 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl%s", formDTO.getSocietyId())); } + entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); //图片必填 - if(formDTO.getImageList() != null&& StringUtils.isNotBlank(formDTO.getImageList()[0])){ + if(formDTO.getImageList() != null && StringUtils.isNotBlank(formDTO.getImageList()[0])){ entity.setImgUrl(formDTO.getImageList()[0]); } - entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class); entity.setId(formDTO.getSocietyId()); baseDao.updateById(entity); } From c69e69b65c6fe206de0f3dcdc610e53d79ee729f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 15:27:03 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=20=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcSocietyOrgController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index a5123e155a..1d34519a54 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -50,6 +50,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcSocietyOrgService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; @@ -79,6 +80,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("societyorg") public class IcSocietyOrgController implements ResultDataResolver { + private static final String DEFAULT_NO_IMG = "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220826/38eb186191ab48fe8d3920b642b56e64.png"; @Autowired private IcSocietyOrgService societyOrgService; @@ -115,6 +117,9 @@ public class IcSocietyOrgController implements ResultDataResolver { @RequestMapping("detail/{id}") public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); + if (StringUtils.isNotBlank(icSocietyOrgDTO.getImgUrl())){ + icSocietyOrgDTO.setImgUrl(DEFAULT_NO_IMG); + } return new Result().ok(icSocietyOrgDTO); } From ec0a6b1aad5e4c2b10926171af2b36db686dd6cf Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 26 Aug 2022 15:48:30 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=20=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcSocietyOrgController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 1d34519a54..3267ef36bb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -117,7 +117,7 @@ public class IcSocietyOrgController implements ResultDataResolver { @RequestMapping("detail/{id}") public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) { IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id); - if (StringUtils.isNotBlank(icSocietyOrgDTO.getImgUrl())){ + if (StringUtils.isBlank(icSocietyOrgDTO.getImgUrl())){ icSocietyOrgDTO.setImgUrl(DEFAULT_NO_IMG); } return new Result().ok(icSocietyOrgDTO);