commit2

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -352,4 +352,12 @@ public interface GovOrgOpenFeignClient {
      **/
     @GetMapping(value = "/gov/org/customeragency/getareacodeswitch/{customerId}")
     Result<String> getAreaCodeSwitch(@PathVariable("customerId")String customerId);
+
+    /**
+     * 工作人员的个人信息
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("/gov/org/staff/mine")
+    Result<MineResultDTO> queryStaffProfile(@RequestBody StaffInfoFromDTO fromDTO);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -209,4 +209,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<String> getAreaCodeSwitch(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAreaCodeSwitch", customerId);
     }
+
+    @Override
+    public Result<MineResultDTO> queryStaffProfile(StaffInfoFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "mine", fromDTO);
+    }
 }

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java

@@ -23,6 +23,11 @@ public class AddSpecialSubjectFormDTO implements Serializable {
      */
     @NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class)
     private String orgId;
+    /**
+     * orgId的所有上级id
+     */
+    @NotBlank(message = "pids不能为空", groups = QuerySpecialSubFormDTO.AddUserInternalGroup.class)
+    private String pids;
 
     /**
      * 网格：grid；社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province
@@ -43,12 +48,6 @@ public class AddSpecialSubjectFormDTO implements Serializable {
     @NotBlank(message = "从token中获取userId为空", groups = AddUserInternalGroup.class)
     private String addUserId;
 
-    /**
-     * 从TokenDto中获取当前用户所属的agencyId
-     */
-    @NotBlank(message = "从token中获取用户所属组织id为空", groups = AddUserInternalGroup.class)
-    private String addUserAgencyId;
-
     @NotBlank(message = "从token中获取客户id为空", groups = AddUserInternalGroup.class)
     private String customerId;
 }

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DelSpecialSubjectFormDTO.java

@@ -30,10 +30,13 @@ public class DelSpecialSubjectFormDTO implements Serializable {
     @NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class)
     private String orgId;
 
-
+    // 以下属性从token中获取
     /**
      * 从TokenDto中获取当前用户id
      */
-    @NotBlank(message = "从token中获取userId为空", groups = AddSpecialSubjectFormDTO.AddUserInternalGroup.class)
+    @NotBlank(message = "从token中获取userId为空", groups = AddUserInternalGroup.class)
     private String userId;
