emm

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

@@ -0,0 +1,75 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/18 5:32 下午
+ * @DESC
+ */
+@Data
+public class AddCommunitySelfOrganizationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4996925380900678065L;
+
+    public interface AddCommunitySelfOrganizationForm{}
+
+    /**
+     * 组织名称
+     */
+    @NotBlank(message = "organizationName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String organizationName;
+
+    /**
+     * 组织人数
+     */
+    @NotNull(message = "organizationPersonCount不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+    @NotBlank(message = "principalName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String principalName;
+
+    /**
+     * 负责人电话
+     */
+    @NotBlank(message = "principalPhone不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+    @NotBlank(message = "serviceItem不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+    private Date organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "longitude不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "latitude不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String latitude;
+
+    /**
+     * 社区自组织人员
+     */
+    private List<IcCommunitySelfOrganizationPersonnelDTO> organizationPersonnel;
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/IcCommunitySelfOrganizationConstant.java

@@ -0,0 +1,11 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 8:39 上午
+ * @DESC
+ */
+public interface IcCommunitySelfOrganizationConstant {
+
+    String ORG_TYPE_AGENCY = "agency";
+}

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

@@ -17,7 +17,10 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -26,6 +29,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
 import com.epmet.excel.IcCommunitySelfOrganizationExcel;
 import com.epmet.service.IcCommunitySelfOrganizationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +95,18 @@ public class IcCommunitySelfOrganizationController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcCommunitySelfOrganizationExcel.class);
     }
 
+    /**
+     * @Description  添加社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 8:33 上午
+     */
+    @PostMapping("addcommunityselforganization")
+    public Result addCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody AddCommunitySelfOrganizationFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AddCommunitySelfOrganizationFormDTO.AddCommunitySelfOrganizationForm.class);
+        icCommunitySelfOrganizationService.addCommunitySelfOrganization(tokenDto, formDTO);
+        return new Result();
+    }
+
 }

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

@@ -17,9 +17,12 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -91,7 +94,9 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
     /**
      * 社区自组织创建时间
      */
-	private Date organizationCreatedTime;
+	@TableField(fill = FieldFill.INSERT)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date organizationCreatedTime;
 
     /**
      * 经度

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

@@ -19,7 +19,9 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
 import com.epmet.entity.IcCommunitySelfOrganizationEntity;
 
 import java.util.List;
@@ -92,4 +94,13 @@ public interface IcCommunitySelfOrganizationService extends BaseService<IcCommun
      * @date 2021-11-18
      */
     void delete(String[] ids);
+
+    /**
+     * @Description  添加社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 8:33 上午
+     */
+    void addCommunitySelfOrganization(TokenDto tokenDto, AddCommunitySelfOrganizationFormDTO formDTO);
 }

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

@@ -3,13 +3,25 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.validator.PhoneValidatorUtils;
+import com.epmet.constant.IcCommunitySelfOrganizationConstant;
 import com.epmet.dao.IcCommunitySelfOrganizationDao;
 import com.epmet.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
 import com.epmet.entity.IcCommunitySelfOrganizationEntity;
+import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
+import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
 import com.epmet.service.IcCommunitySelfOrganizationService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +40,9 @@ import java.util.Map;
 @Service
 public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCommunitySelfOrganizationDao, IcCommunitySelfOrganizationEntity> implements IcCommunitySelfOrganizationService {
 
+    @Autowired
+    private IcCommunitySelfOrganizationPersonnelService personnelService;
+
     @Override
     public PageData<IcCommunitySelfOrganizationDTO> page(Map<String, Object> params) {
         IPage<IcCommunitySelfOrganizationEntity> page = baseDao.selectPage(
@@ -80,4 +95,39 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  添加社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 8:33 上午
+     */
+    @Override
+    public void addCommunitySelfOrganization(TokenDto tokenDto, AddCommunitySelfOrganizationFormDTO formDTO) {
+        String customerId = tokenDto.getCustomerId();
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new RenException(String.format("查询人员{%s}信息失败",tokenDto.getUserId()));
+        }
+        IcCommunitySelfOrganizationEntity orgEntity = ConvertUtils.sourceToTarget(formDTO, IcCommunitySelfOrganizationEntity.class);
+        orgEntity.setCustomerId(customerId);
+        orgEntity.setOrgId(staffInfo.getAgencyId());
+        orgEntity.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+        if (null == agencyInfo){
+            throw new RenException(String.format("查询组织信息失败%s",staffInfo.getAgencyId()));
+        }
+        orgEntity.setPid(agencyInfo.getPid());
+        orgEntity.setPids(agencyInfo.getPids());
+        baseDao.insert(orgEntity);
+        if(CollectionUtils.isNotEmpty(formDTO.getOrganizationPersonnel())){
+            List<IcCommunitySelfOrganizationPersonnelEntity> persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class);
+            persons.forEach(p -> {
+                p.setCustomerId(customerId);
+                p.setOrgId(orgEntity.getId());
+            });
+            personnelService.insertBatch(persons);
+        }
+    }
+
 }