Skip to content

A
amos-boot-zx-biz
Commit d6cbfbe9 authored by yangyang's avatar yangyang
Browse files
Options

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

parents 592b7ff9 5f0d70b0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 350 additions and 341 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java
View file @ d6cbfbe9
......@@ -53,14 +53,13 @@ public class HouseholdTestController {
@Autowired
private TdHYGFInverterYearGenerateImpl tdHYGFInverterYearGenerateImpl;
@Autowired
private TdHYGFStationDayGenerateImpl tdHYGFStationDayGenerateImpl;
private TdHYGFStationAllGenerateImpl tdHYGFStationAllGenerateImpl;
@Autowired
private TdHYGFStationMonthGenerateImpl tdHYGFStationMonthGenerateImpl;
private TdHYGFStationYearGenerateImpl tdHYGFStationMonthGenerateImpl;
@Autowired
private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl;
@Autowired
TdHYGFStationYearGenerateImpl tdHYGFStationYearGenerateImpl;
TdHYGFStationAllGenerateImpl tdHYGFStationYearGenerateImpl;
//户用光伏日发电量
@Autowired
......@@ -222,8 +221,8 @@ public class HouseholdTestController {
case "td_hygf_jp_station_power_history":
ascriptionService=hygfjpStationPowerHistoryImpl;
break;
case "td_hygf_station_day_generate":
ascriptionService=tdHYGFStationDayGenerateImpl;
case "td_hygf_station_all_generate":
ascriptionService=tdHYGFStationAllGenerateImpl;
break;
case "td_hygf_station_month_generate":
ascriptionService=tdHYGFStationMonthGenerateImpl;
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/HYGFJPDayPower.java
View file @ d6cbfbe9
......@@ -6,7 +6,7 @@ import lombok.Data;
import java.io.Serializable;
@Data
@TableName(value = "td_hygf_day_power",autoResultMap = true)
@TableName(value = "td_hygf_station_power_day",autoResultMap = true)
public class HYGFJPDayPower implements Serializable {
private Long createdTime;
private String tationId;
......@@ -19,7 +19,4 @@ public class HYGFJPDayPower implements Serializable {
private String regionalCompaniesCode; //区域公司code
private String amosCompanyCode; //经销商code
private String stationState;//电站状态
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationDayGenerate.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationAllGenerate.java
View file @ d6cbfbe9
......@@ -9,8 +9,8 @@ import java.io.Serializable;
* @author DELL
*/
@Data
@TableName(value = "td_hygf_station_day_generate" ,autoResultMap = true)
public class TdHYGFStationDayGenerate implements Serializable {
@TableName(value = "td_hygf_station_generate_all" ,autoResultMap = true)
public class TdHYGFStationAllGenerate implements Serializable {
/**
* 创建时间
*/
......@@ -20,13 +20,13 @@ public class TdHYGFStationDayGenerate implements Serializable {
*/
private String thirdStationId;
/**
*日 yyyy-MM-dd
*日 yyyy-MM
*/
private String dayTime;
private String yearTime;
/**
*月 yyyy-MM
*月 yyyy
*/
private String yearMonth;
private String year;
/**
* 发电量
*/
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationMonthGenerate.java
View file @ d6cbfbe9
......@@ -9,7 +9,7 @@ import java.io.Serializable;
* @author DELL
*/
@Data
@TableName(value = "td_hygf_station_month_generate" ,autoResultMap = true)
@TableName(value = "td_hygf_station_generate_month" ,autoResultMap = true)
public class TdHYGFStationMonthGenerate implements Serializable {
/**
* 创建时间
......@@ -20,13 +20,13 @@ public class TdHYGFStationMonthGenerate implements Serializable {
*/
private String thirdStationId;
/**
*日 yyyy-MM
*日 yyyy-MM-dd
*/
private String monthTime;
private String dayTime;
/**
*月 yyyy
*月 yyyy-MM
*/
private String year;
private String yearMonth;
/**
* 发电量
*/
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationYearGenerate.java
View file @ d6cbfbe9
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import lombok.Data;
/**
* @author DELL
*/
@Data
@TableName(value = "td_hygf_station_year_generate" ,autoResultMap = true)
@TableName(value = "td_hygf_station_generate_year" ,autoResultMap = true)
public class TdHYGFStationYearGenerate implements Serializable {
/**
* 创建时间
......@@ -22,7 +23,7 @@ public class TdHYGFStationYearGenerate implements Serializable {
/**
*日 yyyy-MM
*/
private String yearTime;
private String monthTime;
/**
*月 yyyy
*/
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationDayGenerateMapper.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationAllGenerateMapper.java
View file @ d6cbfbe9
package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate;
public interface TdHYGFStationDayGenerateMapper extends BaseMapper<TdHYGFStationDayGenerate> {
public interface TdHYGFStationAllGenerateMapper extends BaseMapper<TdHYGFStationAllGenerate> {
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationDayGenerateImpl.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationAllGenerateImpl.java
View file @ d6cbfbe9
package com.yeejoin.amos.api.householdapi.face.service.business;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPDayPower;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationDayGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationAllGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
/**
* @description:
* @author: tw
* @createDate: 2024/4/9
*/
@Service
public class TdHYGFStationDayGenerateImpl implements AscriptionService {
public class TdHYGFStationAllGenerateImpl implements AscriptionService {
@Autowired
private JpStationMapper jpStationMapper;
@Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
private TdHYGFStationAllGenerateMapper tdHYGFStationAllGenerateMapper;
@Override
public void updateAscription(String timeNum) {
try {
// DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
// DateFormat dfty = new SimpleDateFormat("yyyy-MM");
//
// Date star = dft.parse(timeNum);//开始时间
// String yearMonth= dfty.format(star);
List<TdHYGFStationDayGenerate> hygfjpDayPower = tdHYGFStationDayGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationDayGenerate>().
eq("day_time", timeNum).and(wrapper -> {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy");
Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star);
List<TdHYGFStationAllGenerate> hygfjpDayPower = tdHYGFStationAllGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationAllGenerate>().
eq("year", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code")
.or()
.isNull("amos_company_code")
......@@ -49,15 +48,15 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService {
);
if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
for (TdHYGFStationDayGenerate dayPower : hygfjpDayPower) {
for (TdHYGFStationAllGenerate dayPower : hygfjpDayPower) {
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
eq("third_station_id", dayPower.getThirdStationId()));
if(jpStation!=null){
if(jpStation!=null) {
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName());
dayPower.setStationState(jpStation.getState());
tdHYGFStationDayGenerateMapper.insert(dayPower);
tdHYGFStationAllGenerateMapper.insert(dayPower);
}
}
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationMonthGenerateImpl.java
View file @ d6cbfbe9
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.api.householdapi.face.service.business;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterYearGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPDayPower;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
......@@ -25,18 +26,18 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
@Autowired
private JpStationMapper jpStationMapper;
@Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Override
public void updateAscription(String timeNum) {
try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy-MM");
Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star);
List<TdHYGFStationMonthGenerate> hygfjpDayPower = tdHYGFStationMonthGenerateMapper.selectList(
// DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
// DateFormat dfty = new SimpleDateFormat("yyyy-MM");
//
// Date star = dft.parse(timeNum);//开始时间
// String yearMonth= dfty.format(star);
List<TdHYGFStationMonthGenerate> hygfjpDayPower = TdHYGFStationMonthGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationMonthGenerate>().
eq("month_time", yearMonth).and(wrapper -> {
eq("day_time", timeNum).and(wrapper -> {
wrapper.isNull("regional_companies_code")
.or()
.isNull("amos_company_code")
......@@ -56,7 +57,7 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName());
dayPower.setStationState(jpStation.getState());
tdHYGFStationMonthGenerateMapper.insert(dayPower);
TdHYGFStationMonthGenerateMapper.insert(dayPower);
}
}
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationYearGenerateImpl.java
View file @ d6cbfbe9
package com.yeejoin.amos.api.householdapi.face.service.business;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* @description:
......@@ -30,13 +30,13 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
public void updateAscription(String timeNum) {
try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy");
DateFormat dfty = new SimpleDateFormat("yyyy-MM");
Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star);
List<TdHYGFStationYearGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationYearGenerate>().
eq("year", yearMonth).and(wrapper -> {
eq("month_time", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code")
.or()
.isNull("amos_company_code")
......@@ -51,7 +51,7 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
for (TdHYGFStationYearGenerate dayPower : hygfjpDayPower) {
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
eq("third_station_id", dayPower.getThirdStationId()));
if(jpStation!=null) {
if(jpStation!=null){
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName());
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHygfJpInverterWarn.java
View file @ d6cbfbe9
......@@ -37,7 +37,7 @@ public class TdHygfJpInverterWarn {
/**
* 等级
*/
@TableField("level")
@TableField("`level`")
private String level;
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml
View file @ d6cbfbe9
......@@ -96,6 +96,28 @@
<artifactId>seata-spring-boot-starter</artifactId>
<version>1.8.0</version>
</dependency>
<!-- ICBC工行支付 -->
<dependency>
<groupId>com.icbc.sdk</groupId>
<artifactId>hsm-software-share</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>com.icbc.sdk</groupId>
<artifactId>icbc-api-sdk-cop</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.icbc.sdk</groupId>
<artifactId>icbc-api-sdk-cop-io</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<build>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/RegionDto.java
View file @ d6cbfbe9
......@@ -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/HouseholdPv.java
View file @ d6cbfbe9
......@@ -132,7 +132,7 @@ public class HouseholdPv extends BaseEntity {
/**
* 告警等级
*/
@TableField("level_")
@TableField("`level`")
private String level;
/**
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/Region.java
View file @ d6cbfbe9
......@@ -34,7 +34,7 @@ public class Region {
/**
* 等级
*/
@TableField("LEVEL_")
@TableField("`LEVEL`")
private String level;
/**
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/feign/McbWarningFeign.java
View file @ d6cbfbe9
......@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
//@FeignClient(name = "${mcb.warning.name:MCB-SERVER}", path = "warning", configuration = {FeignConfiguration.class})
@FeignClient(name = "mcb", url = "http://10.20.1.160:10005", path = "warning", configuration = {
FeignConfiguration.class })
@FeignClient(name = "${mcb.warning.name:MCB-SERVER}", path = "warning", configuration = {FeignConfiguration.class})
//@FeignClient(name = "mcb", url = "http://10.20.1.160:10005", path = "warning", configuration = {
// FeignConfiguration.class })
public interface McbWarningFeign {
/**
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/amosproject/UserEmpowerMapper.xml
View file @ d6cbfbe9
......@@ -14,7 +14,7 @@
AND privilege_company.COMPANY_TYPE=#{companyType}
</if>
<if test="level != null and level != ''">
AND privilege_company.LEVEL_=#{level}
AND privilege_company.LEVEL=#{level}
</if>
<if test="companyOrgCode != null ">
AND privilege_company.ORG_CODE IN
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml
View file @ d6cbfbe9
......@@ -114,7 +114,7 @@
log.EVENT_LEVEL,
log.SOURCE_ATTRIBUTION_DESC,
log.SOURCE_ATTRIBUTION,
log.CONTENT_,
log.CONTENT,
warnLevel.COLOR,
source1.PROVINCE,
log.WARNING_SOURCE_TYPE,
......@@ -211,7 +211,7 @@
SELECT
warning.SEQUENCE_NBR warningId,
question.CREATE_DATE createDate,
warning.CONTENT_ warningContent,
warning.CONTENT warningContent,
question.COMPLETION_STATUS_DESC completionStatusDesc,
question.SOURCE_ATTRIBUTION_DESC sourceAttributionDesc
FROM
......@@ -272,7 +272,7 @@
question.COMPLETION_STATUS,
question.SOURCE_ATTRIBUTION_DESC,
question.SOURCE_ATTRIBUTION,
question.CONTENT_,
question.CONTENT,
question.LEVEL_DESC,
source1.PROVINCE
FROM
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java
View file @ d6cbfbe9
......@@ -17,7 +17,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 , pc.level from privilege_company pc where org_code = #{orgCode}")
CompanyModel getCompanyInfoByOrgCode(String orgCode);
List<CompanyModel> getCompanyBoList(@Param("companyType") String companyType,
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java
View file @ d6cbfbe9
......@@ -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/McbWarningServiceImpl.java
View file @ d6cbfbe9
......@@ -81,11 +81,6 @@ public class McbWarningServiceImpl implements IMcbWarningService {
}
List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, size, projectOrgCodes,
processingStatus, eventLevel, createDate, startTime, endTime, warningSourceType, objectName, overView);
if (CollectionUtil.isNotEmpty(records)) {
for (Map<String, Object> record : records) {
record.put("CONTENT", record.get("CONTENT_"));
}
}
Long total = mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate, startTime, endTime,
warningSourceType, objectName, overView);
page.setRecords(records);
......@@ -156,11 +151,6 @@ public class McbWarningServiceImpl implements IMcbWarningService {
}
List<Map<String, Object>> records = mcbWarningMapper.queryQuestionList(start, offset, projectOrgCodes,
completionStatus, startTime, endTime);
if (CollectionUtil.isNotEmpty(records)) {
for (Map<String, Object> record : records) {
record.put("CONTENT", record.get("CONTENT_"));
}
}
Long total = mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus, startTime, endTime);
page.setRecords(records);
page.setTotal(total);
......
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 @ d6cbfbe9
......@@ -12,7 +12,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
* @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 , pc.level from privilege_company pc where org_code = #{orgCode}")
CompanyModel getCompanyInfoByOrgCode(String orgCode);
}
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