Merge remote-tracking branch 'origin/developer' into developer

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

@@ -132,6 +132,15 @@ public class WorkOrder extends BaseEntity {
     private String amosDealerOrgCode;
 
 
+    @ApiModelProperty(value = "工程负责人userId")
+    @TableField("project_region_manager_user_id")
+    private String projectRegionManagerUserId;
+
+    @ApiModelProperty(value = "工程负责人userId")
+    @TableField("construction_region_manager_user_id")
+    private String constructionRegionManagerUserId;
+
+
 
 
 

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

@@ -25,9 +25,13 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
     Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto);
     //List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
     List< Map<String,Object>> getuserListByOrgCode(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosOrgCode") String amosOrgCode);
+    List< Map<String,Object>> getuserListAllByOrgCode(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosOrgCode") String amosOrgCode);
   @UserEmpower(field ={},dealerField ={"hygf_personnel_business.amos_unit_org_code","hygf_personnel_business.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
   List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
 
+
+    List< Map<String,Object>> getUserTelephoneByUserId(@Param("userId") String userId);
+
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
     List<UnitInfo>   getlistUnitInfo();
 
@@ -39,4 +43,6 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
    Integer getUserListPauCount(String phone, String userName);
 
     Integer getUserListSubCount(String phone, String userName);
+
+    Integer getUserListAliCount(String phone, String userName);
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +21,5 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
     @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<WorkOrderPage> queryForwgpage(@Param("dto") WorkOrderPage dto);
 
+    String getRealNameByUserId(String userId);
 }

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

@@ -90,6 +90,32 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
 
     </select>
 
+    <select id="getuserListAllByOrgCode" resultType="Map">
+
+        select
+        std_user_biz.real_name realName,
+        std_user_biz.amos_user_id amosUserId
+        from
+        std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
+
+        <where>
+            <if test="role!=null">
+                and std_user_biz.role like concat(concat("%",#{role}),"%")
+            </if>
+            <if test="regionalCompaniesSeq!=null">
+                and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
+            </if>
+            <if test="amosOrgCode!=null">
+                and hygf_personnel_business.amos_unit_org_code like concat ('%',#{amosOrgCode},'%')
+            </if>
+            <if test="userName!=null">
+                and  std_user_biz.amos_user_id=#{userName}
+            </if>
+        </where>
+
+
+    </select>
+
 
     <select id="getuserListtelephone" resultType="Map">
 
@@ -117,6 +143,20 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
 
     </select>
 
+    <select id="getUserTelephoneByUserId" resultType="Map">
+        select
+        std_user_biz.emergency_telephone  emergencyTelephone
+        from
+        std_user_biz
+        <where>
+            <if test="userId!=null">
+                and  std_user_biz.amos_user_id=#{userId}
+            </if>
+        </where>
+        LIMIT 1
+
+    </select>
+
 
     <select id="getlistUnitInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo">
 
@@ -165,4 +205,17 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
         </where>
     </select>
 
+    <select id="getUserListAliCount" resultType="integer">
+        select count(*) from auth_login_info
+        <where>
+            IS_DELETED = 0
+            <if test="phone != null and phone !=''">
+                and   LOGIN_ID = #{phone}
+            </if>
+            <if test="userName != null and userName !=''">
+                and  LOGIN_ID = #{userName}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -38,6 +38,16 @@
 
    </select>
 
+
+    <select id="getRealNameByUserId"  resultType="String" >
+        select real_name from std_user_biz where amos_user_id =#{userId}
+    </select>
+
+
+
+
+
+
     <select id="queryForwgpage"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage" >
 
         select

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

@@ -31,6 +31,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -331,4 +333,14 @@ public class PreparationMoneyController extends BaseController {
 
 		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state)) ;
 	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getFromInfo")
+	@ApiOperation(httpMethod = "GET",value = "获取发货电站及区域，经销商公司",  notes = "获取发货电站及区域")
+	public ResponseModel<PreparationMoney> getFromInfo(
+			@RequestParam(value = "ids") String ids){
+		List<String> list = Arrays.asList(ids.split(","));
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.getFromInfo(list)) ;
+	}
 }

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

@@ -617,7 +617,7 @@ public class UnitInfoController extends BaseController {
         Collection<GroupModel> children =  feignClientResult.getResult();
         Collection<GroupModel> chil =new ArrayList<>();
         for (GroupModel child : children) {
-            if("户用光伏-经销商-管理员".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())){
+            if("户用光伏-经销商-管理员".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())||"户用光伏-经销商-空角色".equals(child.getGroupName())){
             //排除其余角色
             }else{
                 chil.add(child);
@@ -843,6 +843,22 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
         List<Map<String,Object>>  date= unitInfoMapper.getuserListByOrgCode(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerOrgCode());
         return ResponseHelper.buildResponse(date);
     }
+
+
+    /***获取经销商，区域公司下 工程负责人**/
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+    @GetMapping(value = "/getuserListAll")
+    public ResponseModel< List<Map<String,Object>> > getuserListAll( @RequestParam(required=false) Long role,
+                                                                  @RequestParam(required=false) Long regionalCompaniesSeq
+
+    ) {
+        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+        List<Map<String,Object>>  date= unitInfoMapper.getuserListAllByOrgCode(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerOrgCode());
+        return ResponseHelper.buildResponse(date);
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
     @GetMapping(value = "/getuserTelephone")
@@ -860,6 +876,22 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "根据userId查询手机号",   notes = "根据userId查询手机号")
+    @GetMapping(value = "/getUserTelephoneByUserId")
+    public ResponseModel< Map<String,Object> > getUserTelephoneByUserId( @RequestParam(required=false) String userId
+    ) {      Map<String,Object> data=null;
+        if(StringUtils.isNotEmpty(userId)){
+            List<Map<String,Object>> date= unitInfoMapper.getUserTelephoneByUserId(userId);
+            if(date!=null&&!date.isEmpty()){
+                data=date.get(0);
+            }
+        }
+
+
+        return ResponseHelper.buildResponse(data);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
     @GetMapping(value = "/selectPeasantHouseholdListsg")
     public ResponseModel<Page<PeasantHousehold>> selectPeasantHouseholdListsg(

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

@@ -103,7 +103,8 @@ public class WorkOrderController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工派工工单",  notes = "根据sequenceNbr查询单个施工派工工单")
 	public ResponseModel<WorkOrder> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(workOrderServiceImpl.selectOne(sequenceNbr));
+        WorkOrder workOrder = workOrderServiceImpl.selectOne(sequenceNbr);
+        return ResponseHelper.buildResponse(workOrder);
 	}
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -1160,4 +1160,43 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
          return pagenew;
      }
 
+    public PreparationMoney getFromInfo(List<String> list) {
+
+        LambdaQueryWrapper<PeasantHousehold> query = new LambdaQueryWrapper<>();
+        query.in(BaseEntity::getSequenceNbr,list);
+        List<PeasantHousehold> peasantHouseholds = peasantHouseholdMapper.selectList(query);
+
+        PreparationMoney preparationMoney = new PreparationMoney();
+        preparationMoney.setRegionalCompaniesSeq(peasantHouseholds.get(0).getRegionalCompaniesSeq());
+
+        //农户表中存储的经销商id是平台的 表单经销商接口是unitinfo主键 无法对应 查询后赋值
+        LambdaQueryWrapper<UnitInfo> query1 = new LambdaQueryWrapper<>();
+        query1.eq(UnitInfo::getAmosCompanyCode,peasantHouseholds.get(0).getDeveloperCode());
+        UnitInfo unitInfo = unitInfoService.getBaseMapper().selectOne(query1);
+
+        preparationMoney.setAmosUnitId(unitInfo.getSequenceNbr());
+
+
+        LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
+        qu.eq(RegionalCompanies::getRegionalCompaniesSeq,peasantHouseholds.get(0).getRegionalCompaniesSeq());
+        qu.eq(RegionalCompanies::getUnitInfoId,unitInfo.getSequenceNbr());
+        qu.eq(RegionalCompanies::getIsDelete,false);
+        RegionalCompanies  regionalCompanies=regionalCompaniesMapper.selectOne(qu);
+        preparationMoney.setConsignee(regionalCompanies.getConsignee());
+        preparationMoney.setPhone(regionalCompanies.getPhone());
+        preparationMoney.setConsigneeRegionCode(regionalCompanies.getConsigneeRegionCode());
+        preparationMoney.setAddress(regionalCompanies.getAddress());
+        List<DocumentStation> stations = new ArrayList<>();
+        peasantHouseholds.forEach(e->{
+            DocumentStation documentStation = new DocumentStation();
+            documentStation.setStationId(e.getSequenceNbr());
+            documentStation.setOwnersName(e.getOwnersName());
+            documentStation.setDeveloperName(e.getDeveloperName());
+            documentStation.setPeasantHouseholdNo(e.getPeasantHouseholdNo());
+            documentStation.setProjectAddressName(e.getProjectAddressName()+"/"+e.getProjectAddressDetail());
+            stations.add(documentStation);
+        });
+        preparationMoney.setPeasantHouseholdId(stations);
+        return preparationMoney;
+    }
 }
\ 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

@@ -1076,12 +1076,13 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         Integer userListHuiCount = unitInfoMapper.getUserListHuiCount(phone, userName);
         Integer userListPauCount = unitInfoMapper.getUserListPauCount(phone, userName);
         Integer userListSubCount = unitInfoMapper.getUserListSubCount(phone, userName);
+        Integer userListAliCount = unitInfoMapper.getUserListAliCount(phone, userName);
 
-        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0) && phone != null) {
+        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0 || userListAliCount !=0) && phone != null) {
             throw new BadRequest("该手机号已经注册");
         }
 
