修改level_为level

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