代码优化

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -72,12 +73,12 @@ public class AddSocietyOrgFormDTO implements Serializable {
     /**
      * 起始服务时间
      */
-    @NotBlank(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceStartTime;
     /**
      * 终止服务时间
      */
-    @NotBlank(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceEndTime;
     /**
      * 绑定管理员[组织下录入的工作人员]

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -62,10 +63,12 @@ public class EditSocietyOrgFormDTO implements Serializable {
     /**
      * 起始服务时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceStartTime;
     /**
      * 终止服务时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceEndTime;
     /**
      * 绑定管理员[组织下录入的工作人员]

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

@@ -17,9 +17,11 @@
 
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,7 +36,7 @@ public class GetListSocietyOrgResultDTO implements Serializable {
     //集合总条数
     private Integer total;
     //社会组织信息
-    private List<SocietyOrgList> list;
+    private List<SocietyOrgListResultDTO> list;
 
     @Data
     public class SocietyOrgList{
@@ -51,9 +53,11 @@ public class GetListSocietyOrgResultDTO implements Serializable {
         //负责人电话
         private String mobile;
         //起始服务时间
-        private String serviceStartTime;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Date serviceStartTime;
         //终止服务时间
-        private String serviceEndTime;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Date serviceEndTime;
         //绑定管理员[组织下Id录入的工作人员]
         private String adminStaffId;
         //绑定管理员[组织下录入的工作人员]姓名

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

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 社会组织列表查询
+ **/
+@Data
+public class SocietyOrgListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    //所属组织Id
+    private String  agencyId;
+    //社会组织Id
+    private String societyId;
+    //社会组织名称
+    private String societyName;
+    //服务事项
+    private String serviceMatters;
+    //负责人姓名
+    private String personInCharge;
+    //负责人电话
+    private String mobile;
+    //起始服务时间
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    //private Date serviceStartTime;
+    private String serviceStartTime;
+    //终止服务时间
+    private String serviceEndTime;
+    //绑定管理员[组织下Id录入的工作人员]
+    private String adminStaffId;
+    //绑定管理员[组织下录入的工作人员]姓名
+    private String adminStaffName = "";
+    //地址
+    private String address;
+    //经度
+    private String longitude;
+    //维度
+    private String dimension;
+
+}

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

@@ -57,7 +57,7 @@ public class IcSocietyOrgController {
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddSocietyOrgFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddSocietyOrgFormDTO.Add.class);
-        formDTO.setCustomerId(tokenDto.getToken());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         societyOrgService.add(formDTO);
         return new Result();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.GetListSocietyOrgFormDTO;
 import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.dto.result.SocietyOrgListResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcSocietyOrgEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -40,7 +41,7 @@ public interface IcSocietyOrgDao extends BaseDao<IcSocietyOrgEntity> {
      * @Author sun
      * @Description 社会组织列表查询
      **/
-    List<GetListSocietyOrgResultDTO.SocietyOrgList> getList(GetListSocietyOrgFormDTO formDTO);
+    List<SocietyOrgListResultDTO> getList(GetListSocietyOrgFormDTO formDTO);
 
     /**
      * 需求指派，选择社会组织，调用此接口

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("society_org")
+@TableName("ic_society_org")
 public class IcSocietyOrgEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

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

@@ -32,6 +32,7 @@ import com.epmet.dto.form.GetListSocietyOrgFormDTO;
 import com.epmet.dto.form.UserIdsFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.dto.result.SocietyOrgListResultDTO;
 import com.epmet.dto.result.StaffSinGridResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcSocietyOrgEntity;
@@ -92,6 +93,7 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
             throw new RenException(String.format("修改社会组织信息失败，社会组织信息不存在，组织Id->%s", formDTO.getSocietyId()));
         }
         entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class);
+        entity.setId(formDTO.getSocietyId());
         baseDao.updateById(entity);
     }
 
@@ -114,7 +116,7 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     public GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO) {
         GetListSocietyOrgResultDTO resultDTO = new GetListSocietyOrgResultDTO();
         //1.根据查询条件分页查询社会组织数据
-        PageInfo<GetListSocietyOrgResultDTO.SocietyOrgList> result =
+        PageInfo<SocietyOrgListResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getList(formDTO));
         if (CollectionUtils.isEmpty(result.getList())) {
             return resultDTO;
@@ -122,7 +124,7 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
         resultDTO.setTotal((int) result.getTotal());
         //2.查询被绑定管理员信息
         UserIdsFormDTO dto = new UserIdsFormDTO();
-        List<String> staffIdList = result.getList().stream().map(GetListSocietyOrgResultDTO.SocietyOrgList::getAdminStaffId).collect(Collectors.toList());
+        List<String> staffIdList = result.getList().stream().map(SocietyOrgListResultDTO::getAdminStaffId).collect(Collectors.toList());
         staffIdList = staffIdList.stream().distinct().collect(Collectors.toList());
         dto.setUserIds(staffIdList);
         Result<List<StaffSinGridResultDTO>> listResult = epmetUserOpenFeignClient.getStaffInfoList(dto);
@@ -143,19 +145,19 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
      */
     @Override
     public List<OptionDTO> queryServiceList(ServiceQueryFormDTO formDTO) {
-        List<OptionDTO> resultList=new ArrayList<>();
+        List<OptionDTO> resultList = new ArrayList<>();
         CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         if (null == staffInfoCacheResult || StringUtils.isBlank(staffInfoCacheResult.getAgencyId())) {
             throw new RenException("工作人员所属组织信息查询异常");
         }
-        List<String> agencyIds=new ArrayList<>();
+        List<String> agencyIds = new ArrayList<>();
         if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
-            if(staffInfoCacheResult.getAgencyPIds().contains(StrConstant.COLON)){
+            if (staffInfoCacheResult.getAgencyPIds().contains(StrConstant.COLON)) {
                 agencyIds.addAll(Arrays.asList(staffInfoCacheResult.getAgencyPIds().split(StrConstant.COLON)));
             }
         }
         agencyIds.add(staffInfoCacheResult.getAgencyId());
-        resultList=baseDao.selectListByAgencyId(agencyIds,formDTO.getServiceName(),formDTO.getCustomerId(),formDTO.getQueryPurpose());
+        resultList = baseDao.selectListByAgencyId(agencyIds, formDTO.getServiceName(), formDTO.getCustomerId(), formDTO.getQueryPurpose());
         return resultList;
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.IcSocietyOrgDao">
 
-    <select id="getList" resultType="com.epmet.dto.result.GetListSocietyOrgResultDTO$SocietyOrgList">
+    <select id="getList" resultType="com.epmet.dto.result.SocietyOrgListResultDTO">
         SELECT
             agency_id agencyId,
             id societyId,
@@ -22,7 +22,7 @@
         WHERE
             del_flag = '0'
         <if test="customerId != null and customerId.trim() != ''">
-            AND a.customer_id = #{customerId}
+            AND customer_id = #{customerId}
         </if>
         <if test="societyName != null and societyName.trim() != ''">
             AND society_name LIKE CONCAT('%', #{societyName}, '%')
@@ -34,10 +34,10 @@
             AND mobile = #{mobile}
         </if>
         <if test="serviceStartTime != null and serviceStartTime != ''">
-            AND date_id <![CDATA[>=]]> #{serviceStartTime}
+            AND service_start_time <![CDATA[>=]]> #{serviceStartTime}
         </if>
         <if test="serviceEndTime != null and serviceEndTime != ''">
-            AND date_id <![CDATA[<=]]> #{serviceEndTime}
+            AND service_end_time <![CDATA[<=]]> #{serviceEndTime}
         </if>
         ORDER BY created_time DESC
     </select>

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -80,7 +81,7 @@ public class AddPlacePatrolRecordFormDTO implements Serializable {
     /**
      * 首次巡查时间
      */
-    @NotBlank(message = "首次巡查时间不能为空", groups = {Add.class})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date firstTime;
 
     /**
@@ -99,6 +100,7 @@ public class AddPlacePatrolRecordFormDTO implements Serializable {
     /**
      * 拟复查时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reviewTime;
 
     /**

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -59,7 +60,7 @@ public class AddPlacePatrolReviewRecordFormDTO implements Serializable {
     /**
      * 复查时间
      */
-    @NotBlank(message = "复查时间不能为空", groups = {Add.class})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reviewTime;
 
     /**

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -80,7 +81,7 @@ public class AddPlacePatrolTeamFormDTO implements Serializable {
     /**
      * 创建(建队)时间
      */
-    @NotBlank(message = "创建时间不能为空", groups = {Add.class})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date time;
 
     /**

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -53,6 +54,7 @@ public class EditPlacePatrolReviewRecordFormDTO implements Serializable {
     /**
      * 复查时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reviewTime;
 
     /**

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -64,6 +65,7 @@ public class EditPlacePatrolTeamFormDTO implements Serializable {
     /**
      * 创建(建队)时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date time;
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("place_org")
+@TableName("ic_place_org")
 public class IcPlaceOrgEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("place_patrol_record")
+@TableName("ic_place_patrol_record")
 public class IcPlacePatrolRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("place_patrol_review_record")
+@TableName("ic_place_patrol_review_record")
 public class IcPlacePatrolReviewRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("place_patrol_team")
+@TableName("ic_place_patrol_team")
 public class IcPlacePatrolTeamEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("place_patrol_team_staff")
+@TableName("ic_place_patrol_team_staff")
 public class IcPlacePatrolTeamStaffEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

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

@@ -83,6 +83,7 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
             throw new RenException(String.format("修改九小场所下组织信息失败，场所信息不存在，场所Id->%s", formDTO.getPlaceOrgId()));
         }
         entity = ConvertUtils.sourceToTarget(formDTO, IcPlaceOrgEntity.class);
+        entity.setId(formDTO.getPlaceOrgId());
         baseDao.updateById(entity);
     }
 

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

@@ -101,6 +101,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
             throw new RenException(String.format("修改巡查复查记录，复查记录不存在，复查记录Id->%s", formDTO.getPlacePatrolReviewRecordId()));
         }
         entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolReviewRecordEntity.class);
+        entity.setId(formDTO.getPlacePatrolReviewRecordId());
         baseDao.updateById(entity);
         //2.复查记录修改了复查时间或复查结果时对应修改巡查记录数据最新巡查时间和结果
         if (StringUtils.isNotEmpty(formDTO.getReviewResult()) || StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {

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

@@ -107,6 +107,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
             throw new RenException(String.format("修改九小场所下巡查分队人员信息失败，分队信息不存在，分队Id->%s", formDTO.getTeamId()));
         }
         entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolTeamEntity.class);
+        entity.setId(formDTO.getTeamId());
         baseDao.updateById(entity);
         //2.全删全增分队成员字表数据
         List<IcPlacePatrolTeamStaffEntity> entityList = new ArrayList<>();

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -23,8 +23,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
 public interface EpmetUserOpenFeignClient {
 
     /**