-        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0) && userName != null) {
+        if((userListHuiCount != 0 || userListPauCount != 0 || userListSubCount != 0 || userListAliCount !=0) && userName != null) {
             throw new BadRequest("该用户名已经注册");
         }
         return true;

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-HYGF-CZ
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8
-spring.profiles.active=kingbase8
+spring.profiles.active=dev
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectentity.StdUserEmpower;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +15,7 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
-    Map<String,String> getCompanyInfoByOrgCode(String orgCode);
+    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    CompanyModel getCompanyInfoByOrgCode(String orgCode);
 
 }

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

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectentity.StdUserEmpower;
 import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IPermissionService;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 @Service
 public class IPermissionServiceImpl implements  IPermissionService {
@@ -44,8 +45,8 @@ public class IPermissionServiceImpl implements  IPermissionService {
             return null;
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level_").toString();
+            CompanyModel companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+            String companyLevel = companyInfo.getLevel();
             if (companyLevel.equals("categroy_leve2")) {
                 return null;
             }
@@ -76,8 +77,8 @@ public class IPermissionServiceImpl implements  IPermissionService {
             return null;
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level_");
+            CompanyModel companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+            String companyLevel = companyInfo.getLevel();
             if (companyLevel.equals("categroy_leve2")) {
                 List<StationBasic> stationBasics = stationBasicMapper
                         .selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
@@ -110,8 +111,8 @@ public class IPermissionServiceImpl implements  IPermissionService {
 			return rootNodeName+"_111";
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			String companyLevel = companyInfo.get("level_").toString();
+			CompanyModel companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+			String companyLevel = companyInfo.getLevel();
 			if (companyLevel.equals("categroy_leve2")) {
 				return "all";
 			}

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

@@ -31,7 +31,7 @@ public class RegionDto   {
     private Long parentId;
 
     @ApiModelProperty(value = "等级")
-    @TableField("LEVEL_")
+    @TableField("LEVEL")
     private String level;
 
     @ApiModelProperty(value = "上级编码")

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

@@ -34,7 +34,7 @@ public class Region  {
     /**
      * 等级
      */
-	@TableField("LEVEL_")
+	@TableField("LEVEL")
     private String level;
 
     /**

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-BIGSCREEN-WJ
 server.servlet.context-path=/jxiop-bigscreen
 server.port=33300
 server.uri-encoding=UTF-8
-spring.profiles.active=kingbase8
+spring.profiles.active=dev1
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/PrivilegeCompanyMapper.java

@@ -10,7 +10,7 @@ import java.util.Map;
 
 public interface PrivilegeCompanyMapper extends BaseMapper<PrivilegeCompany> {
 
-    @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,LEVEL_ as level_ from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0  ")
+    @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,LEVEL from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0  ")
    public List<PrivilegeCompany> getAreaCompany();
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java

@@ -17,8 +17,8 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
-    Map<String,String> getCompanyInfoByOrgCode(String orgCode);
+    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    CompanyModel getCompanyInfoByOrgCode(String orgCode);
 
     List<CompanyModel> getCompanyBoList(@Param("companyType") String companyType,
                                         @Param("level") String level,

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

@@ -138,14 +138,14 @@ public class PrivilegeController extends BaseController {
 		String userId = reginParams.getUserModel().getUserId();
 		StdUserEmpower stdUserEmpower = userEmpowerMapper
 				.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
-		Map<String, String> companyInfo = new HashMap<String, String>();
+		CompanyModel companyInfo;
 		if (ObjectUtils.isEmpty(stdUserEmpower)) {
 //			throw new BadRequest("您当前未配置数据权限！");
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			companyLevel = companyInfo.get("level_").toString();
-			companyName = companyInfo.get("companyName").toString();
+			companyLevel = companyInfo.getLevel();
+			companyName = companyInfo.getCompanyName();
 		}
 		FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(qgCompanyId);
 		List<CompanyModel> list = new ArrayList<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java

@@ -22,7 +22,7 @@ public class PrivilegeCompany extends BaseEntity {
     private Long parentId;
     @TableField("REGION_SEQ")
     private String regionSeq;
-    @TableField("LEVEL_")
+    @TableField("LEVEL")
     private String level;
     @TableField("EMAIL")
     private String email;

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -12,17 +24,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.PrivilegeCompany
 import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.PrivilegeCompany;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.StdUserEmpower;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 @Service
 public class IPermissionServiceImpl implements IPermissionService {
@@ -52,8 +54,8 @@ public class IPermissionServiceImpl implements IPermissionService {
 			return null;
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			String companyLevel = companyInfo.get("level_");
+			CompanyModel companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+			String companyLevel = companyInfo.getLevel();
 			if (companyLevel.equals("categroy_leve2")) {
 				List<StationBasic> stationBasics = stationBasicMapper
 						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
@@ -89,8 +91,8 @@ public class IPermissionServiceImpl implements IPermissionService {
 			return null;
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			String companyLevel = companyInfo.get("level_");
+			CompanyModel companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+			String companyLevel = companyInfo.getLevel();
 			if (companyLevel.equals("categroy_leve2")) {
 				List<StationBasic> stationBasics = stationBasicMapper
 						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
@@ -139,8 +141,8 @@ public class IPermissionServiceImpl implements IPermissionService {
             map.put("isStation","false");
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level_");
+            CompanyModel companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+            String companyLevel = companyInfo.getLevel();
             if (companyLevel.equals("categroy_leve2")) {
                 map.put("isStation","false");
             }

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.RegionDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IRegionService;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.RegionDto;
-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;
 
 /**
  * 服务实现类
@@ -37,6 +40,6 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
     }
     //根据regionName获取regionCode
     public Region getRegionCodeByRegionName(String regionName) {
-        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",1));
+        return this.getOne(new LambdaQueryWrapper<Region>().like(Region::getRegionName,regionName).eq(Region::getLevel,1));
     }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/amosprojectmapper/UserEmpowerMapper.java

 package com.yeejoin.amos.boot.module.jxiop.api.amosprojectmapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.StdUserEmpower;
 import org.apache.ibatis.annotations.Select;
 
-import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StdUserEmpower;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 /**
  * @description:
@@ -12,7 +12,7 @@ import java.util.Map;
  * @createDate: 2023/11/9
  */
 public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
-    @Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
-    Map<String,String> getCompanyInfoByOrgCode(String orgCode);
+    @Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
+    CompanyModel getCompanyInfoByOrgCode(String orgCode);
 
 }

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import cn.hutool.extra.pinyin.PinyinUtil;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
@@ -385,7 +387,7 @@ public class CommonServiceImpl {
      */
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
+        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area"));
         //.isNotNull("fan_gateway_id"));

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import java.util.HashMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jxiop.api.amosprojectmapper.UserEmpowerMapper;
@@ -8,13 +14,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StdUserEmpower;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.context.ThemeSource;
-import org.springframework.util.ObjectUtils;
-
-import java.util.HashMap;
-import java.util.Map;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 @Service
 public class JxiopMonitorMapPermissionServiceImpl {
@@ -40,15 +40,15 @@ public class JxiopMonitorMapPermissionServiceImpl {
             return result;
         } else {
             String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-            Map<String,String>  companyInfo= userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level_").toString();
+            CompanyModel companyInfo= userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+            String companyLevel = companyInfo.getLevel();
             if (companyLevel.equals("categroy_leve2")) {
                 result.put("showType", "all");
                 return result;
             }
             if(companyLevel.equals("area")){
                 result.put("showType","area");
-                String areaName =companyInfo.get("companyName").replace("片区","").replace("区域","");
+                String areaName =companyInfo.getCompanyName().replace("片区","").replace("区域","");
                 result.put("areaName",areaName);
                 MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("name",areaName));
                 if(!ObjectUtils.isEmpty(mapRegion)){

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

@@ -89,6 +89,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.TemporaryDataMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import com.yeejoin.amos.component.robot.BadRequest;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -308,8 +309,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 //			throw new BadRequest("您当前未配置数据权限！");
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-			companyLevel = companyInfo.get("level_").toString();
+			CompanyModel companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+			companyLevel = companyInfo.getLevel();
 		}
 		StationBasic stationBasic = stationBasicMapper.selectById(sequenceNbr);
 		List<Integer> integers = JSON.parseArray(stationBasic.getBelongArea(), Integer.class);

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

@@ -120,7 +120,7 @@ public class MonitoringServiceIMQTTmpl {
         Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
         logger.error("--------------------------区域实时数据消息开始发送----------------------------------------------");
         List<SocialContributionDto> socialContributionDtoList = new ArrayList<>();
-        Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level_", 1).eq("region_name", "江西省"));
+        Region region = this.regionMapper.selectOne(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1).eq(Region::getRegionName, "江西省"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()).isNotNull("fan_gateway_id"));
         int year = Calendar.getInstance().get(Calendar.YEAR);
         List<Long> fdz = stationBasicList.stream().map(StationBasic::getSequenceNbr).collect(Collectors.toList());

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.RegionDto;
@@ -38,6 +39,6 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
     }
     //根据regionName获取regionCode
     public Region getRegionCodeByRegionName(String regionName) {
-        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",1));
+        return this.getOne(new LambdaQueryWrapper<Region>().like(Region::getRegionName,regionName).eq(Region::getLevel,1));
     }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import cn.hutool.extra.pinyin.PinyinUtil;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
@@ -386,7 +388,7 @@ public class CommonServiceImpl {
      */
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
+        List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel, 1));
         List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
         for (int i = 0; i < stationBasicList.size(); i++) {

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.RegionDto;
@@ -38,6 +39,6 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
     }
     //根据regionName获取regionCode
     public Region getRegionCodeByRegionName(String regionName) {
-        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",1));
+        return this.getOne(new LambdaQueryWrapper<Region>().like(Region::getRegionName,regionName).eq(Region::getLevel,1));
     }
 }
\ No newline at end of file