Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@@ -74,7 +74,15 @@ public abstract class BaseRequestLogAspect {
                     transactionSerial, requestURI, method, objectsToString(args), requestHeaders);
             result = point.proceed();
             resultInfoLog(transactionSerial, getExecPeriod(startTime), result);
-        } catch (RenException e) {
+        } catch (EpmetException e) {
+            result = handleRenException(e);
+            if (e.getCode() > 8000) {
+                resultWarnLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
+            } else {
+                resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
+            }
+            return result;
+        }  catch (RenException e) {
             result = handleRenException(e);
             if (e.getCode() > 8000) {
                 resultWarnLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
@@ -237,6 +245,31 @@ public abstract class BaseRequestLogAspect {
         return result;
     }
 
+    /**
+     * 处理EpmetException
+     * @param e
+     * @return
+     */
+    private Result handleRenException(EpmetException e) {
+        if (e.getCode() > 8000) {
+            Result result;
+            if (StringUtils.isNotBlank(e.getMsg())) {
+                // 抛出异常的时候填写了自定义显示信息，把显示信息返回
+                result = new Result().error(e.getCode(), e.getMsg());
+            } else {
+                // 没有填写显示信息，则根据code找固定的显示信息
+                result = new Result().error(e.getCode());
+            }
+            result.setInternalMsg(e.getInternalMsg());
+            return result;
+        }
+        // 转化成服务器开小差...
+        Result result=new Result().error();
+        result.setInternalMsg(e.getInternalMsg());
+        //result.setMsg(e.getMsg());
+        return result;
+    }
+
     /**
      * 将请求对象转换为String
      * @param args

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -7,6 +7,9 @@ package com.epmet.commons.tools.exception;
  */
 public enum EpmetErrorCode {
 
+	/**
+	 * 错误code及消息
+	 */
 	ERR10002( 10002,"数据库中已存在该记录"),
 	/**
 	 * 账号或密码错误ACCOUNT_NOT_EXIST
@@ -248,11 +251,13 @@ public enum EpmetErrorCode {
 	ORG_ADD_FAILED(8919,"添加失败"),
 	ORG_EDIT_FAILED(8920,"编辑失败"),
 	ORG_DEL_FAILED(8921,"删除失败"),
-	//通用的 错误消息自己定义返回
-	OPERATION_FAILED(9999,"网络开小差。。。"),
-	;
 
 
+	//通用错误码 start
+	//通用的 错误消息自己定义返回
+	EPMET_COMMON_OPERATION_FAIL(9999,"网络开小差..."),
+	//通用错误码 end
+	;
 
 	private int code;
 	private String msg;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetException.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.exception;
+
+
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.utils.MessageUtils;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Epmet产品 自定义异常
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public class EpmetException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * desc:错误码
+     */
+    protected int code;
+    /**
+     * 显示给客户的消息
+     */
+    protected String msg;
+    /**
+     * 内部消息，用于服务之间传递错误信息，排错用
+     */
+    protected String internalMsg;
+
+    /**
+     * desc:指定错误码异常 外部异常内容为错误码对应的异常
+     * @param code
+     */
+    public EpmetException(int code) {
+        this(code, StrConstant.EPMETY_STR);
+    }
+
+    /**
+     * desc:指定内部错误消息的异常 外部异常内容为错误码对应的异常
+     * @param code
+     * @param internalMsg
+     */
+    public EpmetException(int code, String internalMsg) {
+        super(internalMsg);
+        this.code = code;
+        if (StringUtils.isBlank(internalMsg)) {
+            this.internalMsg = EpmetErrorCode.getMsg(code);
+            if (StringUtils.isBlank(this.internalMsg)) {
+                this.internalMsg = MessageUtils.getMessage(code, internalMsg);
+            }
+        } else {
+            this.internalMsg = internalMsg;
+        }
+    }
+
+    /**
+     * desc：指定错误码 内外部错误消息异常
+     * @param code
+     * @param internalMsg
+     * @param externalMsg
+     */
+    public EpmetException(int code, String internalMsg, String externalMsg) {
+        this(code, internalMsg);
+        this.msg = externalMsg;
+    }
+
+    /**
+     * desc:指定内部消息异常 外部错误码及消息为8000，服务器开小差
+     * @param internalMsg
+     */
+    public EpmetException(String internalMsg) {
+        super(internalMsg);
+        this.code = EpmetErrorCode.SERVER_ERROR.getCode();
+        this.internalMsg = internalMsg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public String getInternalMsg() {
+        return internalMsg;
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java

@@ -35,11 +35,12 @@ public class RenException extends RuntimeException {
      * 内部消息，用于服务之间传递错误信息，排错用
      */
     private String internalMsg;
-
+    @Deprecated  //已废弃 被EpmetException替代
     public RenException(int code) {
         this(code, "");
     }
 
+    @Deprecated  //已废弃 被EpmetException替代
     public RenException(int code, String internalMsg) {
         super(internalMsg);
         this.code = code;
@@ -53,11 +54,13 @@ public class RenException extends RuntimeException {
         }
     }
 
+    @Deprecated  //已废弃 被EpmetException替代
     public RenException(int code, String internalMsg, String msg, MessageMode mode) {
         this(code, internalMsg);
         this.msg = msg;
     }
 
+    @Deprecated  //已废弃 被EpmetException替代
     public RenException(String internalMsg) {
         super(internalMsg);
 //		this.code = ErrorCode.INTERNAL_SERVER_ERROR;
@@ -65,15 +68,12 @@ public class RenException extends RuntimeException {
         this.internalMsg = internalMsg;
     }
 
+    @Deprecated  //已废弃 被EpmetException替代
     public RenException(String internalMsg, String msg) {
         this(internalMsg);
         this.msg = msg;
     }
 
-
-
-
-
     public RenException(int code, String... params) {
         this.code = code;
         this.internalMsg = EpmetErrorCode.getMsg(code);

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/AssertUtils.java

@@ -11,6 +11,7 @@ package com.epmet.commons.tools.validator;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +33,7 @@ public class AssertUtils {
 
     public static void isBlank(String str, Integer code, String... params) {
         if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
         }
 
         if (StringUtils.isBlank(str)) {
@@ -46,7 +47,7 @@ public class AssertUtils {
 
     public static void isNull(Object object, Integer code, String... params) {
         if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
         }
 
         if (object == null) {
@@ -60,7 +61,7 @@ public class AssertUtils {
 
     public static void isArrayEmpty(Object[] array, Integer code, String... params) {
         if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
         }
 
         if(ArrayUtil.isEmpty(array)){
@@ -74,7 +75,7 @@ public class AssertUtils {
 
     public static void isListEmpty(List<?> list, Integer code, String... params) {
         if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
         }
 
         if(CollUtil.isEmpty(list)){
@@ -88,7 +89,7 @@ public class AssertUtils {
 
     public static void isMapEmpty(Map map, Integer code, String... params) {
         if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
         }
 
         if(MapUtil.isEmpty(map)){

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java

@@ -18,7 +18,9 @@
 package com.epmet.dto;
 
 import com.epmet.commons.tools.validator.group.AddGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -49,7 +51,6 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * 组织ID
      */
-    @NotBlank(message = "agencyId不能为空",groups = AddGroup.class)
 	private String agencyId;
 
     /**
@@ -95,7 +96,8 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * 活动时间
      */
-    @NotBlank(message = "活动时间不能为空",groups = AddGroup.class)
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date activityTime;
 
     /**

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,7 +19,9 @@ public class PartyActivityFormDTO implements Serializable {
     private String agencyId;
     private String unitId;
     private String title;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date startTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     private String serviceMatter;
     private Integer pageNo;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -145,6 +146,7 @@ public class IcCommunitySelfOrganizationController {
      * @author zxc
      * @date 2021/11/19 8:33 上午
      */
+    @NoRepeatSubmit
     @PostMapping("addcommunityselforganization")
     public Result addCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody AddCommunitySelfOrganizationFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, AddCommunitySelfOrganizationFormDTO.AddCommunitySelfOrganizationForm.class);
@@ -159,6 +161,7 @@ public class IcCommunitySelfOrganizationController {
      * @author zxc
      * @date 2021/11/19 10:12 上午
      */
+    @NoRepeatSubmit
     @PostMapping("editcommunityselforganization")
     public Result editCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody EditCommunitySelfOrganizationFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, EditCommunitySelfOrganizationFormDTO.EditCommunitySelfOrganizationForm.class);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java

@@ -30,10 +30,12 @@ import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.excel.IcPartyActivityExcel;
 import com.epmet.service.IcPartyActivityService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -82,17 +84,20 @@ public class IcPartyActivityController {
     @GetMapping("export")
     public void export(@RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception {
         List<IcPartyActivityDTO> list = icPartyActivityService.list(formDTO);
+        List<IcPartyActivityExcel> excelList = new ArrayList<>();
         AtomicInteger i = new AtomicInteger(0);
-        List<IcPartyActivityExcel> excelList = list.stream().map(item -> {
+        if (CollectionUtils.isNotEmpty(list)) {
-            IcPartyActivityExcel excel = new IcPartyActivityExcel();
+            excelList = list.stream().map(item -> {
-            excel.setIndex(i.getAndIncrement());
+                IcPartyActivityExcel excel = new IcPartyActivityExcel();
-            excel.setUnitName(item.getUnitName());
+                excel.setIndex(i.getAndIncrement());
-            excel.setTitle(item.getTitle());
+                excel.setUnitName(item.getUnitName());
-            excel.setAddress(item.getAddress());
+                excel.setTitle(item.getTitle());
-            excel.setPeopleCount(item.getPeopleCount());
+                excel.setAddress(item.getAddress());
-            excel.setActivityTime(item.getActivityTime());
+                excel.setPeopleCount(item.getPeopleCount());
-            return excel;
+                excel.setActivityTime(item.getActivityTime());
-        }).collect(Collectors.toList());
+                return excel;
+            }).collect(Collectors.toList());
+        }
         ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyActivityExcel.class);
     }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -33,10 +33,12 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyUnitExcel;
 import com.epmet.service.IcPartyUnitService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -90,21 +92,23 @@ public class IcPartyUnitController {
     @GetMapping("export")
     public void export(@RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception {
         List<IcPartyUnitDTO> list = icPartyUnitService.list(formDTO);
+        List<IcPartyUnitExcel> excelList = new ArrayList<>();
         AtomicInteger i = new AtomicInteger(0);
-        List<IcPartyUnitExcel> excelList = list.stream().map(item -> {
+        if (CollectionUtils.isNotEmpty(list)) {
-            IcPartyUnitExcel excel = new IcPartyUnitExcel();
+            excelList = list.stream().map(item -> {
-            excel.setIndex(i.getAndIncrement());
+                IcPartyUnitExcel excel = new IcPartyUnitExcel();
-            excel.setUnitName(item.getUnitName());
+                excel.setIndex(i.getAndIncrement());
-            excel.setContact(item.getContact());
+                excel.setUnitName(item.getUnitName());
-            excel.setContactMobile(item.getContactMobile());
+                excel.setContact(item.getContact());
-            excel.setType(item.getType());
+                excel.setContactMobile(item.getContactMobile());
-            excel.setMemberCount(item.getMemberCount());
+                excel.setType(item.getType());
-            excel.setRemark(item.getRemark());
+                excel.setMemberCount(item.getMemberCount());
-            excel.setSatisfaction(item.getSatisfaction());
+                excel.setRemark(item.getRemark());
-            excel.setServiceMatter(String.join(String.valueOf((char)10), item.getServiceMatterList()));
+                excel.setSatisfaction(item.getSatisfaction());
-            return excel;
+                excel.setServiceMatter(String.join(String.valueOf((char) 10), item.getServiceMatterList()));
-        }).collect(Collectors.toList());
+                return excel;
-
+            }).collect(Collectors.toList());
+        }
         ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyUnitExcel.class);
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -76,7 +76,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId());
         wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName());
-        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getType()), IcPartyUnitEntity::getType, formDTO.getType());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContact()), IcPartyUnitEntity::getContact, formDTO.getContact());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());
@@ -106,7 +106,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId());
         wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName());
-        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getType()), IcPartyUnitEntity::getType, formDTO.getType());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContact()), IcPartyUnitEntity::getContact, formDTO.getContact());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/MatterListDTO.java

@@ -32,6 +32,12 @@ public class MatterListDTO implements Serializable {
      */
     private String allowTime;
 
+    private String startTime;
+
+    private String endTime;
+
+    private String appointmentType;
+
     public MatterListDTO() {
         this.sort = NumConstant.ZERO;
         this.matterName = "";

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PartyServiceCenterListResultDTO.java

@@ -46,6 +46,10 @@ public class PartyServiceCenterListResultDTO implements Serializable {
      * 下午工作时间
      */
     private String pmWorkTime;
+    private String amStartTime;
+    private String amEndTime;
+    private String pmStartTime;
+    private String pmEndTime;
 
     /**
      * 经度

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

@@ -18,6 +18,7 @@
 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.ExcelUtils;
@@ -103,6 +104,7 @@ public class IcPartyServiceCenterController {
      * @author zxc
      * @date 2021/11/22 9:13 上午
      */
+    @NoRepeatSubmit
     @PostMapping("addpartyservicecenter")
     public Result addPartyServiceCenter(@RequestBody AddPartyServiceCenterFormDTO formDTO, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO, AddPartyServiceCenterFormDTO.AddPartyServiceCenterForm.class);
@@ -117,6 +119,7 @@ public class IcPartyServiceCenterController {
      * @author zxc
      * @date 2021/11/22 10:21 上午
      */
+    @NoRepeatSubmit
     @PostMapping("editpartyservicecenter")
     public Result editPartyServiceCenter(@RequestBody EditPartyServiceCenterFormDTO formDTO,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO, EditPartyServiceCenterFormDTO.EditPartyServiceCenterForm.class);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml

@@ -8,14 +8,19 @@
         <result property="centerName" column="centerName"/>
         <result property="workPhone" column="workPhone"/>
         <result property="address" column="address"/>
-        <result property="amWorkTime" column="amWorkTime"/>
+        <result property="amStartTime" column="amStartTime"/>
-        <result property="pmWorkTime" column="pmWorkTime"/>
+        <result property="amEndTime" column="amEndTime"/>
+        <result property="pmStartTime" column="pmStartTime"/>
+        <result property="pmEndTime" column="pmEndTime"/>
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
         <collection property="matterList" ofType="com.epmet.dto.MatterListDTO">
             <result property="matterId" column="matterId"/>
             <result property="allowTime" column="allowTime"/>
             <result property="matterName" column="matterName"/>
+            <result property="startTime" column="startTime"/>
+            <result property="endTime" column="endTime"/>
+            <result property="appointmentType" column="appointmentType"/>
             <result property="sort" column="sort"/>
         </collection>
     </resultMap>
@@ -25,13 +30,17 @@
             sc.CENTER_NAME AS centerName,
             sc.ADDRESS AS address,
             sc.WORK_PHONE AS workPhone,
-            CONCAT('上午 ',sc.AM_START_TIME,' ~ ',sc.AM_END_TIME) AS amWorkTime,
+            sc.AM_START_TIME AS amStartTime,
-            CONCAT('下午 ',sc.PM_START_TIME,' ~ ',sc.PM_END_TIME) AS pmWorkTime,
+            sc.AM_END_TIME AS amEndTime,
+            sc.PM_START_TIME AS pmStartTime,
+            sc.PM_END_TIME AS pmEndTime,
             sc.LONGITUDE AS longitude,
             sc.LATITUDE AS latitude,
             cm.MATTER_NAME AS matterName,
             cm.ID AS matterId,
-            CONCAT(cm.START_TIME,' ~ ',cm.END_TIME) AS allowTime
+            cm.START_TIME AS startTime,
+            cm.END_TIME AS endTime,
+            cm.APPOINTMENT_TYPE AS appointmentType
         FROM ic_party_service_center sc
         LEFT JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = sc.ID AND cm.DEL_FLAG = 0)
         WHERE sc.DEL_FLAG = 0

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

@@ -90,13 +90,13 @@ public class ResiCategoryStatsConfigController {
         if(IcResiCategoryStatsConfigConstant.WARN_YES.equals(formDTO.getWarn())){
             //判断level1 和level2 的值
             if(null ==level1 || level1==0){
-                return new Result().error(EpmetErrorCode.OPERATION_FAILED.getCode(),"黄色预警阈值需大于0");
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"黄色预警阈值需大于0");
             }
             if(null == level2 || level2==0){
-                return new Result().error(EpmetErrorCode.OPERATION_FAILED.getCode(),"红色预警阈值需大于0");
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"红色预警阈值需大于0");
             }
             if(level2<=level1){
-                return new Result().error(EpmetErrorCode.OPERATION_FAILED.getCode(),"黄色预警阈值需大于红色预警阈值");
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"黄色预警阈值需大于红色预警阈值");
             }
         }
         resiCategoryStatsConfigService.update(customerId,formDTO);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -31,10 +31,12 @@ import com.epmet.modules.partymember.excel.IcPartymemberStyleExcel;
 import com.epmet.modules.partymember.service.IcPartymemberStyleService;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -84,17 +86,20 @@ public class IcPartymemberStyleController {
 
     @PostMapping("export")
     public void export(@RequestBody PartyMemberStyleFormDTO formDTO, HttpServletResponse response) throws Exception {
-        List<IcPartymemberStyleDTO> list = icPartymemberStyleService.search(formDTO).getList();
+        List<IcPartymemberStyleDTO> list = icPartymemberStyleService.list(formDTO);
+        List<IcPartymemberStyleExcel> result = new ArrayList<>();
         AtomicInteger i = new AtomicInteger(NumConstant.ONE);
-        List<IcPartymemberStyleExcel> result = list.stream().map(item -> {
+        if (CollectionUtils.isNotEmpty(list)) {
-            IcPartymemberStyleExcel excel = new IcPartymemberStyleExcel();
+            result = list.stream().map(item -> {
-            excel.setIndex(i.getAndIncrement());
+                IcPartymemberStyleExcel excel = new IcPartymemberStyleExcel();
-            excel.setGridName(item.getGridName());
+                excel.setIndex(i.getAndIncrement());
-            excel.setName(item.getName());
+                excel.setGridName(item.getGridName());
-            excel.setMainDeed(item.getMainDeed());
+                excel.setName(item.getName());
-            return excel;
+                excel.setMainDeed(item.getMainDeed());
-        }).collect(Collectors.toList());
+                return excel;
-        ExcelUtils.exportExcelToTarget(response, null, list, IcPartymemberStyleExcel.class);
+            }).collect(Collectors.toList());
+        }
+        ExcelUtils.exportExcelToTarget(response, null, result, IcPartymemberStyleExcel.class);
     }
 
     @PostMapping("list")

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java

@@ -48,12 +48,12 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
     /**
      * 默认查询
      *
-     * @param params
+     * @param formDTO
      * @return java.util.List<IcPartymemberStyleDTO>
      * @author generator
      * @date 2021-11-18
      */
-    List<IcPartymemberStyleDTO> list(Map<String, Object> params);
+    List<IcPartymemberStyleDTO> list(PartyMemberStyleFormDTO formDTO);
 
     /**
      * 单条查询

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -73,10 +73,22 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
     }
 
     @Override
-    public List<IcPartymemberStyleDTO> list(Map<String, Object> params) {
+    public List<IcPartymemberStyleDTO> list(PartyMemberStyleFormDTO formDTO) {
-        List<IcPartymemberStyleEntity> entityList = baseDao.selectList(getWrapper(params));
+        //分页查询
+        LambdaQueryWrapper<IcPartymemberStyleEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartymemberStyleEntity::getAgencyId, formDTO.getAgencyId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcPartymemberStyleEntity::getGridId, formDTO.getGridId());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getMainDeed()), IcPartymemberStyleEntity::getMainDeed, formDTO.getMainDeed());
+        List<IcPartymemberStyleEntity> list = baseDao.selectList(wrapper);
+        List<IcPartymemberStyleDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartymemberStyleDTO.class);
+        //设置网格名
+        dtoList.forEach(item -> {
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+            item.setGridName(gridInfo.getGridName());
+        });
 
-        return ConvertUtils.sourceToTarget(entityList, IcPartymemberStyleDTO.class);
+        return dtoList;
     }
 
     private QueryWrapper<IcPartymemberStyleEntity> getWrapper(Map<String, Object> params){

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.enums.HouseTypeEnum;
 import com.epmet.commons.tools.enums.RelationshipEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
@@ -173,7 +174,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     dto.setIdCard(map.get("ID_CARD"));
                     IcResiUserDTO userDTO = baseDao.getResiUser(dto);
                     if (null != userDTO && null != userDTO.getIdCard()) {
-                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "新增居民信息失败，身份证号已存在!", RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
+                        String errorMsg = "新增居民信息失败，身份证号已存在!";
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
                 }
                 //2021.11.25  end
@@ -231,7 +233,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     dto.setIdCard(map.get("ID_CARD"));
                     IcResiUserDTO userDTO = baseDao.getResiUser(dto);
                     if (null != userDTO && null != userDTO.getIdCard()) {
-                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "修改居民信息失败，身份证号已存在!", RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
+                        String errorMsg = "修改居民信息失败，身份证号已存在!";
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
                 }
                 //2021.11.25  end