agencyId从缓存获取

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

@@ -17,8 +17,10 @@
 
 package com.epmet.dto;
 
+import com.epmet.commons.tools.validator.group.AddGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -58,11 +60,13 @@ public class IcPartyUnitDTO implements Serializable {
     /**
      * 单位名称
      */
+    @NotBlank(message = "单位名称不能为空",groups = AddGroup.class)
 	private String unitName;
 
     /**
      * 分类 楼宇党建 两新组织 区域单位党建 机关直属部门 其他
      */
+    @NotBlank(message = "分类不能为空",groups = AddGroup.class)
 	private String type;
 
     /**
@@ -75,11 +79,13 @@ public class IcPartyUnitDTO implements Serializable {
     /**
      * 联系人
      */
+    @NotBlank(message = "联系人不能为空",groups = AddGroup.class)
 	private String contact;
 
     /**
      * 联系电话
      */
+    @NotBlank(message = "联系电话不能为空",groups = AddGroup.class)
 	private String contactMobile;
 
     /**
@@ -95,11 +101,13 @@ public class IcPartyUnitDTO implements Serializable {
     /**
      * 中心位置经度
      */
+    @NotBlank(message = "经度不能为空",groups = AddGroup.class)
 	private String longitude;
 
     /**
      * 中心位置纬度
      */
+    @NotBlank(message = "纬度不能为空",groups = AddGroup.class)
 	private String latitude;
 
     /**

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

@@ -17,7 +17,9 @@
 
 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.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -62,10 +64,10 @@ public class IcPartyActivityController {
     }
 
     @PostMapping("save")
-    public Result save(@RequestBody IcPartyActivityDTO dto){
+    public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActivityDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPartyActivityService.save(dto);
+        icPartyActivityService.save(tokenDto, dto);
         return new Result();
     }
 

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

@@ -69,10 +69,11 @@ public class IcPartyUnitController {
     }
 
     @PostMapping("save")
-    public Result save(@RequestBody IcPartyUnitDTO dto){
+    public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyUnitDTO dto){
         //效验数据
+        dto.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPartyUnitService.save(dto);
+        icPartyUnitService.save(tokenDto, dto);
         return new Result();
     }
 

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

@@ -19,6 +19,7 @@ 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.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.entity.IcPartyActivityEntity;
@@ -71,7 +72,7 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      * @author generator
      * @date 2021-11-19
      */
-    void save(IcPartyActivityDTO dto);
+    void save(TokenDto tokenDto,  IcPartyActivityDTO dto);
 
     /**
      * 批量删除

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

@@ -19,6 +19,7 @@ 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.IcPartyUnitDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
@@ -73,7 +74,7 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
      * @author generator
      * @date 2021-11-19
      */
-    void save(IcPartyUnitDTO dto);
+    void save(TokenDto tokenDto,  IcPartyUnitDTO dto);
 
 
     /**

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

@@ -21,9 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 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.dao.IcPartyActivityDao;
 import com.epmet.dto.IcPartyActivityDTO;
@@ -123,10 +124,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(IcPartyActivityDTO dto) {
+    public void save(TokenDto tokenDto, IcPartyActivityDTO dto) {
         IcPartyActivityEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActivityEntity.class);
-        AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(entity.getAgencyId());
+        CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-        entity.setPids(agency.getPids());
+        entity.setCustomerId(tokenDto.getCustomerId());
+        entity.setAgencyId(staff.getAgencyId());
+        entity.setPids(staff.getAgencyPIds());
         if(StringUtils.isBlank(entity.getId())) {
             insert(entity);
         } else {

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

@@ -27,9 +27,8 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 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.utils.Result;
 import com.epmet.dao.IcPartyUnitDao;
@@ -152,10 +151,11 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(IcPartyUnitDTO dto) {
+    public void save(TokenDto tokenDto,  IcPartyUnitDTO dto) {
         IcPartyUnitEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyUnitEntity.class);
-        AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(entity.getAgencyId());
+        CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-        entity.setPids(agency.getPids());
+        entity.setAgencyId(staff.getAgencyId());
+        entity.setPids(staff.getAgencyPIds());
         if(StringUtils.isBlank(entity.getId())) {
             insert(entity);
         } else {

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

@@ -17,8 +17,10 @@
 
 package com.epmet.modules.partymember.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -64,10 +66,10 @@ public class IcPartymemberStyleController {
     }
 
     @PostMapping("save")
-    public Result save(@RequestBody IcPartymemberStyleDTO dto){
+    public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPartymemberStyleService.save(dto);
+        icPartymemberStyleService.save(tokenDto, dto);
         return new Result();
     }
 

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

@@ -19,6 +19,7 @@ package com.epmet.modules.partymember.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.modules.partymember.entity.IcPartymemberStyleEntity;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
@@ -72,7 +73,7 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
      * @author generator
      * @date 2021-11-18
      */
-    void save(IcPartymemberStyleDTO dto);
+    void save(TokenDto tokenDto, IcPartymemberStyleDTO dto);
 
     /**
      * 删除

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

@@ -23,9 +23,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 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.GridInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.modules.partymember.dao.IcPartymemberStyleDao;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
@@ -94,8 +97,11 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(IcPartymemberStyleDTO dto) {
+    public void save(TokenDto tokenDto, IcPartymemberStyleDTO dto) {
         IcPartymemberStyleEntity entity = ConvertUtils.sourceToTarget(dto, IcPartymemberStyleEntity.class);
+        entity.setCustomerId(tokenDto.getCustomerId());
+        CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        entity.setAgencyId(staff.getAgencyId());
         if (StringUtils.isBlank(entity.getId())) {
             insert(entity);
         } else {
@@ -108,6 +114,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
             AtomicInteger i = new AtomicInteger(NumConstant.ZERO);
             List<IcPartymemberStyleImageEntity> list = dto.getImageList().stream().map(item -> {
                 IcPartymemberStyleImageEntity e = new IcPartymemberStyleImageEntity();
+                e.setCustomerId(tokenDto.getCustomerId());
                 e.setStyleId(entity.getId());
                 e.setImageUrl(item);
                 e.setSort(i.getAndIncrement());