+    @NotBlank(message = "从token中获取客户id为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java

@@ -18,7 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.GovTokenDto;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.AddSpecialSubjectFormDTO;
@@ -57,9 +57,9 @@ public class SpecialSubjectController {
      * @Date 2021/7/15 15:31
      **/
     @PostMapping("add")
-    public Result<AddSpecialSubjectResultDTO> addSpecialSubject(@LoginUser GovTokenDto tokenDto, @RequestBody AddSpecialSubjectFormDTO formDTO) {
+    public Result<AddSpecialSubjectResultDTO> addSpecialSubject(@LoginUser TokenDto tokenDto, @RequestBody AddSpecialSubjectFormDTO formDTO) {
         formDTO.setAddUserId(tokenDto.getUserId());
-        formDTO.setAddUserAgencyId(tokenDto.getAgencyId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, AddSpecialSubjectFormDTO.AddUserInternalGroup.class);
         return new Result<AddSpecialSubjectResultDTO>().ok(specialSubjectService.addSpecialSubject(formDTO));
     }
@@ -72,7 +72,9 @@ public class SpecialSubjectController {
      * @Date 2021/7/15 20:49
      **/
     @PostMapping("del")
-    public Result delSpecialSubject(@RequestBody DelSpecialSubjectFormDTO formDTO){
+    public Result delSpecialSubject(@LoginUser TokenDto tokenDto, @RequestBody DelSpecialSubjectFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO);
         specialSubjectService.delSpecialSubject(formDTO);
         return new Result();

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java

@@ -34,8 +34,6 @@ import java.util.List;
 @Mapper
 public interface SpecialSubjectDao extends BaseDao<SpecialSubjectEntity> {
 
-    SpecialSubjectEntity selectByOrgIdAndTagId(@Param("orgId") String orgId, @Param("tagId") String tagId);
-
     int delSpecialSubject(@Param("id") String id, @Param("userId") String userId);
 
     List<SpecialSubjectDTO> queryExistedList(@Param("orgId") String orgId,@Param("notList")List<String> notList);

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 专题表
  *
@@ -58,6 +55,11 @@ public class SpecialSubjectEntity extends BaseEpmetEntity {
      */
 	private String addOrgId;
 
+	/**
+	 * 用户所在的组织或者网格的所有上级
+	 */
+	private String addOrgPids;
+
     /**
      * 网格：grid；社区级：community，
 乡（镇、街道）级:street,

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -27,15 +27,19 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.SpecialSubjectDao;
 import com.epmet.dto.SpecialSubjectDTO;
 import com.epmet.dto.TagCustomerDTO;
 import com.epmet.dto.form.AddSpecialSubjectFormDTO;
 import com.epmet.dto.form.DelSpecialSubjectFormDTO;
 import com.epmet.dto.form.QuerySpecialSubFormDTO;
+import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.result.AddSpecialSubjectResultDTO;
+import com.epmet.dto.result.MineResultDTO;
 import com.epmet.dto.result.WorkSpecialSubjectResultDTO;
 import com.epmet.entity.SpecialSubjectEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.SpecialSubjectService;
 import com.epmet.service.TagCustomerService;
 import lombok.extern.slf4j.Slf4j;
@@ -62,6 +66,9 @@ import java.util.stream.Collectors;
 public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao, SpecialSubjectEntity> implements SpecialSubjectService {
     @Autowired
     private TagCustomerService tagCustomerService;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
 
     @Override
     public PageData<SpecialSubjectDTO> page(Map<String, Object> params) {
@@ -131,13 +138,26 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
             throw new RenException(EpmetErrorCode.TAG_NOT_EXIST.getCode(), EpmetErrorCode.TAG_NOT_EXIST.getMsg());
         }
         //2、校验当前组织是否添加过此专题
-        SpecialSubjectEntity havedEntity = baseDao.selectByOrgIdAndTagId(formDTO.getOrgId(), formDTO.getTagId());
+        QuerySpecialSubFormDTO querySpecialSubFormDTO=new QuerySpecialSubFormDTO();
-        if (null != havedEntity) {
+        querySpecialSubFormDTO.setOrgId(formDTO.getOrgId());
-            throw new RenException(EpmetErrorCode.EXISTED_SPECIAL_PROJECT.getCode(), EpmetErrorCode.EXISTED_SPECIAL_PROJECT.getMsg());
+        querySpecialSubFormDTO.setPids(formDTO.getPids());
-        }
+        List<WorkSpecialSubjectResultDTO> havedList=this.queryExistedList(querySpecialSubFormDTO);
+        List<String> haveTagIds=havedList.stream().map(WorkSpecialSubjectResultDTO::getTagId).distinct().collect(Collectors.toList());
+        haveTagIds.forEach(tagId->{
+            if(tagId.equals(formDTO.getTagId())){
+                throw new RenException(EpmetErrorCode.EXISTED_SPECIAL_PROJECT.getCode(), EpmetErrorCode.EXISTED_SPECIAL_PROJECT.getMsg());
+            }
+        });
         // 3、保存
         SpecialSubjectEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, SpecialSubjectEntity.class);
+        StaffInfoFromDTO staffInfoFromDTO = new StaffInfoFromDTO();
+        staffInfoFromDTO.setStaffId(formDTO.getAddUserId());
+        Result<MineResultDTO> result = govOrgOpenFeignClient.queryStaffProfile(staffInfoFromDTO);
+        if(result.success()&&null!=result.getData()){
+            insertEntity.setAddUserAgencyId(result.getData().getAgencyId());
+        }
         insertEntity.setAddOrgId(formDTO.getOrgId());
+        insertEntity.setAddOrgPids(formDTO.getPids());
         baseDao.insert(insertEntity);
         return new AddSpecialSubjectResultDTO(insertEntity.getId());
     }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml

@@ -2,16 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.SpecialSubjectDao">
-    <select id="selectByOrgIdAndTagId" parameterType="map" resultType="com.epmet.entity.SpecialSubjectEntity">
-        SELECT
-            *
-        FROM
-            special_subject ss
-        WHERE
-            ss.DEL_FLAG = '0'
-            AND ss.ADD_ORG_ID = #{orgId}
-            AND ss.TAG_ID = #{tagId}
-    </select>
 
     <update id="delSpecialSubject" parameterType="map">
         update special_subject set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=Now()