增加单位管理

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/Account.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/1
+ */
+@Data
+public class Account {
+    @ApiModelProperty(value = "管理员账户名")
+    private String adminLoginName;
+
+    @ApiModelProperty(value = "管理员账户名")
+    private String adminUserName;
+
+    @ApiModelProperty(value = "管理员电话")
+    private String adminPhone;
+    @ApiModelProperty(value = "旧密码")
+    private String  oldPassword;
+    @ApiModelProperty(value = "新密码")
+    private String  password;
+    @ApiModelProperty(value = "新密码确认")
+    private String confirmPassword;
+
+    @ApiModelProperty(value = "验证码")
+    private String verifyCode;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommerceDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/1
+ */
+@Data
+public class CommerceDto {
+    @ApiModelProperty(value = "统一信用代码")
+    private String creditCode;
+
+    @ApiModelProperty(value = "营业执照")
+    private List<FileDto> businessLicensePhotoUrl;
+    private String businessLicensePhoto;
+
+    @ApiModelProperty(value = "法人名字")
+    private String legalPersonName;
+
+    @ApiModelProperty(value = "法人身份证号")
+    private String legalPersonIdNumber;
+
+    @ApiModelProperty(value = "法人身份证照片正面")
+    private List<FileDto> legalPersonCardPhotoFrontUrl;
+    private String legalPersonCardPhotoFront;
+    @ApiModelProperty(value = "法人身份证照片反面")
+    private List<FileDto> legalPersonCardPhotoBackUrl;
+    private String legalPersonCardPhotoBack;
+    @ApiModelProperty(value = "法人联系方式")
+    private String legalPersonPhone;
+
+
+    public void setBusinessLicensePhotoUrl(List<FileDto> businessLicensePhotoUrl) {
+        String url=null;
+        if(businessLicensePhotoUrl!=null&&!businessLicensePhotoUrl.isEmpty()){
+            url=businessLicensePhotoUrl.get(0).getUrl();
+        }
+        this.businessLicensePhoto=url;
+        this.businessLicensePhotoUrl = businessLicensePhotoUrl;
+    }
+
+    public void setBusinessLicensePhoto(String businessLicensePhoto) {
+        if(this.businessLicensePhoto!=null){
+            List<FileDto> businessLicensePhotoUrl =new ArrayList<>();
+            FileDto d=new FileDto(this.businessLicensePhoto);
+            businessLicensePhotoUrl.add(d);
+            this.businessLicensePhotoUrl =businessLicensePhotoUrl;
+        }
+        this.businessLicensePhoto = businessLicensePhoto;
+    }
+
+    public void setLegalPersonCardPhotoFrontUrl(List<FileDto> legalPersonCardPhotoFrontUrl) {
+        String url=null;
+        if(legalPersonCardPhotoFrontUrl!=null&&!legalPersonCardPhotoFrontUrl.isEmpty()){
+            url=legalPersonCardPhotoFrontUrl.get(0).getUrl();
+        }
+        this.legalPersonCardPhotoFront=url;
+        this.legalPersonCardPhotoFrontUrl = legalPersonCardPhotoFrontUrl;
+    }
+
+    public void setLegalPersonCardPhotoFront(String legalPersonCardPhotoFront) {
+        if(this.legalPersonCardPhotoFront!=null){
+            List<FileDto> legalPersonCardPhotoFrontUrl =new ArrayList<>();
+            FileDto d=new FileDto(this.legalPersonCardPhotoFront);
+            legalPersonCardPhotoFrontUrl.add(d);
+            this.legalPersonCardPhotoFrontUrl =legalPersonCardPhotoFrontUrl;
+        }
+        this.legalPersonCardPhotoFront = legalPersonCardPhotoFront;
+    }
+
+    public void setLegalPersonCardPhotoBackUrl(List<FileDto> legalPersonCardPhotoBackUrl) {
+        String url=null;
+        if(legalPersonCardPhotoBackUrl!=null&&!legalPersonCardPhotoBackUrl.isEmpty()){
+            url=legalPersonCardPhotoBackUrl.get(0).getUrl();
+        }
+        this.legalPersonCardPhotoBack=url;
+        this.legalPersonCardPhotoBackUrl = legalPersonCardPhotoBackUrl;
+    }
+
+    public void setLegalPersonCardPhotoBack(String legalPersonCardPhotoBack) {
+        if(this.legalPersonCardPhotoBack!=null){
+            List<FileDto> legalPersonCardPhotoBackUrl =new ArrayList<>();
+            FileDto d=new FileDto(this.legalPersonCardPhotoBack);
+            legalPersonCardPhotoBackUrl.add(d);
+            this.legalPersonCardPhotoBackUrl =legalPersonCardPhotoBackUrl;
+        }
+        this.legalPersonCardPhotoBack = legalPersonCardPhotoBack;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/FileDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/1
+ */
+@Data
+public class FileDto {
+    private String uid;
+    private String name;
+    private String url;
+    private String status;
+
+    public FileDto(String url) {
+
+        this.url = url;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UnitDataDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/1
+ */
+@Data
+public class UnitDataDto {
+
+    //单位管理
+    UnitInformation unitInformation;
+
+    //工商信息
+    CommerceDto commerceDto;
+
+    //管理员账号
+    Account cccount;
+
+    public UnitDataDto(UnitInformation unitInformation, CommerceDto commerceDto, Account cccount) {
+        this.unitInformation = unitInformation;
+        this.commerceDto = commerceDto;
+        this.cccount = cccount;
+    }
+
+    public UnitDataDto() {
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UnitInformation.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/1
+ */
+@Data
+public class UnitInformation {
+
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "企业名称")
+    private String name;
+
+    @ApiModelProperty(value = "注册地址")
+    private String registerAddress;
+
+    @ApiModelProperty(value = "工作地址")
+    private String workAddress;
+
+    @ApiModelProperty(value = "负责人名称")
+    private String headName;
+
+    @ApiModelProperty(value = "负责人电话")
+    private String headPhone;
+
+    @ApiModelProperty(value = "负责人身份证号码")
+    private String headIdNumber;
+
+    @ApiModelProperty(value = "负责人身份证照片正面")
+    private String headCardPhotoFront;
+    private List<FileDto> headCardPhotoFrontUrl;
+
+    @ApiModelProperty(value = "负责人身份证照片反面")
+    private String headCardPhotoBack;
+    private List<FileDto> headCardPhotoBackUrl;
+
+
+    @ApiModelProperty(value = "注册地址省-市-区")
+    private String registerPcd;
+
+    @ApiModelProperty(value = "工作地址省-市-区")
+    private String workPcd;
+
+    @ApiModelProperty(value = "注册地址省-市-区code")
+    private String registerPcdCode;
+
+    @ApiModelProperty(value = "工作地址省-市-区code")
+    private String workPcdCode;
+
+    @ApiModelProperty(value = "注册地址省-市-区code")
+    private List<Integer> registerPcdCodeList;
+
+    @ApiModelProperty(value = "工作地址省-市-区code")
+    private List<Integer>  workPcdCodeList;
+
+
+    @ApiModelProperty(value = "单位类型")
+    private String unitTypeCode;
+    @ApiModelProperty(value = "区域公司")
+    private List<Long> regionalCompaniesSeq;
+
+
+    public void setRegisterPcdCode(String registerPcdCode) {
+        if(this.registerPcdCode!=null){
+        List<Integer> registerPcdCodeList =new ArrayList<>();
+        String[] da=  registerPcdCode.split("-");
+            for (String s : da) {
+                registerPcdCodeList.add(Integer.valueOf(s));
+            }
+        this.registerPcdCodeList =registerPcdCodeList;
+    }
+
+        this.registerPcdCode = registerPcdCode;
+    }
+
+    public void setWorkPcdCode(String workPcdCode) {
+        if(this.workPcdCode!=null){
+            List<Integer> workPcdCodeList =new ArrayList<>();
+            String[] da=  workPcdCode.split("-");
+            for (String s : da) {
+                workPcdCodeList.add(Integer.valueOf(s));
+            }
+            this.workPcdCodeList =workPcdCodeList;
+        }
+        this.workPcdCode = workPcdCode;
+    }
+
+    public void setHeadCardPhotoFront(String headCardPhotoFront) {
+        if(this.headCardPhotoFront!=null){
+            List<FileDto> headCardPhotoFrontUrl =new ArrayList<>();
+            FileDto d=new FileDto(this.headCardPhotoFront);
+            headCardPhotoFrontUrl.add(d);
+            this.headCardPhotoFrontUrl =headCardPhotoFrontUrl;
+        }
+        this.headCardPhotoFront = headCardPhotoFront;
+    }
+
+    public void setHeadCardPhotoBack(String headCardPhotoBack) {
+        if(this.headCardPhotoBack!=null){
+            List<FileDto> headCardPhotoBackUrl =new ArrayList<>();
+            FileDto d=new FileDto(this.headCardPhotoBack);
+            headCardPhotoBackUrl.add(d);
+            this.headCardPhotoBackUrl =headCardPhotoBackUrl;
+        }
+        this.headCardPhotoBack = headCardPhotoBack;
+    }
+
+
+    public void setHeadCardPhotoFrontUrl(List<FileDto> headCardPhotoFrontUrl) {
+
+        String url=null;
+        if(headCardPhotoFrontUrl!=null&&!headCardPhotoFrontUrl.isEmpty()){
+            url=headCardPhotoFrontUrl.get(0).getUrl();
+        }
+
+        this.headCardPhotoFront=url;
+        this.headCardPhotoFrontUrl = headCardPhotoFrontUrl;
+    }
+
+    public void setHeadCardPhotoBackUrl(List<FileDto> headCardPhotoBackUrl) {
+        String url=null;
+        if(headCardPhotoBackUrl!=null&&!headCardPhotoBackUrl.isEmpty()){
+            url=headCardPhotoBackUrl.get(0).getUrl();
+        }
+
+        this.headCardPhotoBack=url;
+        this.headCardPhotoBackUrl = headCardPhotoBackUrl;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UnitInfo.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_unit_info")
+@TableName(value = "hygf_unit_info",autoResultMap = true)
 public class UnitInfo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -43,6 +43,16 @@
       </dependency>
 
       <dependency>
+          <groupId>mcb.module.standard</groupId>
+          <artifactId>biz</artifactId>
+          <version>1.0.5-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+          <groupId>mcb.module.standard</groupId>
+          <artifactId>api</artifactId>
+          <version>1.0.5-SNAPSHOT</version>
+      </dependency>
+      <dependency>
           <groupId>com.qiyuesuo.sdk</groupId>
           <artifactId>sdk-java</artifactId>
           <version>3.0.0</version>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -13,6 +13,8 @@ import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DealerReviewServiceImpl;
+import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
+import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -87,6 +89,9 @@ public class UnitInfoController extends BaseController {
     CommerceInfoMapper commerceInfoMapper;
     @Autowired
     UnitInfoMapper unitInfoMapper;
+
+    @Autowired
+    PublicAgencyUserMapper publicAgencyUserMapper;
 	/**
 	 * 验证码过期时间
 	 */
@@ -423,5 +428,12 @@ public class UnitInfoController extends BaseController {
     }
 
 
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUnitDataDto")
+    @ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
+    public ResponseModel<UnitDataDto> getUnitDataDto() {
+        CompanyModel companyM = getUserInfo().getCompanys().get(0);
+        UnitDataDto unitDataDto = unitInfoServiceImpl.getUnitDataDto(companyM.getSequenceNbr());
+        return  ResponseHelper.buildResponse(unitDataDto);
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -9,22 +9,22 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.DealerReviewEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
-import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.UnitRegisterDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.PrivilegeFeginService;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.DealerReviewMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IDealerReviewService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IRegionalCompaniesService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IUnitInfoService;
-import com.yeejoin.amos.boot.module.hygf.api.dto.UnitInfoDto;
 import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -35,6 +35,7 @@ import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -82,7 +83,10 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     CommerceInfoServiceImpl commerceInfoService;
     @Autowired
     RegionalCompaniesServiceImpl regionalCompaniesService;
-
+    @Autowired
+    UnitInfoMapper unitInfoMapper;
+    @Autowired
+    CommerceInfoMapper commerceInfoMapper;
 
     @Autowired
     IDealerReviewService dealerReviewService;
@@ -443,4 +447,50 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         return code;
     }
 
+    //单位详情
+    public UnitDataDto getUnitDataDto(Long id){
+
+        LambdaQueryWrapper<UnitInfo> queryWrapper = new LambdaQueryWrapper<UnitInfo>();
+        queryWrapper.eq(UnitInfo::getAmosCompanySeq, id);
+        UnitInfo unitInfo= unitInfoMapper.selectOne(queryWrapper);
+        LambdaQueryWrapper<CommerceInfo> queryWrapper1 = new LambdaQueryWrapper<CommerceInfo>();
+        queryWrapper1.eq(CommerceInfo::getUnitSeq, unitInfo.getSequenceNbr());
+        CommerceInfo commerceInfo= commerceInfoMapper.selectOne(queryWrapper1);
+        //单位管理
+        UnitInformation unitInformation=new UnitInformation();
+        //工商信息
+        CommerceDto commerceDto=new CommerceDto();
+        //管理员账号
+        Account cccount=new Account();
+        BeanUtils.copyProperties(unitInfo,unitInformation);
+        unitInformation.setHeadCardPhotoBack(unitInformation.getHeadCardPhotoBack());
+        unitInformation.setHeadCardPhotoFront(unitInformation.getHeadCardPhotoFront());
+        unitInformation.setRegisterPcdCode(unitInformation.getRegisterPcdCode());
+        unitInformation.setWorkPcdCode(unitInformation.getWorkPcdCode());
+        BeanUtils.copyProperties(commerceInfo,commerceDto);
+        commerceDto.setBusinessLicensePhoto(commerceDto.getBusinessLicensePhoto());
+        commerceDto.setLegalPersonCardPhotoBack(commerceDto.getLegalPersonCardPhotoBack());
+        commerceDto.setLegalPersonCardPhotoFront(commerceDto.getLegalPersonCardPhotoFront());
+
+        BeanUtils.copyProperties(unitInfo,cccount);
+        UnitDataDto unitDataDt = new UnitDataDto(unitInformation,commerceDto,cccount);
+        return unitDataDt;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

@@ -254,6 +254,7 @@ public class UnitInfoController extends BaseController {
 		params.put("mobile",tel);
 		params.put("smsCode", smsTempCode);
 		try {
+
 			Systemctl.smsClient.sendCommonSms(params).getResult();
 			flag = true;
    		} catch (Exception e) {