Skip to content

A
amos-boot-zx-biz
Commit 1db5e561 authored by lilongyang's avatar lilongyang
Browse files
Options

Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

Conflicts: amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EnergyAccessServiceImpl.java
parents 5b55792b e73b212b
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 54 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserDataJBDto.java
View file @ 1db5e561
......@@ -29,4 +29,8 @@ public class UserDataJBDto {
private String nowAddress;
private String politicalOutlook;
private String nativePlace;
/**
* 是否有业务操作
*/
private Boolean hasOperationRecords;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserDataZHDto.java
View file @ 1db5e561
......@@ -16,4 +16,8 @@ public class UserDataZHDto {
private String password;
private String rePassword;
private List<Long> role;
/**
* 是否有业务操作
*/
private Boolean hasOperationRecords;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java
View file @ 1db5e561
......@@ -32,7 +32,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<Map<String,Object>> preparationStation (@Param(value = "preparationMoneyState") String preparationMoneyState,
@Param(value = "ownersName") String ownersName,
@Param(value = "regionalcompaniesSeq") String regionalcompaniesSeq,
@Param(value = "regionalCompaniesSeq") String regionalCompaniesSeq,
@Param(value = "developerId") String developerId,
@Param(value = "state") String state);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml
View file @ 1db5e561
......@@ -13,7 +13,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
</select>
<select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
SELECT hygf_preparation_money.*,(select instance_id from hygf_preparation_money_auditing where preparation_money_id = hygf_preparation_money.sequence_nbr limit 1 ) as instanceId FROM hygf_preparation_money
SELECT hygf_preparation_money.*,IFNULL(order_status,arrival_state) as arrivalState,IFNULL(order_status,delivery_state) as deliveryState,(select instance_id from hygf_preparation_money_auditing where preparation_money_id = hygf_preparation_money.sequence_nbr limit 1 ) as instanceId FROM hygf_preparation_money
<where>
<if test="dto.consigneeRegion != null and dto.consigneeRegion != ''">
and hygf_preparation_money.consignee_region like concat ('%',#{dto.consigneeRegion},'%')
......@@ -47,7 +47,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
hygf_peasant_household.regional_companies_name as regionalCompaniesName,
hygf_peasant_household.developer_name as developerName,
hygf_peasant_household.sequence_nbr as sequenceNbr,
concat_ws('/',project_address_name,project_address_detail) as address,
concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail) as address,
hygf_peasant_household.project_address_name as sequenceNbr,
hygf_peasant_household.preparation_money_state preparationMoneyState,
hygf_document_station.preparation_money_id as preparationMoneyId,
......@@ -57,7 +57,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
LEFT JOIN hygf_document_station on hygf_peasant_household.sequence_nbr = hygf_document_station.station_id
LEFT JOIN hygf_power_station on hygf_peasant_household.sequence_nbr = hygf_power_station.peasant_household_id
<where>
<if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '0' ">
<if test=" preparationMoneyState == 0 ">
and hygf_peasant_household.preparation_money_state in ('待发货','待补货','暂存发货')
</if>
<if test="regionalCompaniesSeq!=null and regionalCompaniesSeq !='' ">
......@@ -72,7 +72,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
<if test="ownersName!=null and ownersName !=''">
and hygf_peasant_household.owners_name like concat ('%',#{ownersName},'%')
</if>
<if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '1' ">
<if test=" preparationMoneyState == 1 ">
and hygf_peasant_household.preparation_money_state not in ('待发货','待补货','暂存发货') and preparation_money_state is not and preparation_money_state != ''
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java
View file @ 1db5e561
......@@ -19,6 +19,8 @@ import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
......@@ -46,7 +48,7 @@ import java.util.stream.Collectors;
@Api(tags = "Api")
@RequestMapping(value = "/household-contract")
public class HouseholdContractController extends BaseController {
private static final Logger logger = LoggerFactory.getLogger(HouseholdContractController.class);
@Autowired
HouseholdContractServiceImpl householdContractServiceImpl;
@Value("${regionalCompanies.company.seq}")
......@@ -219,7 +221,7 @@ public class HouseholdContractController extends BaseController {
public boolean stampdata(Long sequenceNbr){
HouseholdContract householdContrac=null;
try {
householdContrac= householdContractServiceImpl.getById(sequenceNbr);
householdContrac= householdContractServiceImpl.getById(sequenceNbr);
householdContrac.setStampStatus(HouseholdContractEnum.盖章状态_已盖章.getCode());
householdContrac.setSigningTime(new Date());
householdContrac.setStatus(HouseholdContractEnum.合同状态_双方已签署.getCode());
......@@ -231,11 +233,15 @@ public class HouseholdContractController extends BaseController {
wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getDataByState(householdContrac.getPeasantHouseholdId());
if (peasantHousehold != null){
PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getDataByState(householdContrac.getPeasantHouseholdId());
System.out.println("开始更新农户发货状态"+householdContrac.getPeasantHouseholdId());
if (peasantHousehold != null){
System.out.println("开始更新农户发货状态"+householdContrac.getPeasantHouseholdId());
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
}
System.out.println("更新成功"+householdContrac.getPeasantHouseholdId());
}
if(doTasks!=null){
doTasks.setState("已办");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java
View file @ 1db5e561
......@@ -318,7 +318,6 @@ public class PreparationMoneyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/preparationStation")
@ApiOperation(httpMethod = "GET",value = "发货电站", notes = "发货电站")
@GlobalTransactional
public ResponseModel<IPage<Map<String,Object>>> preparationStation(
@RequestParam(value = "current") Integer current,
@RequestParam(value = "size") Integer size,
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java
View file @ 1db5e561
......@@ -16,6 +16,7 @@ import com.qiyuesuo.sdk.v2.response.SdkResponse;
import com.qiyuesuo.sdk.v2.utils.Algorithm;
import com.qiyuesuo.sdk.v2.utils.Base64Utils;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.CallbackDto;
......@@ -23,6 +24,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
import io.swagger.annotations.Api;
......@@ -81,6 +83,8 @@ public class QiyuesuoController extends BaseController {
private String engineering;
@Autowired
ContractFillMapper contractFillMapper;
@Autowired
PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "POST", value = "个人token", notes = "个人token")
......@@ -176,7 +180,7 @@ public class QiyuesuoController extends BaseController {
wrapper.set(HouseholdContract::getStampStatus, HouseholdContractEnum.盖章状态_已盖章.getCode());
wrapper.set(HouseholdContract::getSigningTime, new Date());
wrapper.set(HouseholdContract::getStatus, HouseholdContractEnum.合同状态_双方已签署.getCode());
wrapper.set(HouseholdContract::getSealedUser, getUserInfo().getRealName());
// wrapper.set(HouseholdContract::getSealedUser, getUserInfo().getRealName());
wrapper.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId());
householdContractServiceImpl.update(wrapper);
......@@ -184,6 +188,14 @@ public class QiyuesuoController extends BaseController {
wrapper4.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId());
HouseholdContract contract = householdContractMapper.selectOne(wrapper4);
PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getDataByState(contract.getPeasantHouseholdId());
logger.info("开始更新农户发货状态"+contract.getPeasantHouseholdId());
if (peasantHousehold != null){
logger.info("开始更新农户发货状态"+contract.getPeasantHouseholdId());
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
logger.info("更新成功");
}
LambdaQueryWrapper<ToDoTasks> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
View file @ 1db5e561
......@@ -211,6 +211,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
FeignClientResult<AgencyUserModel> userResult =null;
try {
List<Long> newRole = userDataZHDto.getRole();
List<Long> oldRole = JSONArray.parseArray(publicAgencyUser.getRole(), Long.class);
for(Long item: oldRole) {
if(!newRole.contains(item)){
throw new BadRequest("角色只能增加, 不能删除");
}
}
// 1 修改平台用户
List<RoleModel> userRoleList = new ArrayList<>();
AgencyUserModel agencyUserModel = new AgencyUserModel();
......@@ -494,9 +501,44 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(),String.class));
userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq()!=null?personnelBusines.getRegionalCompaniesSeq().toString():null);
userDataJBDto.setAmosUnitId(personnelBusines.getAmosUnitId());
Boolean hasOperationRecords = hasOperationRecords(id);
userDataZHDto.setHasOperationRecords(hasOperationRecords);
userDataJBDto.setHasOperationRecords(hasOperationRecords);
return new UserDataDto( userDataZHDto, userDataJBDto , userDataZZDto);
}
/**
* 用户是否有业务操作
*
*
* @param id id
* @return {@link Boolean}
* @author yangyang
* @throws
* @date 2024/7/3 16:24
*/
public Boolean hasOperationRecords(String id) {
if (StringUtils.isEmpty(id)) {
return false;
}
Boolean operateRecord = false;
String userId = personnelBusinessMapper.selectUserInfo(Long.parseLong(id));
//添加校验，如果业务表里面有相关的用户id不能删除
List<String> tableName = personnelBusinessMapper.selectHygfTableName();
if (CollectionUtil.isNotEmpty(tableName)) {
for (String table : tableName) {
int count = personnelBusinessMapper.countByUserId(table, userId);
if (count > 0) {
operateRecord = true;
break;
}
}
}
return operateRecord;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteAllBySequenceNbr(Long sequenceNbr) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ 1db5e561
......@@ -981,7 +981,22 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
userEmpowerMapper.insert(stdUserEmpower);
}
// region 同步平台的单位信息
QueryWrapper<PersonnelBusiness> personnelBusinessWrapper = new QueryWrapper<>();
personnelBusinessWrapper.eq("amos_unit_id", unitInfo.getAmosCompanySeq());
List<PersonnelBusiness> personnelBusiness = personnelBusinessMapper.selectList(personnelBusinessWrapper);
Long amosDealerId = personnelBusiness.get(0).getAmosDealerId();
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(amosDealerId);
if (companyResult == null || companyResult.getStatus() != 200) {
throw new BadRequest("修改单位失败！" + companyResult.getDevMessage());
}
CompanyModel updateCompanyModel = companyResult.getResult();
updateCompanyModel.setCompanyName(unitInfo.getName());
FeignClientResult<CompanyModel> companyUpdateResult = Privilege.companyClient.update(updateCompanyModel, amosDealerId);
if (companyUpdateResult == null || companyUpdateResult.getStatus() != 200) {
throw new BadRequest("修改单位失败！" + companyResult.getDevMessage());
}
// endregion
return true;
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java
View file @ 1db5e561
......@@ -13,7 +13,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}")
@Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
Map<String,String> 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
View file @ 1db5e561
......@@ -45,7 +45,7 @@ public class IPermissionServiceImpl implements IPermissionService {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level").toString();
String companyLevel = companyInfo.get("level_").toString();
if (companyLevel.equals("categroy_leve2")) {
return null;
}
......@@ -77,7 +77,7 @@ public class IPermissionServiceImpl implements IPermissionService {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level");
String companyLevel = companyInfo.get("level_");
if (companyLevel.equals("categroy_leve2")) {
List<StationBasic> stationBasics = stationBasicMapper
.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
......@@ -111,7 +111,7 @@ public class IPermissionServiceImpl implements IPermissionService {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level").toString();
String companyLevel = companyInfo.get("level_").toString();
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
View file @ 1db5e561
......@@ -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-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java
View file @ 1db5e561
......@@ -276,7 +276,7 @@ public class MonitoringMapController extends BaseController {
ArrayList<String> stringArrayList = mapRegion.getProvince();
//变量获取所有的场站信息
for (int i = 0; i < stringArrayList.size(); i++) {
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL_", 1).like("REGION_NAME", stringArrayList.get(i)));
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
stationBasicListAll.addAll(stationBasicList);
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/initdata/StationCacheDataInit.java
View file @ 1db5e561
......@@ -44,7 +44,7 @@ public class StationCacheDataInit implements CommandLineRunner {
public void run(String... args) throws Exception {
redisTemplate.delete("station_info_cache_bigscreen");
List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel_, 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"));
stationBasicList.forEach(stationBasic -> {
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java
View file @ 1db5e561
......@@ -225,7 +225,7 @@ public class CommonServiceImpl {
public List<StationCacheInfoDto> getListStationCacheInfoDto() {
List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
List<Region> regionList = regionMapper.selectList(new LambdaQueryWrapper<Region>().eq(Region::getLevel_, 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-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EnergyAccessServiceImpl.java
View file @ 1db5e561
......@@ -15,6 +15,7 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
......@@ -111,11 +112,16 @@ public class EnergyAccessServiceImpl implements EnergyAccessService {
String oldName = "";
JSONObject jsonObject = (JSONObject) result;
String rate = jsonObject.getString("rate");
String newRate = "";
if (StringUtils.isNotEmpty(rate)) {
rate = rate.replace("%", "");
BigDecimal bd = new BigDecimal(rate);
jsonObject.put("rate", bd.setScale(4,BigDecimal.ROUND_HALF_UP));
newRate = rate.replace("%", "");
jsonObject.put("rate", newRate);
}
jsonObject.put("seriesData", StringUtils.isNotEmpty(newRate) ? Arrays.asList(Double.parseDouble(newRate)) : 0D);
jsonObject.put("axisData", Arrays.asList("RATE"));
if ("1".equals(tp)) {
oldName = jsonObject.getString("station_name");
jsonObject.remove("station_name");
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorServiceImpl.java
View file @ 1db5e561
......@@ -140,7 +140,7 @@ public class MonitorServiceImpl implements MonitorService {
*/
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 QueryWrapper<Region>().eq("LEVEL_", 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-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java
View file @ 1db5e561
......@@ -772,7 +772,7 @@ public class MonitoringServiceImpl {
// 变量获取所有的场站信息
for (int i = 0; i < stringArrayList.size(); i++) {
Region region = regionMapper
.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
.selectOne(new QueryWrapper<Region>().eq("LEVEL_", 1).like("REGION_NAME", stringArrayList.get(i)));
List<StationBasic> stationBasicList = stationBasicMapper
.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
stationBasicListAll.addAll(stationBasicList);
......@@ -1188,7 +1188,7 @@ public class MonitoringServiceImpl {
List<HashMap<String, Object>> hashMapList = 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<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
regionList.forEach(region -> {
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("label", region.getRegionName());
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java
View file @ 1db5e561
......@@ -144,7 +144,7 @@ public class PrivilegeController extends BaseController {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
companyLevel = companyInfo.get("level").toString();
companyLevel = companyInfo.get("level_").toString();
companyName = companyInfo.get("companyName").toString();
}
FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(qgCompanyId);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java
View file @ 1db5e561
......@@ -23,7 +23,7 @@ public class PrivilegeCompany extends BaseEntity {
@TableField("REGION_SEQ")
private String regionSeq;
@TableField("LEVEL_")
private String level_;
private String level;
@TableField("EMAIL")
private String email;
@TableField("LONGITUDE")
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/ExcelServiceImpl.java
View file @ 1db5e561
......@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
......@@ -392,6 +393,9 @@ public class ExcelServiceImpl {
QueryWrapper<PersonCertificate> wrapper2 = new QueryWrapper();
wrapper2.eq("person_id", personAccount.getPersonId());
PersonCertificate personCertificate = personCertificateService.getOne(wrapper2);
if(Objects.isNull(personCertificate)){
personCertificate=new PersonCertificate();
}
BeanUtils.copyProperties(exPersonUser, personCertificate);
listPersonCertificate.add(personCertificate);
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IPermissionServiceImpl.java
View file @ 1db5e561
......@@ -53,7 +53,7 @@ public class IPermissionServiceImpl implements IPermissionService {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level");
String companyLevel = companyInfo.get("level_");
if (companyLevel.equals("categroy_leve2")) {
List<StationBasic> stationBasics = stationBasicMapper
.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
......@@ -90,7 +90,7 @@ public class IPermissionServiceImpl implements IPermissionService {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level");
String companyLevel = companyInfo.get("level_");
if (companyLevel.equals("categroy_leve2")) {
List<StationBasic> stationBasics = stationBasicMapper
.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
......@@ -140,7 +140,7 @@ public class IPermissionServiceImpl implements IPermissionService {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level");
String companyLevel = companyInfo.get("level_");
if (companyLevel.equals("categroy_leve2")) {
map.put("isStation","false");
}
......@@ -191,9 +191,9 @@ public class IPermissionServiceImpl implements IPermissionService {
//outer_company 外部公司 当前特殊区域公司标记为 级别为 外部公司来区分
if (type.equals("outer_company")){
areaCompany= areaCompany.stream().filter(e -> e.getLevel_().equals("outer_company")).collect(Collectors.toList());
areaCompany= areaCompany.stream().filter(e -> e.getLevel().equals("outer_company")).collect(Collectors.toList());
}else {
areaCompany= areaCompany.stream().filter(e -> !e.getLevel_().equals("outer_company")).collect(Collectors.toList());
areaCompany= areaCompany.stream().filter(e -> !e.getLevel().equals("outer_company")).collect(Collectors.toList());
// PrivilegeCompany all = new PrivilegeCompany();
// all.setCompanyName("全部");
// all.setOrgCode("all");
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
View file @ 1db5e561
......@@ -431,6 +431,16 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
PersonAccount oldpersonAccount = new PersonAccount();
personUser.setPhone(personAccount.getPhoneNum());
oldpersonAccount = personAccountService.getById(personAccount.getSequenceNbr());
// region 判断工号是否存在
if (!personAccount.getJobNumber().equals(oldpersonAccount.getJobNumber())) {
List<Map<String, Object>> maps = privilegeCompanyMapper.selectJobNumIsExist(personAccount.getJobNumber());
if (CollectionUtils.isNotEmpty(maps) || maps.size()> 0) {
throw new BadRequest("工号已存在");
}
}
// endregion
// 人员基础信息
PersonBasic personBasic = personBasicMapper.selectById(sequenceNbr);
personBasic.setRecDate(new Date());
......@@ -538,7 +548,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
// 人员账号信息
personAccount.setPersonId(sequenceNbr);
oldpersonAccount = personAccountService.getById(personAccount.getSequenceNbr());
personAccountService.updateById(personAccount);
// 新增平台账号
// 组装数据
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/RegionServiceImpl.java
View file @ 1db5e561
......@@ -37,6 +37,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 QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",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
View file @ 1db5e561
......@@ -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}")
@Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
Map<String,String> 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
View file @ 1db5e561
......@@ -385,7 +385,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 QueryWrapper<Region>().eq("LEVEL_", 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
View file @ 1db5e561
......@@ -41,7 +41,7 @@ public class JxiopMonitorMapPermissionServiceImpl {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String,String> companyInfo= userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level").toString();
String companyLevel = companyInfo.get("level_").toString();
if (companyLevel.equals("categroy_leve2")) {
result.put("showType", "all");
return result;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ 1db5e561
......@@ -309,7 +309,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
} else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
companyLevel = companyInfo.get("level").toString();
companyLevel = companyInfo.get("level_").toString();
}
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/MonitorServiceImpl.java
View file @ 1db5e561
......@@ -210,7 +210,7 @@ public class MonitorServiceImpl implements MonitorService {
public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type) {
List<RegionNationWideDto> regionNationWideDtoList = new ArrayList<>();
List<StationCacheInfoDto> stationCacheInfoDtoList = this.getListStationCacheInfoDto();
List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
List<StationCacheInfoDto> list = new ArrayList<>();
if ((!ObjectUtils.isEmpty(type) && type.equals("gis")) && (ObjectUtils.isEmpty(provinceName) || provinceName.equals(""))) {
for (int i = 0; i < regionList.size(); i++) {
......@@ -434,7 +434,7 @@ public class MonitorServiceImpl implements MonitorService {
*/
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 QueryWrapper<Region>().eq("LEVEL_", 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++) {
......@@ -567,7 +567,7 @@ public class MonitorServiceImpl implements MonitorService {
ArrayList<String> stringArrayList = mapRegion.getProvince();
//变量获取所有的场站信息
for (int i = 0; i < stringArrayList.size(); i++) {
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL_", 1).like("REGION_NAME", stringArrayList.get(i)));
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
stationBasicListAll.addAll(stationBasicList);
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceIMQTTmpl.java
View file @ 1db5e561
......@@ -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 QueryWrapper<Region>().eq("level_", 1).eq("region_name", "江西省"));
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/MonitoringServiceImpl.java
View file @ 1db5e561
......@@ -92,7 +92,7 @@ public class MonitoringServiceImpl {
public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type) {
List<RegionNationWideDto> regionNationWideDtoList = new ArrayList<>();
List<StationCacheInfoDto> stationCacheInfoDtoList = commonServiceImpl.getListStationCacheInfoDto();
List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
List<StationCacheInfoDto> list = new ArrayList<>();
//如果 provinceName 为空则表示当前为全国地图 否则则为省份地图
// if (ObjectUtils.isEmpty(provinceName) || provinceName.equals("")) {
......@@ -488,7 +488,7 @@ public class MonitoringServiceImpl {
List<MapAreaInfoDto> mapAreaInfoDtoList = new ArrayList<>();
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area"));
List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
mapRegionList.forEach(mapRegion -> {
MapAreaInfoDto mapAreaInfoDto = new MapAreaInfoDto();
//开始处理省份名称-三维与二维的名称有差异
......@@ -525,7 +525,7 @@ public class MonitoringServiceImpl {
public List<HomeMapStationInfoDto> getStaitonListInfoByAreaName(String areaName) {
List<HomeMapStationInfoDto> homeMapStationInfoDtoList = new ArrayList<>();
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
//根据areaName获取area信息
MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("name", areaName));
//获取片区下的省份名称
......@@ -805,7 +805,7 @@ public class MonitoringServiceImpl {
ArrayList<String> stringArrayList = mapRegion.getProvince();
//变量获取所有的场站信息
for (int i = 0; i < stringArrayList.size(); i++) {
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL_", 1).like("REGION_NAME", stringArrayList.get(i)));
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
stationBasicListAll.addAll(stationBasicList);
}
......@@ -1214,7 +1214,7 @@ public class MonitoringServiceImpl {
public List<HashMap<String, Object>> getSelectDataForNational() {
List<HashMap<String, Object>> hashMapList = 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<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
regionList.forEach(region -> {
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("label", region.getRegionName());
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/RegionServiceImpl.java
View file @ 1db5e561
......@@ -38,6 +38,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 QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",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
View file @ 1db5e561
......@@ -386,7 +386,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 QueryWrapper<Region>().eq("LEVEL_", 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/MonitoringServiceImpl.java
View file @ 1db5e561
......@@ -91,7 +91,7 @@ public class MonitoringServiceImpl {
public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type) {
List<RegionNationWideDto> regionNationWideDtoList = new ArrayList<>();
List<StationCacheInfoDto> stationCacheInfoDtoList = commonServiceImpl.getListStationCacheInfoDto();
List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level", 1));
List<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
List<StationCacheInfoDto> list = new ArrayList<>();
//如果 provinceName 为空则表示当前为全国地图 否则则为省份地图
// if (ObjectUtils.isEmpty(provinceName) || provinceName.equals("")) {
......@@ -463,7 +463,7 @@ public class MonitoringServiceImpl {
List<MapAreaInfoDto> mapAreaInfoDtoList = new ArrayList<>();
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area"));
List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
mapRegionList.forEach(mapRegion -> {
MapAreaInfoDto mapAreaInfoDto = new MapAreaInfoDto();
//开始处理省份名称-三维与二维的名称有差异
......@@ -500,7 +500,7 @@ public class MonitoringServiceImpl {
public List<HomeMapStationInfoDto> getStaitonListInfoByAreaName(String areaName) {
List<HomeMapStationInfoDto> homeMapStationInfoDtoList = new ArrayList<>();
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL_", 1));
//根据areaName获取area信息
MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("name", areaName));
//获取片区下的省份名称
......@@ -748,7 +748,7 @@ public class MonitoringServiceImpl {
ArrayList<String> stringArrayList = mapRegion.getProvince();
//变量获取所有的场站信息
for (int i = 0; i < stringArrayList.size(); i++) {
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL", 1).like("REGION_NAME", stringArrayList.get(i)));
Region region = regionMapper.selectOne(new QueryWrapper<Region>().eq("LEVEL_", 1).like("REGION_NAME", stringArrayList.get(i)));
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
stationBasicListAll.addAll(stationBasicList);
}
......@@ -1124,7 +1124,7 @@ public class MonitoringServiceImpl {
public List<HashMap<String, Object>> getSelectDataForNational() {
List<HashMap<String, Object>> hashMapList = 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<Region> regionList = this.regionMapper.selectList(new QueryWrapper<Region>().eq("level_", 1));
regionList.forEach(region -> {
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("label", region.getRegionName());
......
amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/RegionServiceImpl.java
View file @ 1db5e561
......@@ -38,6 +38,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 QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL_",1));
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment