Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -23,4 +23,5 @@ public class CompanyDto extends Page<CompanyDto> {
     private String companyType;
     private Long sequenceNbr;
     private Long comid;
+    private Long companyTreeid;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/5
+ */
+@Data
+public class CompanyDtoUserDto extends Page<CompanyDtoUserDto> {
+
+
+
+    private Long sequenceNbr;
+    /**
+     * 平台账号
+     */
+
+    private String amosUserName;
+    /**
+     * 用户名称
+     */
+    private String realName;
+
+    /**
+     * 岗位名称
+     */
+    private String position;
+
+    /**
+     * 电话
+     */
+    private String emergencyTelephone;
+
+
+    /**
+     * 所属区域公司名称
+     */
+    private String regionalCompaniesName;
+
+
+    /**
+     * 锁定状态
+     */
+    private String lockStatus;
+
+
+    /**
+     * 所属单位orgcode
+     */
+    private String amosUnitOrgCode;
+
+    /**
+     * 所属单位orgcode
+     */
+    private Long amosUnitId;
+
+    private String userType;
+
+
+
+
+
+
+
+}

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

@@ -56,5 +56,5 @@ public class PersonnelBusinessDto  extends BaseDto {
 
     @ApiModelProperty(value = "用户基础表id")
     private Long foundationId;
-
+    private String userType;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/6
+ */
+@Data
+public class UserDataDto {
+
+    UserDataZHDto userDataZHDto;
+    UserDataJBDto userDataJBDto;
+    UserDataZZDto userDataZZDto;
+    private  Long amosDealerId;
+
+    public UserDataDto(UserDataZHDto userDataZHDto, UserDataJBDto userDataJBDto, UserDataZZDto userDataZZDto) {
+        this.userDataZHDto = userDataZHDto;
+        this.userDataJBDto = userDataJBDto;
+        this.userDataZZDto = userDataZZDto;
+    }
+
+    public UserDataDto() {
+    }
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/6
+ */
+
+
+@Data
+public class UserDataJBDto {
+
+    private String realName;
+    private String idType;
+    private String idNumber;
+    private Long amosUnitId;
+    private String regionalCompaniesSeq;
+    private List<String> position;
+    private String jobNumber;
+    private String gender;
+    private String domicileAddress;
+    private Double height;
+    private Double weight;
+    private String emergencyTelephone;
+    private String nowAddress;
+    private String politicalOutlook;
+    private String nativePlace;
+    }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/6
+ */
+@Data
+public class UserDataZHDto {
+
+    private String  userName;
+    private String  password;
+    private String  rePassword;
+    private List<Long> role;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/6
+ */
+@Data
+public class UserDataZZDto {
+    private List<JSONObject> certificate;
+}

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

@@ -82,4 +82,7 @@ public class PersonnelBusiness extends BaseEntity {
 	@TableField("foundation_id")
     private Long foundationId;
 
+
+    @TableField("user_type")
+    private String userType;
 }

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

@@ -41,7 +41,7 @@ public class RegionalCompanies extends BaseEntity {
     private String regionalCompaniesCode;
 
     /**
-     *  经销商业务单位id
+     *  经销商平台单位id
      */
 	@TableField("unit_id")
     private Long unitId;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PersonnelBusinessMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDtoUserDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * 人员业务信息表 Mapper 接口
@@ -10,5 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-09-01
  */
 public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
+    IPage<CompanyDtoUserDto> getCompanyDtoUserDtopage(@Param("dto") CompanyDtoUserDto dto);
 
+    Map<String,String> getorgcode(@Param("id")Long id);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPersonnelBusinessService.java

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDtoUserDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.UserDataDto;
+import org.apache.ibatis.annotations.Param;
+
 /**
  * 人员业务信息表接口类
  *
@@ -9,4 +14,7 @@ package com.yeejoin.amos.boot.module.hygf.api.service;
  */
 public interface IPersonnelBusinessService {
 
+    IPage<CompanyDtoUserDto> getCompanyDtoUserDto( CompanyDtoUserDto dto);
+    UserDataDto getPersonnelBusinessById(String id);
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/ContractTemplateMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.ContractTemplateMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.ContractTemplateMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/DesignInformationMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.DesignInformationMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.DesignInformationMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/DocumentBomMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.DocumentBomMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentBomMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/DocumentStationMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.DocumentStationMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/HouseholdContractMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdContractMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/PersonnelBusinessMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonnelBusinessMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper">
+
+    <select id="getCompanyDtoUserDtopage"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDtoUserDto">
+
+        select
+        std_user_biz.sequence_nbr sequenceNbr,
+        hygf_personnel_business.regional_companies_name regionalCompaniesName,
+
+        std_user_biz.amos_user_name amosUserName,
+
+        std_user_biz.real_name realName,
+
+        (case std_user_biz.lock_status
+        when "LOCK" THEN "禁用"
+        else "启用" end
+        )lockStatus,
+
+        std_user_biz.emergency_telephone emergencyTelephone,
+
+        (case hygf_personnel_business.user_type
+        when "1" THEN "普通用户"
+        else "管理员" end
+        )userType,
+        REGEXP_REPLACE(IFNULL(std_user_biz.position, ''), '\\[|\\]|\\"', '') position
+        from  std_user_biz LEFT join  hygf_personnel_business  on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
+
+
+        where std_user_biz.is_delete=0
+
+        <if test="dto.realName!=null">
+            and std_user_biz.real_name like concat(concat("%",#{dto.realName}),"%")
+        </if>
+        <if test="dto.lockStatus!=null">
+            and std_user_biz.lock_status=#{dto.lockStatus}
+        </if>
+        <if test="dto.amosUserName!=null">
+            and std_user_biz.amos_user_name=#{dto.amosUserName}
+        </if>
+        <if test="dto.amosUnitOrgCode!=null">
+            and hygf_personnel_business.amos_unit_org_code like concat(concat(#{dto.amosUnitOrgCode}),"%")
+        </if>
+
+
+
+
+
+    </select>
+
+    <select  id="getorgcode"  resultType="Map">
+
+select  ORG_CODE orgCode from  privilege_company  where privilege_company.SEQUENCE_NBR=#{id}
+
+    </select>
+
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/PersonnelQualificationsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonnelQualificationsMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelQualificationsMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/PowerStationMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.PowerStationMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/PreparationMoneyMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.PreparationMoneyMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/RegionalCompaniesMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionalCompaniesMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper">
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/SealDictionaryMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.SealDictionaryMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.SealDictionaryMapper">
 
 </mapper>

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

@@ -42,11 +42,7 @@
           <version>2.5.4</version>
       </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>

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDtoUserDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.UserDataDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
+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.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Date;
 import java.util.List;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PersonnelBusinessServiceImpl;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +45,10 @@ public class PersonnelBusinessController extends BaseController {
 
     @Autowired
     PersonnelBusinessServiceImpl personnelBusinessServiceImpl;
-
+    @Autowired
+    PublicAgencyUserMapper publicAgencyUserMapper;
+    @Autowired
+    PersonnelBusinessMapper personnelBusinessMapper;
     /**
      * 新增人员业务信息表
      *
@@ -113,4 +131,103 @@ public class PersonnelBusinessController extends BaseController {
 	public ResponseModel<List<PersonnelBusinessDto>> selectForList() {
 	    return ResponseHelper.buildResponse(personnelBusinessServiceImpl.queryForPersonnelBusinessList());
 	}
-}
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPersonnelBusinessPage")
+    @ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    public ResponseModel<IPage<CompanyDtoUserDto>> getPersonnelBusinessPage(CompanyDtoUserDto dto) {
+
+        return ResponseHelper.buildResponse(personnelBusinessServiceImpl.getCompanyDtoUserDto(dto));
+    }
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/savePersonnelBusiness")
+    @ApiOperation(httpMethod = "POST", value = "新增人员业务信息表", notes = "新增人员业务信息表")
+    public ResponseModel<PersonnelBusinessDto> savePersonnelBusiness(@RequestBody UserDataDto model) {
+        String  userid= getUserInfo().getUserId();
+        LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
+        qud.eq(PublicAgencyUser::getAmosUserId,userid);
+        PublicAgencyUser publicAgencyUse=  publicAgencyUserMapper.selectOne(qud);
+        LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+        qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
+        PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
+        //获取所属经销商
+        model.setAmosDealerId(personnelBusines.getAmosDealerId());
+       personnelBusinessServiceImpl.savePersonnelBusiness(model);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/updatePersonnelBusiness")
+    @ApiOperation(httpMethod = "POST", value = "新增人员业务信息表", notes = "新增人员业务信息表")
+    public ResponseModel<PersonnelBusinessDto> updatePersonnelBusiness(@RequestBody UserDataDto model ,long id) {
+
+        personnelBusinessServiceImpl.updatePersonnelBusiness(model, id);
+        return ResponseHelper.buildResponse(null);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPersonnelBusinessById")
+    @ApiOperation(httpMethod = "GET",value = "详情",  notes = "详情")
+    public ResponseModel<UserDataDto> getPersonnelBusinessById(String ids) {
+        return ResponseHelper.buildResponse(personnelBusinessServiceImpl.getPersonnelBusinessById(ids));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/setlook")
+    @ApiOperation(httpMethod = "GET",value = "详情",  notes = "详情")
+    public ResponseModel<UserDataDto> setlook(String id) {
+        FeignClientResult<List<String>> data=null;
+        PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
+        if("UNLOCK".equals(publicAgencyUser.getLockStatus())){
+            publicAgencyUser.setLockStatus("LOCK");
+            data= Privilege.agencyUserClient.lockUsers(publicAgencyUser.getAmosUserId());
+        }else{
+            publicAgencyUser.setLockStatus("UNLOCK");
+             data= Privilege.agencyUserClient.unlockUsers(publicAgencyUser.getAmosUserId());
+        }
+        if(data==null||data.getResult()==null){
+            throw new BadRequest("修改状态失败！");
+        }
+
+        publicAgencyUser.setLockTime(new Date());
+
+        publicAgencyUserMapper.updateById(publicAgencyUser);
+
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/czPassword")
+    @ApiOperation(httpMethod = "GET",value = "重置密码",  notes = "重置密码")
+    public ResponseModel<UserDataDto> czPassword(String id) {
+        PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
+
+        FeignClientResult<List<String>> data=Privilege.agencyUserClient.restorePassword(publicAgencyUser.getAmosUserId());
+
+        if(data==null||data.getResult()==null){
+            throw new BadRequest("修改状态失败！");
+        }
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/replace")
+    @ApiOperation(httpMethod = "GET",value = "更换管理员",  notes = "更换管理员")
+    public ResponseModel<UserDataDto> replace(String id) {
+       try {
+           personnelBusinessServiceImpl.replace(id);
+           return ResponseHelper.buildResponse(null);
+       }catch (Exception e){
+
+           throw new BadRequest("设置失败！");
+       }
+
+    }
+
+    }

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

@@ -10,6 +10,7 @@ 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.hwsms.SendSmsCode;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 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.biz.service.impl.DealerReviewServiceImpl;
@@ -20,6 +21,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.ApiParam;
@@ -77,6 +79,10 @@ public class UnitInfoController extends BaseController {
 
     @Value("${regionalCompanies.company.seq}")
     private Long regionalCompanies;
+    @Value("${dealer.group}")
+    private Long group;
+
+
     @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
 
@@ -93,6 +99,9 @@ public class UnitInfoController extends BaseController {
 
     @Autowired
     PublicAgencyUserMapper publicAgencyUserMapper;
+    @Autowired
+    PersonnelBusinessMapper personnelBusinessMapper;
+
 	/**
 	 * 验证码过期时间
 	 */
@@ -364,7 +373,7 @@ public class UnitInfoController extends BaseController {
 		String code = "";
 		Random random = new Random();
 		for (int i = 0; i < 6; i++) {
-			int r = random.nextInt(10);
+			int r = random.nextInt(10)+1;
 			code = code + r;
 		}
 		return code;
@@ -473,9 +482,17 @@ public class UnitInfoController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
     public ResponseModel<IPage<CompanyDto>> getCompanyModelList(CompanyDto dto) {
 
-        CompanyModel companyM = getUserInfo().getCompanys().get(0);
-        dto.setComid(companyM.getSequenceNbr());
-
+        String  userid= getUserInfo().getUserId();
+        LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
+        qud.eq(PublicAgencyUser::getAmosUserId,userid);
+        PublicAgencyUser publicAgencyUse=  publicAgencyUserMapper.selectOne(qud);
+        LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+        qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
+        PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
+        dto.setComid(personnelBusines.getAmosDealerId());
+
+        Map<String,String> map= personnelBusinessMapper.getorgcode(dto.getCompanyTreeid());
+        dto.setOrgCode(map.get("orgCode"));
         return ResponseHelper.buildResponse(unitInfoServiceImpl.getCompanyDto(dto));
     }
 
@@ -505,13 +522,44 @@ public class UnitInfoController extends BaseController {
     @GetMapping(value = "/getRegionalCompaniesTree")
     @ApiOperation(httpMethod = "GET", value = "区域公司", notes = "区域公司")
     public ResponseModel<List<RegionalCompanies>> getRegionalCompaniesTree() {
-        Long id=null;
+        String  userid= getUserInfo().getUserId();
+        LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
+        qud.eq(PublicAgencyUser::getAmosUserId,userid);
+
+        PublicAgencyUser publicAgencyUse=  publicAgencyUserMapper.selectOne(qud);
+        LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+        qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
+        PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
 
         LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
-        qu.eq(RegionalCompanies::getUnitId,id);
+        qu.eq(RegionalCompanies::getUnitId,personnelBusines.getAmosDealerId());
         List<RegionalCompanies> data= regionalCompaniesMapper.selectList(qu);
         return ResponseHelper.buildResponse(data);
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getGroupTree")
+    @ApiOperation(httpMethod = "GET", value = "经销商用户组", notes = "经销商用户组")
+    public ResponseModel<Collection<GroupModel>> getGroupTree() {
+
+        FeignClientResult<Collection<GroupModel>>  feignClientResult= Privilege.groupClient.selectForList(group,null);
+        Collection<GroupModel> children =  feignClientResult.getResult();
+        Collection<GroupModel> chil =new ArrayList<>();
+        for (GroupModel child : children) {
+            if("户用光伏-经销商".equals(child.getGroupName())||"用户光伏-微信农户".equals(child.getGroupName())){
+
+            }else{
+                chil.add(child);
+            }
+        }
+        return ResponseHelper.buildResponse(chil);
+    }
+
+
+
+
+
+
+
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
+import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPersonnelBusinessService;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PersonnelBusinessDto;
+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.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.precontrol.common.utils.DesUtil;
+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;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.*;
 
 /**
  * 人员业务信息表服务实现类
@@ -17,6 +40,19 @@ import java.util.List;
  */
 @Service
 public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessDto,PersonnelBusiness,PersonnelBusinessMapper> implements IPersonnelBusinessService {
+    @Autowired
+    PersonnelBusinessMapper personnelBusinessMapper;
+    @Autowired
+    PublicAgencyUserMapper publicAgencyUserMapper;
+    @Autowired
+    UnitInfoMapper unitInfoMapper;
+    @Value("${dealer.appcode}")
+    private String appCodes;
+    @Value("${amos.secret.key}")
+    String secretKey;
+
+    @Value("${hygf.user.group.id}")
+    private long userGroupId;
     /**
      * 分页查询
      */
@@ -30,4 +66,284 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
     public List<PersonnelBusinessDto> queryForPersonnelBusinessList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public IPage<CompanyDtoUserDto> getCompanyDtoUserDto(CompanyDtoUserDto dto) {
+
+        Map<String,String> map= personnelBusinessMapper.getorgcode(dto.getAmosUnitId());
+        dto.setAmosUnitOrgCode(map.get("orgCode"));
+        IPage<CompanyDtoUserDto> pag = personnelBusinessMapper.getCompanyDtoUserDtopage(dto);
+
+        return pag;
+    }
+
+    @Transactional
+    public void  savePersonnelBusiness(UserDataDto model){
+        UserDataZHDto userDataZHDto= model.getUserDataZHDto();
+        UserDataJBDto userDataJBDto= model.getUserDataJBDto();
+        FeignClientResult<AgencyUserModel> userResult =null;
+       //新增平台用户
+        try {
+            // 1 创建平台用户
+            List<RoleModel> userRoleList = new ArrayList<>();
+            AgencyUserModel agencyUserModel = new AgencyUserModel();
+            agencyUserModel.setUserName(userDataZHDto.getUserName());
+            agencyUserModel.setRealName(userDataJBDto.getRealName());
+            agencyUserModel.setLockStatus("UNLOCK");
+            agencyUserModel.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
+            agencyUserModel.setRePassword(DesUtil.encode(userDataZHDto.getRePassword(), secretKey));
+            agencyUserModel.setAgencyCode("JXIOP");
+            agencyUserModel.setMobile(userDataJBDto.getEmergencyTelephone());
+            List<String> split = Arrays.asList(StringUtils.split(appCodes, ','));
+            Map<Long, List<Long>> roleSeqMap = new HashMap<>();
+            Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
+            roleSeqMap.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userDataZHDto.getRole());
+            orgRoles.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userRoleList);
+            agencyUserModel.setAppCodes(split);
+            agencyUserModel.setOrgRoles(orgRoles);
+            agencyUserModel.setOrgRoleSeqs(roleSeqMap);
+            // 将创建用户加入用户组
+             userResult = Privilege.agencyUserClient.create(agencyUserModel);
+            if (userResult == null || userResult.getResult() == null) {
+                throw new BadRequest("新增人员失败！");
+            }
+            List<String> userId = new ArrayList<>();
+            userId.add(userResult.getResult().getUserId());
+            for (Long aLong : userDataZHDto.getRole()) {
+                Privilege.groupUserClient.create(aLong, userId);
+            }
+
+
+            //新增人员基础信息表
+            PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
+            publicAgencyUser.setRealName(userDataJBDto.getRealName());
+            publicAgencyUser.setGender(userDataJBDto.getGender());
+            publicAgencyUser.setJobNumber(userDataJBDto.getJobNumber());
+            publicAgencyUser.setIdType(userDataJBDto.getIdType());
+            publicAgencyUser.setIdNumber(userDataJBDto.getIdNumber());
+            publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
+
+            FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
+            if (companyResult == null || companyResult.getResult() == null) {
+                throw new BadRequest("新增人员失败");
+            }
+            publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
+            publicAgencyUser.setAmosUserId(userResult.getResult().getUserId());
+            publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
+            publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
+            publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
+            publicAgencyUser.setLockStatus("UNLOCK");
+            publicAgencyUser.setLockTime(new Date());
+            publicAgencyUser.setHeight(userDataJBDto.getHeight());
+            publicAgencyUser.setWeight(userDataJBDto.getWeight());
+            publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
+            publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
+            publicAgencyUser.setPosition(JSON.toJSONString(userDataJBDto.getPosition()));
+            publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
+            publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
+            publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
+            publicAgencyUserMapper.insert(publicAgencyUser);
+
+            PersonnelBusiness re=new PersonnelBusiness();
+            FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
+            if (companyResult1 == null || companyResult1.getResult() == null) {
+                throw new BadRequest("新增人员失败");
+            }
+            re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
+            re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
+            re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode());
+            re.setCertificate(model.getUserDataZZDto()!=null?JSON.toJSONString(model.getUserDataZZDto().getCertificate()):null);
+            re.setAmosUnitId(companyResult.getResult().getSequenceNbr());
+            re.setAmosUnitName(companyResult.getResult().getCompanyName());
+            re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
+            re.setFoundationId(publicAgencyUser.getSequenceNbr());
+            re.setAmosDealerId(model.getAmosDealerId());
+            personnelBusinessMapper.insert(re);
+
+        }catch (Exception e){
+            if (userResult != null && userResult.getResult() != null
+                    && StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
+                Privilege.agencyUserClient.multDeleteUser(userResult.getResult().getUserId());
+            }
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage());
+        }
+
+    }
+
+
+    @Transactional
+    public void  updatePersonnelBusiness( UserDataDto model ,long id){
+
+        PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
+
+
+        UserDataZHDto userDataZHDto= model.getUserDataZHDto();
+        UserDataJBDto userDataJBDto= model.getUserDataJBDto();
+        FeignClientResult<AgencyUserModel> userResult =null;
+
+        try {
+            // 1 修改平台用户
+            List<RoleModel> userRoleList = new ArrayList<>();
+            AgencyUserModel agencyUserModel = new AgencyUserModel();
+            agencyUserModel.setUserName(userDataZHDto.getUserName());
+            agencyUserModel.setRealName(userDataJBDto.getRealName());
+            agencyUserModel.setLockStatus("UNLOCK");
+            agencyUserModel.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
+            agencyUserModel.setRePassword(DesUtil.encode(userDataZHDto.getRePassword(), secretKey));
+            agencyUserModel.setAgencyCode("JXIOP");
+            agencyUserModel.setMobile(userDataJBDto.getEmergencyTelephone());
+            List<String> split = Arrays.asList(StringUtils.split(appCodes, ','));
+            Map<Long, List<Long>> roleSeqMap = new HashMap<>();
+            Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
+            roleSeqMap.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userDataZHDto.getRole());
+            orgRoles.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userRoleList);
+            agencyUserModel.setAppCodes(split);
+            agencyUserModel.setOrgRoles(orgRoles);
+            agencyUserModel.setOrgRoleSeqs(roleSeqMap);
+            // 将创建用户加入用户组
+            userResult = Privilege.agencyUserClient.update(agencyUserModel,publicAgencyUser.getAmosUserId());
+            if (userResult == null || userResult.getResult() == null) {
+                throw new BadRequest("修改人员失败！");
+            }
+            List<String> userId = new ArrayList<>();
+            userId.add(userResult.getResult().getUserId());
+            for (Long aLong : userDataZHDto.getRole()) {
+                Privilege.groupUserClient.create(aLong, userId);
+            }
+
+
+            //修改人员基础信息表
+            publicAgencyUser.setRealName(userDataJBDto.getRealName());
+            publicAgencyUser.setGender(userDataJBDto.getGender());
+            publicAgencyUser.setJobNumber(userDataJBDto.getJobNumber());
+            publicAgencyUser.setIdType(userDataJBDto.getIdType());
+            publicAgencyUser.setIdNumber(userDataJBDto.getIdNumber());
+            publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
+
+            FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
+            if (companyResult == null || companyResult.getResult() == null) {
+                throw new BadRequest("修改人员失败");
+            }
+            publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
+            publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
+            publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
+            publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
+            publicAgencyUser.setLockStatus("UNLOCK");
+            publicAgencyUser.setLockTime(new Date());
+            publicAgencyUser.setHeight(userDataJBDto.getHeight());
+            publicAgencyUser.setWeight(userDataJBDto.getWeight());
+            publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
+            publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
+            publicAgencyUser.setPosition(JSON.toJSONString(userDataJBDto.getPosition()));
+            publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
+            publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
+            publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
+            publicAgencyUserMapper.updateById(publicAgencyUser);
+
+
+            LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+            qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUser.getSequenceNbr());
+            PersonnelBusiness re=personnelBusinessMapper.selectOne(qug);
+
+            FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
+            if (companyResult1 == null || companyResult1.getResult() == null) {
+                throw new BadRequest("修改人员失败");
+            }
+            re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
+            re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
+            re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode());
+            re.setCertificate(model.getUserDataZZDto()!=null?JSON.toJSONString(model.getUserDataZZDto().getCertificate()):null);
+            re.setAmosUnitId(companyResult.getResult().getSequenceNbr());
+            re.setAmosUnitName(companyResult.getResult().getCompanyName());
+            re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
+            personnelBusinessMapper.updateById(re);
+
+        }catch (Exception e){
+
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage());
+        }
+
+    }
+
+
+
+
+
+
+
+
+    @Transactional
+    public void replace(String id){
+        //获取当前用户
+        LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
+        qud.eq(PublicAgencyUser::getSequenceNbr,id);
+        PublicAgencyUser publicAgencyUse=  publicAgencyUserMapper.selectOne(qud);
+        LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+        qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
+        PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
+        personnelBusines.setUserType("2");
+        personnelBusinessMapper.updateById(personnelBusines);
+       //获取经销商管理员
+        LambdaQueryWrapper<UnitInfo> qudg=new LambdaQueryWrapper<>();
+        qudg.eq(UnitInfo::getAmosCompanySeq,personnelBusines.getAmosDealerId());
+        UnitInfo unitInfo= unitInfoMapper.selectOne(qudg);
+
+        LambdaQueryWrapper<PublicAgencyUser> qudx=new LambdaQueryWrapper<>();
+        qudx.eq(PublicAgencyUser::getAmosUserId,unitInfo.getAdminUserId());
+        PublicAgencyUser publicAgencyUsex=  publicAgencyUserMapper.selectOne(qudx);
+        LambdaQueryWrapper<PersonnelBusiness> qugf=new LambdaQueryWrapper<>();
+        qugf.eq(PersonnelBusiness::getFoundationId,publicAgencyUsex.getSequenceNbr());
+        PersonnelBusiness personnelBusinesx=personnelBusinessMapper.selectOne(qugf);
+        personnelBusinesx.setUserType("1");
+
+        personnelBusinessMapper.updateById(personnelBusinesx);
+        unitInfo.setAdminLoginName(publicAgencyUse.getAmosUserName());
+        unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
+        unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
+        unitInfo.setAdminUserName(publicAgencyUse.getRecUserName());
+        unitInfoMapper.updateById(unitInfo);
+
+        List<String> userId = new ArrayList<>();
+        userId.add(publicAgencyUse.getAmosUserId());
+        List<String> userId1 = new ArrayList<>();
+        userId1.add(publicAgencyUsex.getAmosUserId());
+
+
+        //修改新管理员
+        Privilege.groupUserClient.create(userGroupId, userId);
+
+
+        //修改旧管理员
+        Privilege.groupUserClient.create(1679675395965743106L, userId1);
+    }
+
+
+    @Override
+   public UserDataDto getPersonnelBusinessById(String id){
+
+        LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
+        qud.eq(PublicAgencyUser::getSequenceNbr,id);
+        PublicAgencyUser publicAgencyUse=  publicAgencyUserMapper.selectOne(qud);
+
+        LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+        qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
+        PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
+
+        UserDataZHDto userDataZHDto=new UserDataZHDto();
+        UserDataJBDto userDataJBDto=new UserDataJBDto();
+        UserDataZZDto userDataZZDto=new UserDataZZDto();
+
+        userDataZZDto.setCertificate(personnelBusines.getCertificate()!=null?JSONArray.parseArray(personnelBusines.getCertificate(), JSONObject.class):null);
+        userDataZHDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(),long.class));
+        userDataZHDto.setUserName(publicAgencyUse.getAmosUserName());
+
+        BeanUtils.copyProperties(publicAgencyUse,userDataJBDto);
+        userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(),String.class));
+        userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq()!=null?personnelBusines.getRegionalCompaniesSeq().toString():null);
+        userDataJBDto.setAmosUnitId(personnelBusines.getAmosUnitId());
+        return new UserDataDto( userDataZHDto, userDataJBDto ,  userDataZZDto);
+    }
+
 }
\ No newline at end of file

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

@@ -181,7 +181,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
             List<RegionalCompanies> regionalCompanies= regUnitInfo.getRegionalCompanies();
             for (RegionalCompanies regionalCompany : regionalCompanies) {
-                regionalCompany.setUnitId(commerceInfo.getSequenceNbr());
+                regionalCompany.setUnitId(regUnitInfo.getAmosCompanySeq());
             }
             regionalCompaniesService.saveBatch(regionalCompanies);
 
@@ -194,6 +194,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             publicAgencyUser.setRealName(regUnitInfo.getAdminLoginName());
             publicAgencyUser.setRole("["+regUnitInfo.getRoleId()+"]");
             publicAgencyUser.setEmergencyTelephone(regUnitInfo.getAdminPhone());
+            publicAgencyUser.setLockStatus("LOCK");
             publicAgencyUserMapper.insert(publicAgencyUser);
 
 
@@ -202,6 +203,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             re.setAmosUnitName(regUnitInfo.getName());
             re.setAmosUnitOrgCode(regUnitInfo.getAmosCompanyCode());
             re.setFoundationId(publicAgencyUser.getSequenceNbr());
+            re.setUserType("2");
             personnelBusinessMapper.insert(re);
             model.setCommerceInfoDto(commerceInfo);
             model.setUnitInfoDto(regUnitInfo);
@@ -300,8 +302,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         CompanyModel companyInfo = new CompanyModel();
         FeignClientResult<AgencyUserModel> userResult = null;
         try {
-           // FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
-           // List<RoleModel> allRoleList = roleListResult.getResult();
+            FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
+            List<RoleModel> allRoleList = roleListResult.getResult();
             List<RoleModel> userRoleList = new ArrayList<>();
             List<Long> roleIds = new ArrayList<>();
             // 1创建公司
@@ -335,14 +337,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             List<String> split = Arrays.asList(StringUtils.split(appCodes, ','));
             Map<Long, List<Long>> roleSeqMap = new HashMap<>();
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
-//            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(regUnitInfo.getUnitTypeCode()))
-//                    .collect(Collectors.toList());
-//            userRoleList.forEach(r -> {
-//                if (!roleIds.contains(r.getSequenceNbr())) {
-//                    roleIds.add(r.getSequenceNbr());
-//                }
-//            });
-            roleIds.add(Long.valueOf(regUnitInfo.getRoleId()));
+            userRoleList = allRoleList.stream().filter(r -> r.getSequenceNbr().toString().equals(regUnitInfo.getRoleId()))
+                    .collect(Collectors.toList());
+            userRoleList.forEach(r -> {
+                if (!roleIds.contains(r.getSequenceNbr())) {
+                    roleIds.add(r.getSequenceNbr());
+                }
+            });
+           // roleIds.add(Long.valueOf(regUnitInfo.getRoleId()));
             roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
             orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
             agencyUserModel.setAppCodes(split);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

 ## DB properties:
-spring.datasource.url=jdbc:mysql://172.16.10.220:3306/hygf_database?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.10.220:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 ## eureka properties:
@@ -78,7 +78,7 @@ amos.secret.key=qaz
 # if your service can't be access ,you can use this setting , you need change ip as your.
 #eureka.instance.prefer-ip-address=true
 #eureka.instance.ip-address=172.16.3.122
-spring.activemq.broker-url=tcp://139.9.173.44:61616
+spring.activemq.broker-url=tcp://172.16.10.220:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false
@@ -95,18 +95,18 @@ sms.huawei.url=https://smsapi.cn-north-4.myhuaweicloud.com:443/sms/batchSendSms/
 sms.huawei.appKey=n3FYPWO7Heo1ze212QRBvF4VA2E2
 sms.huawei.appSecret=IFhiMpWROi7w4Ei21ZbfIjKyt97b
 # ģ��id
-sms.huawei.templateId=6aaeb4bf916d4db0a1942c598912519e
+sms.huawei.templateId=67931857f6f74e119fadc429bc25a531
 # ǩ��ͨ����
 sms.huawei.sender=1069368924410006092
 # 签名名称
-sms.huawei.signature=华为云短信测试
+sms.huawei.signature=江西电建
 
 # ���pageIdȷ��
 power.station.examine.pageId=1680853427061551106
 # ��վ��˼ƻ�id
 power.station.examine.planId=c4ed1873-0dc6-4518-a7a9-dbc588ef35e5
 # �û���userGroupId
-hygf.user.group.id=1679755750924120066
+hygf.user.group.id=1678211468450885633
 
 
 unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
@@ -144,5 +144,8 @@ farmer.registerPassword=a123456
 
 #经销商单位父节点id
 dealer.managementUnitId=1678209772383399937
-#经销商管理员角色名称
+#经销商管理员角色
 dealer.roleId=1678211468450885633
+
+#查询经销商用户组
+dealer.group=1681241774938419202
\ No newline at end of file

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

@@ -246,7 +246,7 @@ public class LargeScreenImpl {
         int month = currentDate.getMonthValue();
 
         QueryWrapper<StationPlan> wrapper = new QueryWrapper<>();
-        wrapper.select("sum(value) as sum_value");
+        wrapper.select("ifnull(sum(value), 0) as sum_value");
         wrapper.eq("monthly", month);
         List<Map<String, Object>> list = StationPlanMapper.selectMaps(wrapper);
         Double sumValue = list != null && !list.isEmpty() ? (Double) list.get(0).get("sum_value") : 0;
@@ -256,8 +256,8 @@ public class LargeScreenImpl {
 
         mapdta.put("YJHWC", ybfb);
         QueryWrapper<StationPlan> wrapper1 = new QueryWrapper<>();
-        wrapper1.select("sum(value) as sum_value");
-        List<Map<String, Object>> list1 = StationPlanMapper.selectMaps(wrapper);
+        wrapper1.select("ifnull(sum(value), 0) as sum_value");
+        List<Map<String, Object>> list1 = StationPlanMapper.selectMaps(wrapper1);
         Double sumValuen = list1 != null && !list1.isEmpty() ? (Double) list1.get(0).get("sum_value") : 0;
         Double ybfbn = sumValuen > 0 ? mapdta.get("NFD") / sumValue * 100 : 0;
         ybfbn = new BigDecimal(ybfbn).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/StationCacheInfoDto.java

@@ -12,6 +12,8 @@ public class StationCacheInfoDto implements Serializable {
     private String stationName;
     //场站类型
     private String stationType;
+    //场站类型
+    private String stationNumber;
     //所属省份
     private String belongProvince;
     //所属片区

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

@@ -13,9 +13,11 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationCoordinateMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
 import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
 import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,44 +92,116 @@ public class MonitoringServiceImpl {
      * @param provinceName
      * @return
      */
+//    public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type) {
+//        List<RegionNationWideDto> regionNationWideDtoList = new ArrayList<>();
+//        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
+//        List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
+//        List<StationBasic> list = new ArrayList<>();
+//        //如果 provinceName 为空则表示当前为全国地图 否则则为省份地图
+////        if (ObjectUtils.isEmpty(provinceName) || provinceName.equals("")) {
+//        if ((!ObjectUtils.isEmpty(type) && type.equals("gis")) && (ObjectUtils.isEmpty(provinceName) || provinceName.equals(""))) {
+//            for (int i = 0; i < regionList.size(); i++) {
+//                RegionNationWideDto regionNationWideDto = new RegionNationWideDto();
+//                AtomicReference<Double> guangfuMW = new AtomicReference<>(0.0);
+//                AtomicReference<Double> fengdianMW = new AtomicReference<>(0.0);
+//                AtomicReference<Integer> guangfu = new AtomicReference<>(0);
+//                AtomicReference<Integer> fengdian = new AtomicReference<>(0);
+//                Region region = regionList.get(i);
+//                list = stationBasicList.stream().filter(stationBasic -> stationBasic.getBelongArea().contains(String.valueOf(region.getRegionCode()))).collect(Collectors.toList());
+//                list.forEach(stationBasic -> {
+//                    if (!ObjectUtils.isEmpty(stationBasic.getFanGatewayId()) && !ObjectUtils.isEmpty(stationBasic.getStationNumber())) {
+//                        regionNationWideDto.setJsJoin(true);
+//                    }
+//                    if (stationBasic.getStationType().equals("FDZ")) {
+//                        fengdianMW.set(getStationCaPACITYL(stationBasic.getStationNumber()));
+//                        fengdian.getAndSet(fengdian.get() + 1);
+//                    } else {
+//                        guangfuMW.set(getStationCaPACITYL(stationBasic.getStationNumber()));
+//                        guangfu.getAndSet(guangfu.get() + 1);
+//                    }
+//                });
+//                regionNationWideDto.setFengdian(fengdian.toString());
+//                regionNationWideDto.setGuangfu(guangfu.toString());
+//                regionNationWideDto.setGuangfuMW("0");
+//                regionNationWideDto.setFengdianMV("0");
+//                if (!ObjectUtils.isEmpty(guangfuMW.get())) {
+//                    regionNationWideDto.setGuangfuMW(String.format("%.2f", guangfuMW.get()));
+//                }
+//                if (!ObjectUtils.isEmpty(fengdianMW.get())) {
+//                    regionNationWideDto.setFengdianMV(String.format("%.2f", fengdianMW.get()));
+//                }
+//                regionNationWideDto.setName(region.getRegionName());
+//                regionNationWideDtoList.add(regionNationWideDto);
+//            }
+//        } else {
+//            if (!ObjectUtils.isEmpty(provinceName) && provinceName.contains("%")) {
+//                try {
+//                    provinceName = URLDecoder.decode(provinceName, "UTF-8");
+//                } catch (Exception e) {
+//
+//                }
+//            }
+//            String finalProvinceName = provinceName;
+//            if (!ObjectUtils.isEmpty(type) && type.equals("station")) {
+//                list = stationBasicList;
+//            } else {
+//                Region region = regionList.stream().filter(region1 -> region1.getRegionName().equals(finalProvinceName)).collect(Collectors.toList()).get(0);
+//                list = stationBasicList.stream().filter(stationBasic -> stationBasic.getBelongArea().contains(String.valueOf(region.getRegionCode())) && stationBasic.getFanGatewayId() != null).collect(Collectors.toList());
+//            }
+//            List<StationCoordinate> stationCoordinateList = stationCoordinateMapper.selectList(new QueryWrapper<StationCoordinate>().isNotNull("station_id").eq("is_main_coordinate", 0));
+//            for (int i = 0; i < list.size(); i++) {
+//                HashMap<String, Double> hashMap = new HashMap<>();
+//                StationBasic stationBasic = list.get(i);
+//                RegionNationWideDto regionNationWideDto = new RegionNationWideDto();
+//                regionNationWideDto.setStaitionId(String.valueOf(stationBasic.getSequenceNbr()));
+//                regionNationWideDto.setStaitionName(stationBasic.getStationName());
+//                regionNationWideDto.setStaitionType(stationBasic.getStationType());
+//                String speendOrirradiate = "";
+//                regionNationWideDto.setStationCapacity(String.valueOf(getStationCaPACITYL(stationBasic.getStationNumber())));
+//                if (stationBasic.getStationType().equals("FDZ")) {
+//                    speendOrirradiate = String.valueOf(commonServiceImpl.getAvgvalueByIndicatior(stationBasic.getFanGatewayId(), "30秒平均风速"));
+//                } else {
+//                    speendOrirradiate = String.valueOf(commonServiceImpl.getTotalByIndicatior(stationBasic.getBoosterGatewayId(), "WTX-801_25_WTX-801_总辐射"));
+//                }
+//                regionNationWideDto.setSpeendOrirradiate(speendOrirradiate);
+//                StationCoordinate stationCoordinate = stationCoordinateList.stream().filter(stationCoordinate1 -> stationCoordinate1.getStationId().equals(stationBasic.getSequenceNbr())).collect(Collectors.toList()).get(0);
+//                hashMap.put("lng", Double.valueOf(stationCoordinate.getLongitude()));
+//                hashMap.put("lat", Double.valueOf(stationCoordinate.getLaitude()));
+//                regionNationWideDto.setPosition(hashMap);
+//                regionNationWideDtoList.add(regionNationWideDto);
+//            }
+//        }
+//        List<StationBasic> finalList = list;
+//        String finalProvinceName1 = provinceName;
+//        Thread thread = new Thread(() -> {
+//            getCompletionOfPowerIndicatorsByCurrentData(finalList, finalProvinceName1);
+//        });
+//        thread.start();
+//        return regionNationWideDtoList;
+//    }
     public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type) {
         List<RegionNationWideDto> regionNationWideDtoList = new ArrayList<>();
-        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
+        List<StationCacheInfoDto> stationCacheInfoDtoList=commonServiceImpl.getListStationCacheInfoDto();
         List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
-        List<StationBasic> list = new ArrayList<>();
+        List<StationCacheInfoDto> list = new ArrayList<>();
         //如果 provinceName 为空则表示当前为全国地图 否则则为省份地图
 //        if (ObjectUtils.isEmpty(provinceName) || provinceName.equals("")) {
         if ((!ObjectUtils.isEmpty(type) && type.equals("gis")) && (ObjectUtils.isEmpty(provinceName) || provinceName.equals(""))) {
             for (int i = 0; i < regionList.size(); i++) {
                 RegionNationWideDto regionNationWideDto = new RegionNationWideDto();
-                AtomicReference<Double> guangfuMW = new AtomicReference<>(0.0);
-                AtomicReference<Double> fengdianMW = new AtomicReference<>(0.0);
-                AtomicReference<Integer> guangfu = new AtomicReference<>(0);
-                AtomicReference<Integer> fengdian = new AtomicReference<>(0);
                 Region region = regionList.get(i);
-                list = stationBasicList.stream().filter(stationBasic -> stationBasic.getBelongArea().contains(String.valueOf(region.getRegionCode()))).collect(Collectors.toList());
-                list.forEach(stationBasic -> {
-                    if (!ObjectUtils.isEmpty(stationBasic.getFanGatewayId()) && !ObjectUtils.isEmpty(stationBasic.getStationNumber())) {
+                list = stationCacheInfoDtoList.stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getBelongProvince().equals(region.getRegionName())).collect(Collectors.toList());
+                List<StationCacheInfoDto> fdlist=list.stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getStationType().equals("FDZ")).collect(Collectors.toList());
+                List<StationCacheInfoDto> gflist=list.stream().filter(stationCacheInfoDto -> !stationCacheInfoDto.getStationType().equals("FDZ")).collect(Collectors.toList());
+                if (list.size() > 0) {
                     regionNationWideDto.setJsJoin(true);
-                    }
-                    if (stationBasic.getStationType().equals("FDZ")) {
-                        fengdianMW.set(getStationCaPACITYL(stationBasic.getStationNumber()));
-                        fengdian.getAndSet(fengdian.get() + 1);
                 } else {
-                        guangfuMW.set(getStationCaPACITYL(stationBasic.getStationNumber()));
-                        guangfu.getAndSet(guangfu.get() + 1);
-                    }
-                });
-                regionNationWideDto.setFengdian(fengdian.toString());
-                regionNationWideDto.setGuangfu(guangfu.toString());
-                regionNationWideDto.setGuangfuMW("0");
-                regionNationWideDto.setFengdianMV("0");
-                if (!ObjectUtils.isEmpty(guangfuMW.get())) {
-                    regionNationWideDto.setGuangfuMW(String.format("%.2f", guangfuMW.get()));
-                }
-                if (!ObjectUtils.isEmpty(fengdianMW.get())) {
-                    regionNationWideDto.setFengdianMV(String.format("%.2f", fengdianMW.get()));
+                    regionNationWideDto.setJsJoin(false);
                 }
+                regionNationWideDto.setFengdian(String.valueOf(fdlist.size()));
+                regionNationWideDto.setGuangfu(String.valueOf(gflist.size()));
+                regionNationWideDto.setGuangfuMW(String.format("%.2f",gflist.stream().mapToDouble(stationCacheInfoDto->Double.parseDouble(stationCacheInfoDto.getInstalledCapacity())).sum()));
+                regionNationWideDto.setFengdianMV(String.format("%.2f",fdlist.stream().mapToDouble(stationCacheInfoDto->Double.parseDouble(stationCacheInfoDto.getInstalledCapacity())).sum()));
                 regionNationWideDto.setName(region.getRegionName());
                 regionNationWideDtoList.add(regionNationWideDto);
             }
@@ -141,35 +215,34 @@ public class MonitoringServiceImpl {
             }
             String finalProvinceName = provinceName;
             if (!ObjectUtils.isEmpty(type) && type.equals("station")) {
-                list = stationBasicList;
+                list = stationCacheInfoDtoList;
             } else {
-                Region region = regionList.stream().filter(region1 -> region1.getRegionName().equals(finalProvinceName)).collect(Collectors.toList()).get(0);
-                list = stationBasicList.stream().filter(stationBasic -> stationBasic.getBelongArea().contains(String.valueOf(region.getRegionCode())) && stationBasic.getFanGatewayId() != null).collect(Collectors.toList());
+                list = stationCacheInfoDtoList.stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getBelongProvince().equals(finalProvinceName)).collect(Collectors.toList());
             }
             List<StationCoordinate> stationCoordinateList = stationCoordinateMapper.selectList(new QueryWrapper<StationCoordinate>().isNotNull("station_id").eq("is_main_coordinate", 0));
             for (int i = 0; i < list.size(); i++) {
                 HashMap<String, Double> hashMap = new HashMap<>();
-                StationBasic stationBasic = list.get(i);
+                StationCacheInfoDto stationCacheInfoDto = list.get(i);
                 RegionNationWideDto regionNationWideDto = new RegionNationWideDto();
-                regionNationWideDto.setStaitionId(String.valueOf(stationBasic.getSequenceNbr()));
-                regionNationWideDto.setStaitionName(stationBasic.getStationName());
-                regionNationWideDto.setStaitionType(stationBasic.getStationType());
+                regionNationWideDto.setStaitionId(String.valueOf(stationCacheInfoDto.getStationId()));
+                regionNationWideDto.setStaitionName(stationCacheInfoDto.getStationName());
+                regionNationWideDto.setStaitionType(stationCacheInfoDto.getStationType());
                 String speendOrirradiate = "";
-                regionNationWideDto.setStationCapacity(String.valueOf(getStationCaPACITYL(stationBasic.getStationNumber())));
-                if (stationBasic.getStationType().equals("FDZ")) {
-                    speendOrirradiate = String.valueOf(commonServiceImpl.getAvgvalueByIndicatior(stationBasic.getFanGatewayId(), "30秒平均风速"));
+                regionNationWideDto.setStationCapacity(stationCacheInfoDto.getInstalledCapacity());
+                if (stationCacheInfoDto.getStationType().equals("FDZ")) {
+                    speendOrirradiate = String.valueOf(commonServiceImpl.getAvgvalueByIndicatior(stationCacheInfoDto.getFanGatewayId(), "30秒平均风速"));
                 } else {
-                    speendOrirradiate = String.valueOf(commonServiceImpl.getTotalByIndicatior(stationBasic.getBoosterGatewayId(), "WTX-801_25_WTX-801_总辐射"));
+                    speendOrirradiate = String.valueOf(commonServiceImpl.getTotalByIndicatior(stationCacheInfoDto.getBoosterGatewayId(), "WTX-801_25_WTX-801_总辐射"));
                 }
                 regionNationWideDto.setSpeendOrirradiate(speendOrirradiate);
-                StationCoordinate stationCoordinate = stationCoordinateList.stream().filter(stationCoordinate1 -> stationCoordinate1.getStationId().equals(stationBasic.getSequenceNbr())).collect(Collectors.toList()).get(0);
+                StationCoordinate stationCoordinate = stationCoordinateList.stream().filter(stationCoordinate1 -> String.valueOf(stationCoordinate1.getStationId()).equals(stationCacheInfoDto.getStationId())).collect(Collectors.toList()).get(0);
                 hashMap.put("lng", Double.valueOf(stationCoordinate.getLongitude()));
                 hashMap.put("lat", Double.valueOf(stationCoordinate.getLaitude()));
                 regionNationWideDto.setPosition(hashMap);
                 regionNationWideDtoList.add(regionNationWideDto);
             }
         }
-        List<StationBasic> finalList = list;
+        List<StationCacheInfoDto> finalList = list;
         String finalProvinceName1 = provinceName;
         Thread thread = new Thread(() -> {
             getCompletionOfPowerIndicatorsByCurrentData(finalList, finalProvinceName1);
@@ -244,7 +317,7 @@ public class MonitoringServiceImpl {
         return resultsData;
     }
 
-    public void getCompletionOfPowerIndicatorsByCurrentData(List<StationBasic> stationBasicList, String provinceName) {
+    public void getCompletionOfPowerIndicatorsByCurrentData(List<StationCacheInfoDto> stationBasicList, String provinceName) {
         String provinceNameTopic = "";
         if (provinceName.contains("黑龙江") || provinceName.contains("内蒙古")) {
             provinceNameTopic = provinceName.substring(0, 3);
@@ -275,7 +348,11 @@ public class MonitoringServiceImpl {
         AtomicReference<Double> installCapacity = new AtomicReference<>(0.0);
         stationBasicList.forEach(stationBasic -> {
             List<Map<String, Object>> mapList = new ArrayList<>();
+            Map<String,List<String>> queryMap = new HashMap<>();
+            queryMap.put("equipmentIndexName.keyword",Arrays.asList("日发电量","月发电量","年发电量"));
+            queryMap.put("gatewayId.keyword",Arrays.asList(stationBasic.getFanGatewayId()));
             if (stationBasic.getStationType().equals("FDZ")) {
+                List<? extends Terms.Bucket> lidatesum  =commonServiceImpl.getgroupsum(queryMap,"valueDouble","equipmentIndexName.keyword", ESEquipments.class);
                 mapList = influxdbUtil.query("SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " where  (equipmentIndexName='日发电量' or  equipmentIndexName='月发电量' or equipmentIndexName='年发电量' )");
             } else {
                 mapList = influxdbUtil.query("SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " where frontModule=~/逆变器/ and (equipmentIndexName='日发电量' or  equipmentIndexName='月发电量' or equipmentIndexName='年发电量' )");