Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java

@@ -2,10 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
-import com.epmet.dto.form.ComponentAccessTokenFormDTO;
-import com.epmet.dto.form.SaveOrUpdateCustSelPlatformFormDTO;
-import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.fallback.ThirdOpenFeignClientFallback;
 import com.epmet.feign.fallback.ThirdOpenFeignClientFallbackFactory;
@@ -57,4 +54,20 @@ public interface ThirdOpenFeignClient {
      */
     @PostMapping("/third/private-epmet/push-authorizer-tokens")
     Result pushAuthorizerTokens(@RequestBody AuthorizerAccessTokenFormDTO input);
+
+    /**
+     * 区块链：立项
+     * @param input
+     * @return
+     */
+    @PostMapping("/third/blockchain/project/create")
+    Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input);
+
+    /**
+     * 区块链：处理进展
+     * @param input
+     * @return
+     */
+    @PostMapping("/third/blockchain/project/process")
+    Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input);
 }

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java

@@ -3,10 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
-import com.epmet.dto.form.ComponentAccessTokenFormDTO;
-import com.epmet.dto.form.SaveOrUpdateCustSelPlatformFormDTO;
-import com.epmet.dto.form.ThirdPlatformFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.ThirdOpenFeignClient;
 import org.springframework.stereotype.Component;
@@ -34,4 +31,14 @@ public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient {
     public Result pushAuthorizerTokens(AuthorizerAccessTokenFormDTO input) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "pushAuthorizerTokens", input);
     }
+
+    @Override
+    public Result blockChainCreateProject(BlockChainCreateProjectFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "blockChainCreateProject", input);
+    }
+
+    @Override
+    public Result blockChainProcessProject(BlockChainProcessProjectFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "blockChainProcessProject", input);
+    }
 }

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

@@ -72,4 +72,21 @@ public class EditAgencyFormDTO implements Serializable {
      */
     private String mobile;
 
+    /**
+     * open: 选择地区编码必填；closed:  无需选择地区编码;0409新增返参
+     */
+    @NotBlank(message = "areaCodeSwitch不能为空", groups = AddUserInternalGroup.class)
+    private String areaCodeSwitch;
+
+    /**
+     * 组织区划代码
+     */
+    private String areaCode;
+    /**
+     * 父级组织编码
+     */
+    private String parentAreaCode;
+
+    @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddAgencyV2FormDTO.AddUserInternalGroup.class)
+    private String level;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -304,5 +304,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      **/
     OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId);
+
+    int updateSubAgencyAreaCode(@Param("customerId") String customerId, @Param("originalParentAreaCode")String originalParentAreaCode,@Param("operateUserId") String operateUserId);
 }
 

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

@@ -152,6 +152,34 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setCode(formDTO.getCode());
         originalEntity.setContacts(formDTO.getContacts());
         originalEntity.setMobile(formDTO.getMobile());
+        if(StringUtils.isNotBlank(formDTO.getAreaCode())&&formDTO.getAreaCode().equals(originalEntity.getAreaCode())){
+            //如果修改了areaCode。
+            customerAgencyDao.updateSubAgencyAreaCode(originalEntity.getCustomerId(),originalEntity.getAreaCode(),formDTO.getUserId());
+        }
+        //判断areaCodeSwitch：open: 选择地区编码必填；closed:  无需选择地区编码
+        if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
+            //校验areaCode是否被使用过
+            if (!"other".equals(formDTO.getAreaCode())) {
+                List<String> agencyIds = customerAgencyDao.selectAgencyIdsByAreaCode(formDTO.getAreaCode(),formDTO.getAgencyId());
+                if (CollectionUtils.isNotEmpty(agencyIds)) {
+                    //已经被占用，提示
+                    throw new RenException(EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getCode(), EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getMsg());
+                }
+                originalEntity.setAreaCode(formDTO.getAreaCode());
+            }else{
+                //如果选择的是other,需要自定义一个编码
+                AddAreaCodeFormDTO addAreaCodeFormDTO = new AddAreaCodeFormDTO();
+                addAreaCodeFormDTO.setCurrentAreaLevel(formDTO.getLevel());
+                addAreaCodeFormDTO.setParentAreaCode(formDTO.getAreaCode());
+                addAreaCodeFormDTO.setName(formDTO.getAgencyName());
+                Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
+                if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
+                    throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
+                }
+                originalEntity.setAreaCode(addAreaCodeResult.getData());
+            }
+        }
+
         //1:更新当前组织信息
         if (customerAgencyDao.updateById(originalEntity) < NumConstant.ONE) {
             log.error(CustomerAgencyConstant.UPDATE_EXCEPTION);

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

@@ -731,4 +731,15 @@
           AND PID = #{orgId}
     </select>
 
+    <update id="updateSubAgencyAreaCode" parameterType="map">
+        UPDATE customer_agency
+        SET AREA_CODE = '',
+        PARENT_AREA_CODE = '',
+        UPDATED_BY=#{operateUserId}
+        UPDATED_TIME = NOW()
+        WHERE
+            DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+            AND PARENT_AREA_CODE LIKE concat( #{originalParentAreaCode}, '%' )
+    </update>
 </mapper>

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java

@@ -8,6 +8,7 @@ import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.EpmetThirdOpenFeignClient;
+import com.epmet.feign.ThirdOpenFeignClient;
 import com.epmet.service.BlockChainUploadService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -27,7 +28,7 @@ import java.util.stream.Collectors;
 public class BlockChainUploadServiceImpl implements BlockChainUploadService {
 
     @Autowired
-    private EpmetThirdOpenFeignClient thirdOpenFeignClient;
+    private ThirdOpenFeignClient thirdOpenFeignClient;
 
     @Autowired
     private ProjectStaffDao projectStaffDao;