Skip to content

A
amos-boot-biz
Commit def1b30d authored by chenzhao's avatar chenzhao
Browse files
Options

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

parents b2df1ac7 840a1a2c
Hide whitespace changes
Inline Side-by-side
Showing with 2254 additions and 1690 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/GoodWeRequestUtil.java
View file @ def1b30d
...@@ -99,9 +99,9 @@ public class GoodWeRequestUtil { ...@@ -99,9 +99,9 @@ public class GoodWeRequestUtil {
} }
} }
} }
if (jsonArray.size() == 0) { // if (jsonArray.size() == 0) {
jsonArray.add(jsonObject); // jsonArray.add(jsonObject);
} // }
} }
return jsonArray; return jsonArray;
} }
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/GoodWeConstant.java
View file @ def1b30d
...@@ -13,9 +13,10 @@ public class GoodWeConstant { ...@@ -13,9 +13,10 @@ public class GoodWeConstant {
public static final HashMap<String, String> stationStaus = new HashMap<String, String>() { public static final HashMap<String, String> stationStaus = new HashMap<String, String>() {
{ {
put("-1", "离线"); put("-1", "离线");
put("0", "待机"); put("0", "在线");
put("1", "正常"); put("1", "在线");
put("2", "停机"); put("2", "报警");
put("-2", "报警");
} }
}; };
public static final HashMap<String, String> warningStaus = new HashMap<String, String>() { public static final HashMap<String, String> warningStaus = new HashMap<String, String>() {
...@@ -31,6 +32,27 @@ public class GoodWeConstant { ...@@ -31,6 +32,27 @@ public class GoodWeConstant {
} }
}; };
public static final HashMap<String, String> types = new HashMap<String, String>() {
{
put("0", "家庭户用");
put("1", "工商业屋顶");
put("2", "地面电站");
put("3", "扶贫电站");
put("4", "储能电站");
}
};
public static final HashMap<String, List<String>> errorCodeMap = new HashMap<String, List<String>>() { public static final HashMap<String, List<String>> errorCodeMap = new HashMap<String, List<String>>() {
{ {
put("E0", Arrays.asList("漏电流自检异常", put("E0", Arrays.asList("漏电流自检异常",
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java
View file @ def1b30d
...@@ -85,16 +85,16 @@ public class HouseholdTestController { ...@@ -85,16 +85,16 @@ public class HouseholdTestController {
@PostMapping(value = "/goodweDemo") @PostMapping(value = "/goodweDemo")
@ApiOperation(httpMethod = "POST", value = "固德威示例", notes = "固德威示例") @ApiOperation(httpMethod = "POST", value = "固德威示例", notes = "固德威示例")
public void goodweDemo() throws IOException { public void goodweDemo() throws IOException {
// goodWeDataAcquisitionService.stationList(); goodWeDataAcquisitionService.stationList();
// goodWeDataAcquisitionService.stationDetail(); // goodWeDataAcquisitionService.stationDetail();
// goodWeDataAcquisitionService.inverAlramInfo(); // goodWeDataAcquisitionService.inverAlramInfo();
// goodWeDataAcquisitionService.inverterList(); // goodWeDataAcquisitionService.inverterList();
// goodWeDataAcquisitionService.inverterDetail(); // goodWeDataAcquisitionService.inverterDetail();
// goodWeDataAcquisitionService.stationMonthGen(); // goodWeDataAcquisitionService.stationMonthGen();
// goodWeDataAcquisitionService.stationYearGen(); // goodWeDataAcquisitionService.stationYearGen();
// goodWeDataAcquisitionService.inverterDetail(); // goodWeDataAcquisitionService.inverterDetail();
goodWeDataAcquisitionService.inverterMonthGen(); // goodWeDataAcquisitionService.inverterMonthGen();
goodWeDataAcquisitionService.inverterYearGen(); // goodWeDataAcquisitionService.inverterYearGen();
} }
/** /**
...@@ -111,8 +111,8 @@ public class HouseholdTestController { ...@@ -111,8 +111,8 @@ public class HouseholdTestController {
// goLangDataAcquisitionService.collectorList(); // goLangDataAcquisitionService.collectorList();
// goLangDataAcquisitionService.inverterList(); // goLangDataAcquisitionService.inverterList();
// goLangDataAcquisitionService.collectorDetail(); // goLangDataAcquisitionService.collectorDetail();
goLangDataAcquisitionService.inverterDetail(); // goLangDataAcquisitionService.inverterDetail();
// goLangDataAcquisitionService.inverAlramInfo(); // goLangDataAcquisitionService.inverAlramInfo();
} }
...@@ -125,13 +125,13 @@ public class HouseholdTestController { ...@@ -125,13 +125,13 @@ public class HouseholdTestController {
@PostMapping(value = "/sofarnew") @PostMapping(value = "/sofarnew")
@ApiOperation(httpMethod = "POST", value = "首航", notes = "首航") @ApiOperation(httpMethod = "POST", value = "首航", notes = "首航")
public void sofarnew() throws IOException { public void sofarnew() throws IOException {
sofarDataAcquisitionService.stationList(); // sofarDataAcquisitionService.stationList();
// goLangDataAcquisitionService.stationDetail(); // goLangDataAcquisitionService.stationDetail();
// goLangDataAcquisitionService.collectorList(); // goLangDataAcquisitionService.collectorList();
// goLangDataAcquisitionService.inverterList(); // goLangDataAcquisitionService.inverterList();
// goLangDataAcquisitionService.collectorDetail(); // goLangDataAcquisitionService.collectorDetail();
// goLangDataAcquisitionService.inverterDetail(); // goLangDataAcquisitionService.inverterDetail();
// goLangDataAcquisitionService.inverAlramInfo(); goLangDataAcquisitionService.inverAlramInfo();
} }
/** /**
...@@ -149,7 +149,7 @@ public class HouseholdTestController { ...@@ -149,7 +149,7 @@ public class HouseholdTestController {
//// goLangDataAcquisitionService.inverterList(); //// goLangDataAcquisitionService.inverterList();
// goLangDataAcquisitionService.collectorDetail(); // goLangDataAcquisitionService.collectorDetail();
// goLangDataAcquisitionService.inverterDetail(); // goLangDataAcquisitionService.inverterDetail();
// goLangDataAcquisitionService.inverAlramInfo(); // goLangDataAcquisitionService.inverAlramInfo();
} }
/** /**
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/GoodWeDataAcquisitionService.java
View file @ def1b30d
...@@ -35,5 +35,5 @@ public interface GoodWeDataAcquisitionService { ...@@ -35,5 +35,5 @@ public interface GoodWeDataAcquisitionService {
/** /**
* @descrption 采集器告警列表数据入库 * @descrption 采集器告警列表数据入库
*/ */
void inverAlramInfo(); void inverAlramInfo(String stationid);
} }
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
View file @ def1b30d
...@@ -109,19 +109,22 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -109,19 +109,22 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
jpStation.setCapacity(goodWeStationList.getCapacity()); jpStation.setCapacity(goodWeStationList.getCapacity());
jpStation.setName(goodWeStationList.getStationname()); jpStation.setName(goodWeStationList.getStationname());
jpStation.setPrice(0.42); jpStation.setPrice(0.42);
jpStation.setAddress(goodWeStationList.getAddress()); jpStation.setAddress(goodWeStationList.getLocation());
jpStation.setLatitude(goodWeStationList.getLatitude()); jpStation.setLatitude(goodWeStationList.getLatitude());
jpStation.setLongitude(goodWeStationList.getLongitude()); jpStation.setLongitude(goodWeStationList.getLongitude());
jpStation.setUserName(goodWeStationList.getOwner_name()); jpStation.setUserName(goodWeStationList.getOwner_name()==null?goodWeStationList.getStationname():goodWeStationList.getOwner_name());
jpStation.setUserPhone(goodWeStationList.getOwner_phone()); jpStation.setUserPhone(goodWeStationList.getOwner_phone());
jpStation.setStationContact(goodWeStationList.getOwner_name()); jpStation.setStationContact(goodWeStationList.getOwner_name());
jpStation.setModuleCount(0); jpStation.setModuleCount(0);
jpStation.setRealTimePower(goodWeStationList.getPac() * GoodWeConstant.wToKw); jpStation.setRealTimePower(goodWeStationList.getPac()!=null?goodWeStationList.getPac() * GoodWeConstant.wToKw:null);
jpStation.setState(GoodWeConstant.stationStaus.get(goodWeStationList.getStatus())); jpStation.setState(goodWeStationList.getStatus()!=null?GoodWeConstant.stationStaus.get(goodWeStationList.getStatus()+""):null);
jpStation.setDayGenerate(goodWeStationList.getEday()); jpStation.setDayGenerate(goodWeStationList.getEday());
jpStation.setDayIncome(goodWeStationList.getEday_income()); jpStation.setDayIncome(goodWeStationList.getEday_income());
jpStation.setAccumulatedPower(goodWeStationList.getEtotal()); jpStation.setAccumulatedPower(goodWeStationList.getEtotal());
jpStation.setCumulativeIncome(goodWeStationList.getEtotal_income()); jpStation.setCumulativeIncome(goodWeStationList.getEtotal_income());
jpStation.setType(goodWeStationList.getPowerstation_type());
jpStation.setRecDate(new Date());
if (ObjectUtils.isEmpty(jpStation.getSequenceNbr())) { if (ObjectUtils.isEmpty(jpStation.getSequenceNbr())) {
jpStation.setCreateTime(new Date(goodWeStationList.getCreatedTime())); jpStation.setCreateTime(new Date(goodWeStationList.getCreatedTime()));
if (ObjectUtils.isNotEmpty(goodWeStationList.getTurnon_time())) { if (ObjectUtils.isNotEmpty(goodWeStationList.getTurnon_time())) {
...@@ -133,8 +136,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -133,8 +136,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
jpStationMapper.updateById(jpStation); jpStationMapper.updateById(jpStation);
} }
this.inverAlramInfo(goodWeStationList.getPowerstation_id());
//增加td 电站区域公司，经销商绑定表 //增加td 电站区域公司，经销商绑定表
// TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>(). // TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
// eq("third_code",PVProducerInfoEnum.GDW.getCode()). // eq("third_code",PVProducerInfoEnum.GDW.getCode()).
...@@ -287,6 +289,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -287,6 +289,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
public void stationDetail() { public void stationDetail() {
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds(); List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
stationIds.forEach(stationId -> { stationIds.forEach(stationId -> {
...@@ -316,6 +319,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -316,6 +319,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
public void stationMonthGen() { public void stationMonthGen() {
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds(); List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
stationIds.forEach(stationId -> { stationIds.forEach(stationId -> {
...@@ -340,6 +344,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -340,6 +344,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
public void stationYearGen() { public void stationYearGen() {
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds(); List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
stationIds.forEach(stationId -> { stationIds.forEach(stationId -> {
...@@ -375,6 +380,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -375,6 +380,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
public void inverterList() { public void inverterList() {
List<String> stationIds = goodWeStationMonitorListMapper.getStationIds(); List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
stationIds.stream().forEach(stationId -> { stationIds.stream().forEach(stationId -> {
...@@ -413,6 +419,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -413,6 +419,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
public void inverterDetail() { public void inverterDetail() {
List<String> goodweSnList = jpInverterMapper.getGoodWeSnCodes(); List<String> goodweSnList = jpInverterMapper.getGoodWeSnCodes();
List<List<String>> splitList = Lists.partition(goodweSnList, 50); List<List<String>> splitList = Lists.partition(goodweSnList, 50);
...@@ -686,6 +693,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -686,6 +693,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
public void inverterMonthGen() { public void inverterMonthGen() {
List<String> sns =jpInverterMapper.getGoodWeSnCodes() ; List<String> sns =jpInverterMapper.getGoodWeSnCodes() ;
String currentMonth = DateUtil.format(new Date(), "yyyyMM"); String currentMonth = DateUtil.format(new Date(), "yyyyMM");
...@@ -710,6 +718,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -710,6 +718,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
@Scheduled(cron = "${dataRequstScheduled.GoodWe}")
public void inverterYearGen() { public void inverterYearGen() {
String currentYear = DateUtil.format(new Date(), "yyyy"); String currentYear = DateUtil.format(new Date(), "yyyy");
List<String> sns =jpInverterMapper.getGoodWeSnCodes() ; List<String> sns =jpInverterMapper.getGoodWeSnCodes() ;
...@@ -734,14 +743,15 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -734,14 +743,15 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
@Override @Override
public void inverAlramInfo() { public void inverAlramInfo(String stationid) {
HashMap<String, Object> requestInfo = new HashMap<>(); HashMap<String, Object> requestInfo = new HashMap<>();
String today = DateUtil.today(); String today = DateUtil.today();
requestInfo.put("page_index", 1); requestInfo.put("page_index", 1);
requestInfo.put("page_size", 1000); requestInfo.put("page_size", 1000);
requestInfo.put("starttime", today + " 00:00:00"); requestInfo.put("starttime", today + " 00:00:00");
requestInfo.put("endtime", today + " 23:59:59"); requestInfo.put("endtime", today + " 23:59:59");
requestInfo.put("status", 2); requestInfo.put("stationid", stationid);
// requestInfo.put("status", 2);
String requstParam = JSON.toJSONString(requestInfo); String requstParam = JSON.toJSONString(requestInfo);
List<GoodWeAlarmDto> alarmList = goodWeRequestUtil.getResPonse(GoodWeConstant.alarmListUrl, GoodWeConstant.requestPost, requstParam, GoodWeConstant.resovleRule_data_list, GoodWeAlarmDto.class); List<GoodWeAlarmDto> alarmList = goodWeRequestUtil.getResPonse(GoodWeConstant.alarmListUrl, GoodWeConstant.requestPost, requstParam, GoodWeConstant.resovleRule_data_list, GoodWeAlarmDto.class);
alarmList.forEach(goodWeAlarmDto -> { alarmList.forEach(goodWeAlarmDto -> {
......
amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties
View file @ def1b30d
...@@ -74,6 +74,6 @@ dataRequstScheduled.huawei=0 0/50 * * * * ...@@ -74,6 +74,6 @@ dataRequstScheduled.huawei=0 0/50 * * * *
dataRequstScheduled.keshida=0 0/50 * * * * dataRequstScheduled.keshida=0 0/50 * * * *
dataRequstScheduled.Sunlight=0 0/50 * * * * dataRequstScheduled.Sunlight=0 0/50 * * * *
dataRequstScheduled.GoodWe=0 0/50 * * * * dataRequstScheduled.GoodWe=0 0/3 * * * *
dataRequstScheduled.Sofar=0 0/3 * * * * dataRequstScheduled.Sofar=0 0/50 * * * *
\ No newline at end of file \ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java
View file @ def1b30d
...@@ -32,6 +32,9 @@ public class PowerStationDto extends BaseDto { ...@@ -32,6 +32,9 @@ public class PowerStationDto extends BaseDto {
@ApiModelProperty(value = "服务代理商") @ApiModelProperty(value = "服务代理商")
private String serviceAgent; private String serviceAgent;
@ApiModelProperty(value = "区域公司")
private String regionalCompaniesName;
@ApiModelProperty(value = "电站类型") @ApiModelProperty(value = "电站类型")
private String powerStationType; private String powerStationType;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java
View file @ def1b30d
...@@ -19,5 +19,6 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> { ...@@ -19,5 +19,6 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"a.developer_code","a.regional_companies_code","a.developer_user_id"} ,fieldConditions ={"in","in","in"}, relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField={"a.developer_code","a.regional_companies_code","a.developer_user_id"} ,fieldConditions ={"in","in","in"}, relationship="and")
List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode, List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode,
@Param("ownersName")String ownersName, @Param("ownersName")String ownersName,
@Param("serviceAgent")String serviceAgent); @Param("serviceAgent")String serviceAgent,
@Param("regionalCompaniesName")String regionalCompaniesName);
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml
View file @ def1b30d
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
b.initiate_status, b.initiate_status,
b.contract_lock_id, b.contract_lock_id,
hygf_peasant_household.regional_companies_code, hygf_peasant_household.regional_companies_code,
hygf_peasant_household.regional_companies_name,
hygf_peasant_household.developer_code, hygf_peasant_household.developer_code,
hygf_peasant_household.developer_user_id hygf_peasant_household.developer_user_id
from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id from hygf_household_contract where hygf_household_contract.status !='已作废' from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id from hygf_household_contract where hygf_household_contract.status !='已作废'
...@@ -21,7 +22,10 @@ ...@@ -21,7 +22,10 @@
and hygf_power_station.owners_name like concat(concat("%",#{ownersName}),"%") and hygf_power_station.owners_name like concat(concat("%",#{ownersName}),"%")
</if> </if>
<if test="serviceAgent!=null and serviceAgent!=''"> <if test="serviceAgent!=null and serviceAgent!=''">
and hygf_power_station.service_agent=#{serviceAgent} and hygf_power_station.service_agent like concat(concat("%",#{serviceAgent}),"%")
</if>
<if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
and hygf_peasant_household.regional_companies_name like concat(concat("%",#{regionalCompaniesName}),"%")
</if> </if>
ORDER BY hygf_power_station.rec_date desc ORDER BY hygf_power_station.rec_date desc
) a ) a
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java
View file @ def1b30d
...@@ -100,12 +100,14 @@ public class PowerStationController extends BaseController { ...@@ -100,12 +100,14 @@ public class PowerStationController extends BaseController {
public ResponseModel<Page<PowerStationDto>> queryForPage(@RequestParam(value = "current") int current, public ResponseModel<Page<PowerStationDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size, @RequestParam(value = "size") int size,
@RequestParam(value = "powerStationCode",required = false)String powerStationCode, @RequestParam(value = "powerStationCode",required = false)String powerStationCode,
@RequestParam(value = "ownersName",required = false)String ownersName) { @RequestParam(value = "ownersName",required = false)String ownersName,
@RequestParam(value = "serviceAgent",required = false)String serviceAgent,
@RequestParam(value = "regionalCompaniesName",required = false)String regionalCompaniesName) {
Page<PowerStationDto> page = new Page<PowerStationDto>(); Page<PowerStationDto> page = new Page<PowerStationDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
AgencyUserModel userInfo = getUserInfo(); AgencyUserModel userInfo = getUserInfo();
return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo)); return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName));
} }
/** /**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ def1b30d
...@@ -25,6 +25,7 @@ import org.apache.poi.ss.formula.functions.T; ...@@ -25,6 +25,7 @@ import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.component.emq.EmqKeeper; import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.exception.BaseException; import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.rdbms.annotation.Condition; import org.typroject.tyboot.core.rdbms.annotation.Condition;
...@@ -45,47 +46,48 @@ import java.util.stream.Collectors; ...@@ -45,47 +46,48 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
@Slf4j @Slf4j
public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerStation, PowerStationMapper> implements IPowerStationService { public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerStation, PowerStationMapper>
implements IPowerStationService {
@Autowired
IdxFeginService idxFeginService; @Autowired
IdxFeginService idxFeginService;
@Autowired
IPowerStationService powerStationService; @Autowired
@Autowired IPowerStationService powerStationService;
DesignInformationMapper designInformationMapper; @Autowired
@Autowired DesignInformationMapper designInformationMapper;
DesignInformationServiceImpl designInformationService; @Autowired
@Autowired DesignInformationServiceImpl designInformationService;
PeasantHouseholdServiceImpl peasantHouseholdService; @Autowired
PeasantHouseholdServiceImpl peasantHouseholdService;
private static final String IDX_REQUEST_STATE="200";
private static final String VERIFY_RESULT_YES="0"; private static final String IDX_REQUEST_STATE = "200";
private static final String VERIFY_RESULT_NO="1"; private static final String VERIFY_RESULT_YES = "0";
private static final String VERIFY_RESULT_NO = "1";
@Autowired
WorkflowFeignClient workflowFeignClient; @Autowired
@Autowired WorkflowFeignClient workflowFeignClient;
HouseholdContractServiceImpl householdContractServiceImpl; @Autowired
@Autowired HouseholdContractServiceImpl householdContractServiceImpl;
PersonnelBusinessMapper personnelBusinessMapper; @Autowired
@Autowired PersonnelBusinessMapper personnelBusinessMapper;
ToDoTasksMapper toDoTasksMapper; @Autowired
@Autowired ToDoTasksMapper toDoTasksMapper;
protected EmqKeeper emqKeeper; @Autowired
@Autowired protected EmqKeeper emqKeeper;
ToDoTasksServiceImpl toDoTasksServiceImpl; @Autowired
@Autowired ToDoTasksServiceImpl toDoTasksServiceImpl;
UserMessageMapper userMessageMapper; @Autowired
@Autowired UserMessageMapper userMessageMapper;
PowerStationMapper powerStationMapper; @Autowired
@Autowired PowerStationMapper powerStationMapper;
AmosRequestContext requestContext; @Autowired
@Autowired AmosRequestContext requestContext;
WorkflowImpl workflow; @Autowired
WorkflowImpl workflow;
public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){
String serviceAgent =null; public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName) {
// Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles(); // Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
// Collection<List<RoleModel>> roleModels = orgRoles.values(); // Collection<List<RoleModel>> roleModels = orgRoles.values();
// if(roleModels !=null){ // if(roleModels !=null){
...@@ -100,58 +102,57 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -100,58 +102,57 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// } // }
// } // }
//获取用户所在经销商单位 // 获取用户所在经销商单位
// UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId()); // UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
// //
// if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){ // if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
// serviceAgent=userUnitInformationDto.getAmosDealerName(); // serviceAgent=userUnitInformationDto.getAmosDealerName();
// } // }
//return this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent); // return
return this.queryPage((int) page.getCurrent(), (int) page.getSize(),powerStationCode,ownersName,serviceAgent); // this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
} return this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
serviceAgent,regionalCompaniesName);
//查询电站审核记录 }
public Page<PowerStationDto> queryPage(int current, int size,
String powerStationCode, // 查询电站审核记录
String ownersName,String serviceAgent) { public Page<PowerStationDto> queryPage(int current, int size, String powerStationCode, String ownersName,
String serviceAgent,String regionalCompaniesName) {
PageHelper.startPage(current, size);
List<PowerStationDto> list= powerStationMapper.queryPage(powerStationCode,ownersName,serviceAgent); PageHelper.startPage(current, size);
List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName);
PageInfo<PowerStationDto> pages = new PageInfo(list); PageInfo<PowerStationDto> pages = new PageInfo(list);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>(); com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();
pagenew.setCurrent(current); pagenew.setCurrent(current);
pagenew.setTotal(pages.getTotal()); pagenew.setTotal(pages.getTotal());
pagenew.setSize(size); pagenew.setSize(size);
pagenew.setRecords(pages.getList()); pagenew.setRecords(pages.getList());
return pagenew; return pagenew;
} }
/**
* 分页查询
/** */
* 分页查询 public Page<PowerStationDto> queryForPowerStationPage(Page<PowerStationDto> page,
*/ @Condition(Operator.like) String powerStationCode, @Condition(Operator.like) String ownersName,
public Page<PowerStationDto> queryForPowerStationPage(Page<PowerStationDto> page,@Condition(Operator.like) String powerStationCode,@Condition(Operator.like) String ownersName,String serviceAgent) { String serviceAgent) {
return this.queryForPage(page, "rec_date", false,powerStationCode,ownersName,serviceAgent); return this.queryForPage(page, "rec_date", false, powerStationCode, ownersName, serviceAgent);
} }
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
public List<PowerStationDto> queryForPowerStationList() { public List<PowerStationDto> queryForPowerStationList() {
return this.queryForList("" , false); return this.queryForList("", false);
} }
@Override
@Override @Transactional
@Transactional public boolean savePowerStation(PowerStation powerStation, boolean flag, String name, String meg) {
public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) { try {
try{ // 流程节点code
//流程节点code
// if (flag) { // if (flag) {
// String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId()); // String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
// WorkDto workDto=this.getNodeInfoCode(flowTaskIdnext); // WorkDto workDto=this.getNodeInfoCode(flowTaskIdnext);
...@@ -160,122 +161,135 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -160,122 +161,135 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// powerStation.setNodeRouting(workDto.getNodeRouting()); // powerStation.setNodeRouting(workDto.getNodeRouting());
// } // }
powerStation.setRecDate(new Date()); powerStation.setRecDate(new Date());
Boolean fl= this.saveOrUpdate(powerStation); Boolean fl = this.saveOrUpdate(powerStation);
PowerStationNodeEnum powerStationNodeEnum= PowerStationNodeEnum.getNodeByCode(powerStation.getNextProcessNode()); PowerStationNodeEnum powerStationNodeEnum = PowerStationNodeEnum
.getNodeByCode(powerStation.getNextProcessNode());
if (flag){
if (flag) {
ToDoTasks toDoTasks=null;
if(PowerStationNodeEnum.经销商上传图纸.getCode().equals(powerStationNodeEnum.getCode())||PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())){ ToDoTasks toDoTasks = null;
//获取经销商orgcode if (PowerStationNodeEnum.经销商上传图纸.getCode().equals(powerStationNodeEnum.getCode())
PeasantHousehold peasantHouseholdd= peasantHouseholdService.getById(powerStation.getPeasantHouseholdId()); || PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())) {
toDoTasks= new ToDoTasks ( TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户"+name+"电站勘察待"+powerStationNodeEnum.getName(),peasantHouseholdd.getDeveloperCode()); // 获取经销商orgcode
if(PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())){ PeasantHousehold peasantHouseholdd = peasantHouseholdService
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHouseholdd.getDeveloperUserId(),toDoTasks,meg); .getById(powerStation.getPeasantHouseholdId());
}else{ toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(),
toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks,meg); "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(),
} peasantHouseholdd.getDeveloperCode());
}else{ if (PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())) {
toDoTasks= new ToDoTasks ( TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户"+name+"电站勘察待"+powerStationNodeEnum.getName(),null); toDoTasksServiceImpl.addToDoTasksByUserId(peasantHouseholdd.getDeveloperUserId(), toDoTasks,
toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks,meg); meg);
} } else {
}else{ toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(), toDoTasks, meg);
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>(); }
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站审核.getCode()); } else {
wrapper.eq(ToDoTasks::getState, "待办"); toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(),
wrapper.eq(ToDoTasks::getBusinessId, powerStation.getSequenceNbr()); "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), null);
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper); toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(), toDoTasks, meg);
if(doTasks!=null){ }
doTasks.setState("已办"); } else {
doTasks.setCompleteTime(new Date()); LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站审核.getCode());
toDoTasksMapper.updateById(doTasks); wrapper.eq(ToDoTasks::getState, "待办");
emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false); wrapper.eq(ToDoTasks::getBusinessId, powerStation.getSequenceNbr());
ToDoTasks doTasks = toDoTasksMapper.selectOne(wrapper);
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成."+meg, doTasks.getAmosOrgCode()); if (doTasks != null) {
userMessageMapper.insert(userMessage); doTasks.setState("已办");
emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false); doTasks.setCompleteTime(new Date());
} toDoTasksMapper.updateById(doTasks);
} emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTasks).getBytes(), 2, false);
return fl; UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(),
}catch (Exception e){ doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + "已完成." + meg,
e.printStackTrace(); doTasks.getAmosOrgCode());
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); userMessageMapper.insert(userMessage);
} emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2,
} false);
@Override }
public PowerStation getObjByNhId(String id, String state) { }
LambdaQueryWrapper<PowerStation> wrapper = new LambdaQueryWrapper<>();
wrapper.ne(PowerStation::getProcessStatus, state); return fl;
wrapper.eq(PowerStation::getPeasantHouseholdId, id); } catch (Exception e) {
return this.baseMapper.selectOne(wrapper); e.printStackTrace();
} throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
@Override }
@Transactional
public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId, String planInstanceId, Map<String, Object> kv) { @Override
String meg=""; public PowerStation getObjByNhId(String id, String state) {
// 1. 业务相关数据落表 LambdaQueryWrapper<PowerStation> wrapper = new LambdaQueryWrapper<>();
PowerStation powerStation = this.baseMapper.selectById(stationId); wrapper.ne(PowerStation::getProcessStatus, state);
PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode); wrapper.eq(PowerStation::getPeasantHouseholdId, id);
String result = String.valueOf(kv.get("approvalStatus")); return this.baseMapper.selectOne(wrapper);
boolean flag = true; }
if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
@Override
powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName()); @Transactional
public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId,
this.updateSeve(nodeCode,powerStation.getPeasantHouseholdId(),kv); String planInstanceId, Map<String, Object> kv) {
} else { String meg = "";
// 1. 业务相关数据落表
if (VERIFY_RESULT_NO.equals(result)) { PowerStation powerStation = this.baseMapper.selectById(stationId);
powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName()); PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode);
} String result = String.valueOf(kv.get("approvalStatus"));
PowerStationProcessStateEnum resultObj = PowerStationProcessStateEnum.getStateByResult(result); boolean flag = true;
switch (nodeByCode) { if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)
case 设计审核: || PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
powerStation.setTechnologyStatus(resultObj.getName());
break; powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
case 投融审核:
powerStation.setDesignStatus(resultObj.getName()); this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv);
break; } else {
case 法务审核:
powerStation.setBusinessStatus(resultObj.getName()); if (VERIFY_RESULT_NO.equals(result)) {
powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName());
if (VERIFY_RESULT_YES.equals(result)) { }
LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>(); PowerStationProcessStateEnum resultObj = PowerStationProcessStateEnum.getStateByResult(result);
lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId()); switch (nodeByCode) {
lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode()); case 设计审核:
householdContractServiceImpl.update(lambdaUw); powerStation.setTechnologyStatus(resultObj.getName());
} break;
case 投融审核:
break; powerStation.setDesignStatus(resultObj.getName());
case 文件审核: break;
if (VERIFY_RESULT_YES.equals(result)) { case 法务审核:
flag = false; powerStation.setBusinessStatus(resultObj.getName());
powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
} if (VERIFY_RESULT_YES.equals(result)) {
powerStation.setDrawingReview(resultObj.getName()); LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
break; lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
default: lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode());
break; householdContractServiceImpl.update(lambdaUw);
} }
}
meg="任务明细："+nodeByCode+(VERIFY_RESULT_YES.equals(result)?"通过":"不通过"); break;
// 2. 更新流程状态 case 文件审核:
String code = null; if (VERIFY_RESULT_YES.equals(result)) {
try{ flag = false;
// 3. 工作流执行 powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
// FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv); }
// if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) { powerStation.setDrawingReview(resultObj.getName());
// code = submit.getResult(); break;
// log.info("流程执行成功：{}", code); default:
// 获取流程信息 break;
}
}
meg = "任务明细：" + nodeByCode + (VERIFY_RESULT_YES.equals(result) ? "通过" : "不通过");
// 2. 更新流程状态
String code = null;
try {
// 3. 工作流执行
// FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId,
// planInstanceId, null, null, null, kv);
// if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
// code = submit.getResult();
// log.info("流程执行成功：{}", code);
// 获取流程信息
// FeignClientResult<JSONObject> record = idxFeginService.getRecord(code); // FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
// if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) { // if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
// JSONObject resultObj = record.getResult(); // JSONObject resultObj = record.getResult();
...@@ -283,63 +297,62 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -283,63 +297,62 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// //
// } // }
// 执行工作流
//执行工作流 BasicGridAcceptance basicGridAcceptance = new BasicGridAcceptance();
BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance(); StandardDto standardDto = new StandardDto();
StandardDto standardDto = new StandardDto(); if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)
if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) { || PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
standardDto.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):""); standardDto.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
standardDto.setResult("0"); standardDto.setResult("0");
standardDto.setTaskId(powerStation.getFlowTaskId()); standardDto.setTaskId(powerStation.getFlowTaskId());
VariableDto variable = new VariableDto(); VariableDto variable = new VariableDto();
variable.setApprovalStatus("0"); variable.setApprovalStatus("0");
variable.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):""); variable.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
variable.setOperationTime(String.valueOf(kv.get("approveDate"))); variable.setOperationTime(String.valueOf(kv.get("approveDate")));
variable.setOperator(""); variable.setOperator("");
standardDto.setVariable(variable); standardDto.setVariable(variable);
}else{ } else {
standardDto.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):""); standardDto.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
standardDto.setResult(String.valueOf(kv.get("approvalStatus"))); standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
standardDto.setTaskId(powerStation.getFlowTaskId()); standardDto.setTaskId(powerStation.getFlowTaskId());
VariableDto variable = new VariableDto(); VariableDto variable = new VariableDto();
variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus"))); variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
variable.setComment(kv.get("approvalInfo")!=null?String.valueOf(kv.get("approvalInfo")):""); variable.setComment(kv.get("approvalInfo") != null ? String.valueOf(kv.get("approvalInfo")) : "");
variable.setOperationTime(String.valueOf(kv.get("approveDate"))); variable.setOperationTime(String.valueOf(kv.get("approveDate")));
variable.setOperator(String.valueOf(kv.get("approveName"))); variable.setOperator(String.valueOf(kv.get("approveName")));
standardDto.setVariable(variable); standardDto.setVariable(variable);
} }
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto,
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId()); requestContext.getUserId());
powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId()); powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());
powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds()); powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds());
powerStation.setNodeRouting(basicGridAcceptance.getNextNodeKey()!=null?PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey()):""); powerStation.setNodeRouting(basicGridAcceptance.getNextNodeKey() != null
powerStation.setNextProcessNode(basicGridAcceptance.getNextNodeKey()); ? PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey())
powerStation.setPromoter(basicGridAcceptance.getPromoter()); : "");
powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds()); powerStation.setNextProcessNode(basicGridAcceptance.getNextNodeKey());
powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName()); powerStation.setPromoter(basicGridAcceptance.getPromoter());
powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg); powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
if(!flag){
//更新农户状态 powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
String peasantHouseholdId = powerStation.getPeasantHouseholdId(); if (!flag) {
PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(Long.valueOf(peasantHouseholdId)); // 更新农户状态
peasantHousehold.setSurveyOrNot(3); String peasantHouseholdId = powerStation.getPeasantHouseholdId();
peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode()); PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper()
peasantHouseholdService.saveOrUpdate(peasantHousehold); .selectById(Long.valueOf(peasantHouseholdId));
} peasantHousehold.setSurveyOrNot(3);
//} peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode());
}catch (Exception e){ peasantHouseholdService.saveOrUpdate(peasantHousehold);
e.printStackTrace(); }
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); // }
} catch (Exception e) {
} e.printStackTrace();
return code; throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
return code;
// String meg=""; // String meg="";
// // 1. 业务相关数据落表 // // 1. 业务相关数据落表
...@@ -417,118 +430,115 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -417,118 +430,115 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// //
// } // }
// return code; // return code;
} }
public WorkDto getNodeInfoCode(String flowTaskId) {
public WorkDto getNodeInfoCode(String flowTaskId){ WorkDto workDto = null;
WorkDto workDto=null; try {
try{ FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
FeignClientResult<JSONObject> jSONObject= workflowFeignClient.getNodeInfo(flowTaskId); if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) {
if(IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))){ JSONObject js = jSONObject.getResult();
JSONObject js=jSONObject.getResult(); if (js == null) {
if(js==null){ throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); }
} LinkedHashMap taskInfo = js.get("taskInfo") != null ? (LinkedHashMap) js.get("taskInfo") : null;
LinkedHashMap taskInfo= js.get("taskInfo")!=null?(LinkedHashMap)js.get("taskInfo"):null; String nextProcessNode = taskInfo != null ? taskInfo.get("taskDefinitionKey").toString() : null;
String nextProcessNode=taskInfo!=null?taskInfo.get("taskDefinitionKey").toString():null; List<LinkedHashMap> executor = js.get("executor") != null ? (List<LinkedHashMap>) js.get("executor")
List<LinkedHashMap> executor= js.get("executor")!=null?( List<LinkedHashMap>)js.get("executor"):null; : null;
String nodeRole=null; String nodeRole = null;
if(!executor.isEmpty()){ if (!executor.isEmpty()) {
List<String> idList = executor.stream().map(e->e.get("groupId").toString()).collect(Collectors.toList()); List<String> idList = executor.stream().map(e -> e.get("groupId").toString())
nodeRole=StringUtils.join(idList,","); .collect(Collectors.toList());
} nodeRole = StringUtils.join(idList, ",");
}
LinkedHashMap extensionInfo= js.get("extensionInfo")!=null?(LinkedHashMap)js.get("extensionInfo"):null;
String nodeRouting=extensionInfo!=null?extensionInfo.get("nodeRole").toString():null; LinkedHashMap extensionInfo = js.get("extensionInfo") != null ? (LinkedHashMap) js.get("extensionInfo")
workDto=new WorkDto(nodeRouting, nodeRole, nextProcessNode); : null;
} String nodeRouting = extensionInfo != null ? extensionInfo.get("nodeRole").toString() : null;
workDto = new WorkDto(nodeRouting, nodeRole, nextProcessNode);
return workDto; }
}catch (Exception e){
e.printStackTrace(); return workDto;
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); } catch (Exception e) {
e.printStackTrace();
} throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
}
public String getTaskNoAuth(String processInstanceId){ }
String flowTaskId=null;
try{ public String getTaskNoAuth(String processInstanceId) {
JSONObject jSONObject= workflowFeignClient.getTaskNoAuth(processInstanceId); String flowTaskId = null;
if(IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))){ try {
LinkedHashMap jsd= jSONObject.get("data")!=null?(LinkedHashMap)jSONObject.get("data"):null; JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
flowTaskId=jsd!=null?jsd.get("id").toString():null; if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) {
} LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null;
if(flowTaskId==null){ flowTaskId = jsd != null ? jsd.get("id").toString() : null;
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); }
} if (flowTaskId == null) {
return flowTaskId; throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}catch (Exception e){ }
e.printStackTrace(); return flowTaskId;
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); } catch (Exception e) {
e.printStackTrace();
} throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
}
// 设计信息填充 }
// 设计信息填充
public void updateSeve(String nodeCode,String peasantHouseholdId, Map<String, Object> kv ){
LambdaQueryWrapper<DesignInformation> wrapper = new LambdaQueryWrapper<>(); public void updateSeve(String nodeCode, String peasantHouseholdId, Map<String, Object> kv) {
wrapper.eq(DesignInformation::getPeasantHouseholdId, peasantHouseholdId); LambdaQueryWrapper<DesignInformation> wrapper = new LambdaQueryWrapper<>();
DesignInformation designInformation=designInformationMapper.selectOne(wrapper); wrapper.eq(DesignInformation::getPeasantHouseholdId, peasantHouseholdId);
if(designInformation!=null){ DesignInformation designInformation = designInformationMapper.selectOne(wrapper);
DesignInformation designInformationnew=this.mapToBean(kv,DesignInformation.class); if (designInformation != null) {
DesignInformation designInformationnew = this.mapToBean(kv, DesignInformation.class);
if (PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
if (PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) { designInformation.setPeasantHouseholdId(peasantHouseholdId);
designInformation.setPeasantHouseholdId(peasantHouseholdId); designInformation.setComponentLayout(designInformationnew.getComponentLayout());
designInformation.setComponentLayout(designInformationnew.getComponentLayout()); designInformation.setComponentBracket(designInformationnew.getComponentBracket());
designInformation.setComponentBracket(designInformationnew.getComponentBracket()); designInformation.setConnectionLine(designInformationnew.getConnectionLine());
designInformation.setConnectionLine(designInformationnew.getConnectionLine()); designInformation.setOnceLine(designInformationnew.getOnceLine());
designInformation.setOnceLine(designInformationnew.getOnceLine()); designInformationMapper.updateById(designInformation);
designInformationMapper.updateById(designInformation); } else {
}else{ // designInformationnew.setTypicalDiagram(designInformationnew.getTypicalDiagram());
// designInformationnew.setTypicalDiagram(designInformationnew.getTypicalDiagram()); designInformationnew.setPeasantHouseholdId(peasantHouseholdId);
designInformationnew.setPeasantHouseholdId(peasantHouseholdId); designInformationnew.setComponentLayout(designInformation.getComponentLayout());
designInformationnew.setComponentLayout(designInformation.getComponentLayout()); designInformationnew.setComponentBracket(designInformation.getComponentBracket());
designInformationnew.setComponentBracket(designInformation.getComponentBracket()); designInformationnew.setConnectionLine(designInformation.getConnectionLine());
designInformationnew.setConnectionLine(designInformation.getConnectionLine()); designInformationnew.setOnceLine(designInformation.getOnceLine());
designInformationnew.setOnceLine(designInformation.getOnceLine()); designInformationnew.setSequenceNbr(designInformation.getSequenceNbr());
designInformationnew.setSequenceNbr(designInformation.getSequenceNbr()); designInformationnew.setRecDate(designInformation.getRecDate());
designInformationnew.setRecDate(designInformation.getRecDate()); designInformationnew.setRecUserId(designInformation.getRecUserId());
designInformationnew.setRecUserId(designInformation.getRecUserId()); designInformationnew.setRecUserName(designInformation.getRecUserName());
designInformationnew.setRecUserName(designInformation.getRecUserName()); designInformationnew.setIsDelete(designInformation.getIsDelete());
designInformationnew.setIsDelete(designInformation.getIsDelete()); designInformationnew.setCable(designInformation.getCable());
designInformationnew.setCable(designInformation.getCable()); designInformationMapper.updateById(designInformationnew);
designInformationMapper.updateById(designInformationnew); }
} } else {
}else{ DesignInformation designInformationnew = this.mapToBean(kv, DesignInformation.class);
DesignInformation designInformationnew=this.mapToBean(kv,DesignInformation.class); designInformationnew.setTypicalDiagram((List<Object>) kv.get("typicalDiagram"));
designInformationnew.setTypicalDiagram((List<Object>)kv.get("typicalDiagram")) ; designInformationnew.setPeasantHouseholdId(peasantHouseholdId);
designInformationnew.setPeasantHouseholdId(peasantHouseholdId); designInformationMapper.insert(designInformationnew);
designInformationMapper.insert(designInformationnew);
}
}
}
}
public <T> T mapToBean(Map<String, Object> map, Class<T> clazz) {
ObjectMapper objectMapper = new ObjectMapper();
public <T> T mapToBean(Map<String, Object> map, Class<T> clazz) {
ObjectMapper objectMapper= new ObjectMapper(); T bean = null;
try {
T bean =null; bean = clazz.newInstance();
try { bean = objectMapper.convertValue(map, clazz);
bean = clazz.newInstance();
bean = objectMapper.convertValue(map,clazz); } catch (Exception e) {
throw new BaseException(" 数据转化异常！", "400", "数据转化异常！");
}catch (Exception e){ }
throw new BaseException(" 数据转化异常！","400","数据转化异常！"); return bean;
} }
return bean;
}
// private CollectionToList(Collection<? extends E> c){ // private CollectionToList(Collection<? extends E> c){
// Object[] objects = c.toArray(); // Object[] objects = c.toArray();
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/KafkaAnalyseController.java
View file @ def1b30d
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jxiop.biz.Enum.SmartAnalyseEnum;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallDataDTO; import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallDataDTO;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallInfoDTO; import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallInfoDTO;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel; import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
...@@ -35,366 +36,437 @@ import static com.yeejoin.amos.boot.module.jxiop.biz.kafka.Constant.*; ...@@ -35,366 +36,437 @@ import static com.yeejoin.amos.boot.module.jxiop.biz.kafka.Constant.*;
@RequestMapping(value = "/kafkaAnalyse") @RequestMapping(value = "/kafkaAnalyse")
public class KafkaAnalyseController { public class KafkaAnalyseController {
public final DecimalFormat df = new DecimalFormat("0.0"); public final DecimalFormat df = new DecimalFormat("0.0");
@Autowired @Autowired
FanConditionVariablesMessage fanConditionVariablesMessage; FanConditionVariablesMessage fanConditionVariablesMessage;
@Autowired @Autowired
RedisUtils redisUtils; RedisUtils redisUtils;
@Autowired @Autowired
IPermissionService permissionService; IPermissionService permissionService;
@Autowired @Autowired
IdxBizFanHealthLevelMapper idxBizFanHealthLevelMapper; IdxBizFanHealthLevelMapper idxBizFanHealthLevelMapper;
@Autowired @Autowired
IdxBizPvHealthLevelMapper idxBizPvHealthLevelMapper; IdxBizPvHealthLevelMapper idxBizPvHealthLevelMapper;
@Autowired @Autowired
IndicatorDataMapper indicatorDataMapper; IndicatorDataMapper indicatorDataMapper;
@Autowired @Autowired
IdxBizFanHealthIndexMapper idxBizFanHealthIndexMapper; IdxBizFanHealthIndexMapper idxBizFanHealthIndexMapper;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getFanConditionVariables") @ApiOperation(httpMethod = "GET", value = "获取执行结果", notes = "获取执行结果")
@ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 风机 - 新", notes = "计算相关性分析 - 风机 - 新") @GetMapping(value = "/isRun")
public ResponseModel<Object> getFanConditionVariables() { public ResponseModel<String> isRun(@RequestParam(required = true) String key) {
if (redisUtils.hasKey(kafkaTopicConsumer)) { String result = "非法key值";
return ResponseHelper.buildResponse("计算中"); if (kafkaTopicConsumer.equals(key) || kafkaTopicConsumerPv.equals(key) || kafkaTopicConsumerGKHFFan.equals(key)
} || kafkaTopicConsumerGKHFPv.equals(key) || kafkaTopicConsumerZXZFan.equals(key)
fanConditionVariablesMessage.getFanConditionVariables(); || kafkaTopicConsumerZXZPv.equals(key)) {
redisUtils.set(kafkaTopicConsumer, RequestContext.getTraceId(), 300); if (redisUtils.hasKey(key)) {
return ResponseHelper.buildResponse("开始计算"); result = "正在计算中";
} } else {
result = "未计算";
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) }
@PostMapping(value = "/getPvConditionVariables") }
@ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 光伏 - 新", notes = "计算相关性分析 - 光伏 - 新") return ResponseHelper.buildResponse(result);
public ResponseModel<Object> getPvConditionVariables() { }
if (redisUtils.hasKey(kafkaTopicConsumerPv)) {
return ResponseHelper.buildResponse("计算中"); @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
} @ApiOperation(httpMethod = "GET", value = "获取执行结果", notes = "获取执行结果")
fanConditionVariablesMessage.getPvConditionVariables(); @GetMapping(value = "/start")
redisUtils.set(kafkaTopicConsumerPv, RequestContext.getTraceId(), 300); public ResponseModel<Object> start(@RequestParam(required = true) String key) {
return ResponseHelper.buildResponse("开始计算"); String result = "非法key值";
} if (kafkaTopicConsumer.equals(key)) {
return getFanConditionVariables();
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) } else if (kafkaTopicConsumerPv.equals(key)) {
@PostMapping(value = "/getFanConditionVariablesGKHF") return getPvConditionVariables();
@ApiOperation(httpMethod = "POST", value = "工况划分 - 风电 - 新", notes = "工况划分 - 风电 - 新") } else if (kafkaTopicConsumerGKHFFan.equals(key)) {
public ResponseModel<Object> getFanConditionVariablesGKHF() { return getFanConditionVariablesGKHF();
if (redisUtils.hasKey(kafkaTopicConsumerGKHFFan)) { } else if (kafkaTopicConsumerGKHFPv.equals(key)) {
return ResponseHelper.buildResponse("计算中"); return getPvConditionVariablesPvGKFX();
} } else if (kafkaTopicConsumerZXZFan.equals(key)) {
fanConditionVariablesMessage.getFanConditionVariablesGKHF(); return getFanConditionVariablesZXZ();
redisUtils.set(kafkaTopicConsumerGKHFFan, RequestContext.getTraceId(), 300); } else if (kafkaTopicConsumerZXZPv.equals(key)) {
return ResponseHelper.buildResponse("开始计算"); return getPvConditionVariablesZXZ();
} }
return ResponseHelper.buildResponse(result);
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) }
@PostMapping(value = "/getPvConditionVariablesPvGKHF")
@ApiOperation(httpMethod = "POST", value = "工况划分 - 光伏 - 新", notes = "工况划分 - 光伏 - 新") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
public ResponseModel<Object> getPvConditionVariablesPvGKFX() { @PostMapping(value = "/getFanConditionVariables")
if (redisUtils.hasKey(kafkaTopicConsumerGKHFPv)) { @ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 风机 - 新", notes = "计算相关性分析 - 风机 - 新")
return ResponseHelper.buildResponse("计算中"); public ResponseModel<Object> getFanConditionVariables() {
} if (redisUtils.hasKey(kafkaTopicConsumer)) {
fanConditionVariablesMessage.getPvConditionVariablesPvGKFX(); return ResponseHelper.buildResponse("计算中");
redisUtils.set(kafkaTopicConsumerGKHFPv, RequestContext.getTraceId(), 300); }
return ResponseHelper.buildResponse("开始计算"); fanConditionVariablesMessage.getFanConditionVariables();
} redisUtils.set(kafkaTopicConsumer, RequestContext.getTraceId(), 300);
return ResponseHelper.buildResponse("开始计算");
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) }
@PostMapping(value = "/getFanConditionVariablesZXZ")
@ApiOperation(httpMethod = "POST", value = "中心值 - 风电 - 新", notes = "中心值 - 风电 - 新") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
public ResponseModel<Object> getFanConditionVariablesZXZ() { @PostMapping(value = "/getPvConditionVariables")
if (redisUtils.hasKey(kafkaTopicConsumerZXZFan)) { @ApiOperation(httpMethod = "POST", value = "计算相关性分析 - 光伏 - 新", notes = "计算相关性分析 - 光伏 - 新")
public ResponseModel<Object> getPvConditionVariables() {
if (redisUtils.hasKey(kafkaTopicConsumerPv)) {
return ResponseHelper.buildResponse("计算中");
}
fanConditionVariablesMessage.getPvConditionVariables();
redisUtils.set(kafkaTopicConsumerPv, RequestContext.getTraceId(), 300);
return ResponseHelper.buildResponse("开始计算");
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getFanConditionVariablesGKHF")
@ApiOperation(httpMethod = "POST", value = "工况划分 - 风电 - 新", notes = "工况划分 - 风电 - 新")
public ResponseModel<Object> getFanConditionVariablesGKHF() {
if (redisUtils.hasKey(kafkaTopicConsumerGKHFFan)) {
return ResponseHelper.buildResponse("计算中");
}
fanConditionVariablesMessage.getFanConditionVariablesGKHF();
redisUtils.set(kafkaTopicConsumerGKHFFan, RequestContext.getTraceId(), 300);
return ResponseHelper.buildResponse("开始计算");
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getPvConditionVariablesPvGKHF")
@ApiOperation(httpMethod = "POST", value = "工况划分 - 光伏 - 新", notes = "工况划分 - 光伏 - 新")
public ResponseModel<Object> getPvConditionVariablesPvGKFX() {
if (redisUtils.hasKey(kafkaTopicConsumerGKHFPv)) {
return ResponseHelper.buildResponse("计算中");
}
fanConditionVariablesMessage.getPvConditionVariablesPvGKFX();
redisUtils.set(kafkaTopicConsumerGKHFPv, RequestContext.getTraceId(), 300);
return ResponseHelper.buildResponse("开始计算");
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getFanConditionVariablesZXZ")
@ApiOperation(httpMethod = "POST", value = "中心值 - 风电 - 新", notes = "中心值 - 风电 - 新")
public ResponseModel<Object> getFanConditionVariablesZXZ() {
if (redisUtils.hasKey(kafkaTopicConsumerZXZFan)) {
// redisUtils.del(kafkaTopicConsumerZXZFan); // redisUtils.del(kafkaTopicConsumerZXZFan);
// redisUtils.getExpire(kafkaTopicConsumerZXZFan); // redisUtils.getExpire(kafkaTopicConsumerZXZFan);
return ResponseHelper.buildResponse("计算中"); return ResponseHelper.buildResponse("计算中");
} }
fanConditionVariablesMessage.getFanConditionVariablesZXZ(); fanConditionVariablesMessage.getFanConditionVariablesZXZ();
redisUtils.set(kafkaTopicConsumerZXZFan, RequestContext.getTraceId(), 300); redisUtils.set(kafkaTopicConsumerZXZFan, RequestContext.getTraceId(), 300);
return ResponseHelper.buildResponse("开始计算"); return ResponseHelper.buildResponse("开始计算");
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getPvConditionVariablesZXZ") @PostMapping(value = "/getPvConditionVariablesZXZ")
@ApiOperation(httpMethod = "POST", value = "中心值 - 光伏 - 新", notes = "工况划分 - 光伏 - 新") @ApiOperation(httpMethod = "POST", value = "中心值 - 光伏 - 新", notes = "工况划分 - 光伏 - 新")
public ResponseModel<Object> getPvConditionVariablesZXZ() { public ResponseModel<Object> getPvConditionVariablesZXZ() {
if (redisUtils.hasKey(kafkaTopicConsumerZXZPv)) { if (redisUtils.hasKey(kafkaTopicConsumerZXZPv)) {
// redisUtils.del(kafkaTopicConsumerZXZPv); // redisUtils.del(kafkaTopicConsumerZXZPv);
return ResponseHelper.buildResponse("计算中"); return ResponseHelper.buildResponse("计算中");
} }
fanConditionVariablesMessage.getPvConditionVariablesZXZ(); fanConditionVariablesMessage.getPvConditionVariablesZXZ();
redisUtils.set(kafkaTopicConsumerZXZPv, RequestContext.getTraceId(), 300); redisUtils.set(kafkaTopicConsumerZXZPv, RequestContext.getTraceId(), 300);
return ResponseHelper.buildResponse("开始计算"); return ResponseHelper.buildResponse("开始计算");
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/getAddressInfo") @GetMapping(value = "/getAddressInfo")
@ApiOperation(httpMethod = "GET", value = "getAddressInfo", notes = "getAddressInfo") @ApiOperation(httpMethod = "GET", value = "getAddressInfo", notes = "getAddressInfo")
public ResponseModel<List<IndicatorData>> getAddressInfo() { public ResponseModel<List<IndicatorData>> getAddressInfo() {
List<String> addressInfo = idxBizFanHealthIndexMapper.getAddressInfo(); List<String> addressInfo = idxBizFanHealthIndexMapper.getAddressInfo();
String join = String.join(",", addressInfo); String join = String.join(",", addressInfo);
List<IndicatorData> indicatorData = indicatorDataMapper.selectByAddresses(join, "1668801435891929089"); List<IndicatorData> indicatorData = indicatorDataMapper.selectByAddresses(join, "1668801435891929089");
return ResponseHelper.buildResponse(indicatorData); return ResponseHelper.buildResponse(indicatorData);
} }
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "全景诊断回溯") @ApiOperation(value = "全景诊断回溯")
@GetMapping("/getFullViewRecall") @GetMapping("/getFullViewRecall")
public ResponseModel<List<FullViewRecallInfoDTO>> getFullViewRecall(@RequestParam(required = false, value = "analysisType") String analysisType) { public ResponseModel<List<FullViewRecallInfoDTO>> getFullViewRecall(
List<String> gatewayIds = this.getGatewayIds(); @RequestParam(required = false, value = "analysisType") String analysisType) {
List<Map<String, Object>> stationIndexInfo = idxBizFanHealthIndexMapper.getStationIndexInfoByParam(analysisType, gatewayIds); List<String> gatewayIds = this.getGatewayIds();
Map<String, Double> stationHealthIndexMap = stationIndexInfo.stream().collect(Collectors.toMap(t -> t.get("station").toString(), t -> Double.parseDouble(t.get("healthIndex").toString()))); List<Map<String, Object>> stationIndexInfo = idxBizFanHealthIndexMapper.getStationIndexInfoByParam(analysisType,
gatewayIds);
Map<String, Double> stationHealthIndexMap = stationIndexInfo.stream().collect(Collectors
List<Map<String, Object>> equipmentIndexInfo = idxBizFanHealthIndexMapper.getEquipmentIndexInfoByParam(analysisType, gatewayIds); .toMap(t -> t.get("station").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
Map<String, Double> equipmentIndexInfoMap = equipmentIndexInfo.stream().collect(Collectors.toMap(t -> t.get("equipmentName").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
List<Map<String, Object>> equipmentIndexInfo = idxBizFanHealthIndexMapper
.getEquipmentIndexInfoByParam(analysisType, gatewayIds);
List<Map<String, Object>> subSystemIndexInfo = idxBizFanHealthIndexMapper.getSubSystemIndexInfoByParam(analysisType, gatewayIds); Map<String, Double> equipmentIndexInfoMap = equipmentIndexInfo.stream().collect(Collectors.toMap(
Map<String, Double> subSystemIndexInfoMap = subSystemIndexInfo.stream().collect(Collectors.toMap(t -> t.get("subSystem").toString(), t -> Double.parseDouble(t.get("healthIndex").toString()))); t -> t.get("equipmentName").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
List<Map<String, Object>> subSystemIndexInfo = idxBizFanHealthIndexMapper
List<Map<String, Object>> pointNameIndexInfo = idxBizFanHealthIndexMapper.getPointNameIndexInfoByParam(analysisType, gatewayIds); .getSubSystemIndexInfoByParam(analysisType, gatewayIds);
Map<String, Double> pointNameIndexInfoMap = pointNameIndexInfo.stream().collect(Collectors.toMap(t -> t.get("gatewayIndexAddress").toString(), t -> Double.parseDouble(t.get("healthIndex").toString()))); Map<String, Double> subSystemIndexInfoMap = subSystemIndexInfo.stream().collect(Collectors
.toMap(t -> t.get("subSystem").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds); List<Map<String, Object>> pointNameIndexInfo = idxBizFanHealthIndexMapper
.getPointNameIndexInfoByParam(analysisType, gatewayIds);
List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall(gatewayIds); Map<String, Double> pointNameIndexInfoMap = pointNameIndexInfo.stream()
Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list.stream() .collect(Collectors.toMap(t -> t.get("gatewayIndexAddress").toString(),
.collect(Collectors.groupingBy(FullViewRecallDataDTO::getArea, t -> Double.parseDouble(t.get("healthIndex").toString())));
Collectors.groupingBy(FullViewRecallDataDTO::getStation,
Collectors.groupingBy(FullViewRecallDataDTO::getEquipmentName, List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds);
Collectors.groupingBy(FullViewRecallDataDTO::getSubSystem,
Collectors.groupingBy(FullViewRecallDataDTO::getPointName)))))); List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall(gatewayIds);
int areaInt = 1; Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list
int pointNameInt = 1; .stream()
int stationInt = 1; .collect(Collectors.groupingBy(FullViewRecallDataDTO::getArea,
int equipmentInt = 1; Collectors.groupingBy(FullViewRecallDataDTO::getStation,
int subSystemInt = 1; Collectors.groupingBy(FullViewRecallDataDTO::getEquipmentName,
Double healthScoreInfo = idxBizFanHealthIndexMapper.getHealthScoreInfoByParam(null, null, analysisType).doubleValue(); Collectors.groupingBy(FullViewRecallDataDTO::getSubSystem,
Collectors.groupingBy(FullViewRecallDataDTO::getPointName))))));
healthScoreInfo = Double.parseDouble(df.format(healthScoreInfo)); int areaInt = 1;
LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>(); int pointNameInt = 1;
query.isNull(IdxBizFanHealthLevel::getStatus); int stationInt = 1;
query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "全域"); int equipmentInt = 1;
query.lt(IdxBizFanHealthLevel::getGroupLowerLimit, healthScoreInfo); int subSystemInt = 1;
query.ge(IdxBizFanHealthLevel::getGroupUpperLimit, healthScoreInfo); Double healthScoreInfo = idxBizFanHealthIndexMapper.getHealthScoreInfoByParam(null, null, analysisType)
IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query); .doubleValue();
FullViewRecallInfoDTO allMapDto = new FullViewRecallInfoDTO(); healthScoreInfo = Double.parseDouble(df.format(healthScoreInfo));
allMapDto.setKey("0"); LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
allMapDto.setName("全域设备健康状态指数"); query.isNull(IdxBizFanHealthLevel::getStatus);
allMapDto.setScoreRange(""); query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "全域");
allMapDto.setStatus(idxBizFanHealthLevel.getHealthLevel()); query.lt(IdxBizFanHealthLevel::getGroupLowerLimit, healthScoreInfo);
allMapDto.setScore(healthScoreInfo); query.ge(IdxBizFanHealthLevel::getGroupUpperLimit, healthScoreInfo);
allMapDto.setIsRoot(true); IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query);
allMapDto.setCategory("category");
allMapDto.setChildren(new ArrayList<>()); FullViewRecallInfoDTO allMapDto = new FullViewRecallInfoDTO();
allMapDto.setParentKey("0"); allMapDto.setKey("0");
allMapDto.setName("全域设备健康状态指数");
for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> areaMap : resultMap.entrySet()) { allMapDto.setScoreRange("");
Double areaLowScore = null; allMapDto.setStatus(idxBizFanHealthLevel.getHealthLevel());
Double areaHighScore = null; allMapDto.setScore(healthScoreInfo);
allMapDto.setIsRoot(true);
Double areaHealthScoreInfo = idxBizFanHealthIndexMapper.getHealthScoreInfoByParam(areaMap.getKey(), null, analysisType).doubleValue(); allMapDto.setCategory("category");
areaHealthScoreInfo = Double.parseDouble(df.format(areaHealthScoreInfo)); allMapDto.setChildren(new ArrayList<>());
LambdaQueryWrapper<IdxBizFanHealthLevel> areaQuery = new LambdaQueryWrapper<>(); allMapDto.setParentKey("0");
areaQuery.isNull(IdxBizFanHealthLevel::getStatus);
areaQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "片区"); for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> areaMap : resultMap
areaQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, areaHealthScoreInfo); .entrySet()) {
areaQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, areaHealthScoreInfo); Double areaLowScore = null;
IdxBizFanHealthLevel areaIdxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(areaQuery); Double areaHighScore = null;
FullViewRecallInfoDTO areaMapDto = new FullViewRecallInfoDTO(); Double areaHealthScoreInfo = idxBizFanHealthIndexMapper
areaMapDto.setKey("0-" + areaInt); .getHealthScoreInfoByParam(areaMap.getKey(), null, analysisType).doubleValue();
areaMapDto.setName(areaMap.getKey()); areaHealthScoreInfo = Double.parseDouble(df.format(areaHealthScoreInfo));
areaMapDto.setStatus(areaIdxBizFanHealthLevel.getHealthLevel()); LambdaQueryWrapper<IdxBizFanHealthLevel> areaQuery = new LambdaQueryWrapper<>();
areaMapDto.setScore(areaHealthScoreInfo); areaQuery.isNull(IdxBizFanHealthLevel::getStatus);
areaMapDto.setParentKey(allMapDto.getKey()); areaQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "片区");
allMapDto.getChildren().add(areaMapDto); areaQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, areaHealthScoreInfo);
areaInt++; areaQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, areaHealthScoreInfo);
List<FullViewRecallInfoDTO> areaMapList = new ArrayList<>(); IdxBizFanHealthLevel areaIdxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(areaQuery);
for (Map.Entry<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>> stationMap : areaMap.getValue().entrySet()) {
Double stationLowScore = null; FullViewRecallInfoDTO areaMapDto = new FullViewRecallInfoDTO();
Double stationHighScore = null; areaMapDto.setKey("0-" + areaInt);
if (areaLowScore == null && areaHighScore == null) { areaMapDto.setName(areaMap.getKey());
areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0); areaMapDto.setStatus(areaIdxBizFanHealthLevel.getHealthLevel());
areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0); areaMapDto.setScore(areaHealthScoreInfo);
} else { areaMapDto.setParentKey(allMapDto.getKey());
if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) < areaLowScore) { allMapDto.getChildren().add(areaMapDto);
areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0); areaInt++;
} List<FullViewRecallInfoDTO> areaMapList = new ArrayList<>();
if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) > areaHighScore) { for (Map.Entry<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>> stationMap : areaMap
areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0); .getValue().entrySet()) {
} Double stationLowScore = null;
} Double stationHighScore = null;
if (areaLowScore == null && areaHighScore == null) {
FullViewRecallInfoDTO stationDto = new FullViewRecallInfoDTO(); areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
stationDto.setKey(areaMapDto.getKey() + "-" + stationInt); areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
stationDto.setName(stationMap.getKey()); } else {
if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) < areaLowScore) {
stationDto.setStatus(""); areaLowScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
stationDto.setScore(stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0)); }
LambdaQueryWrapper<IdxBizFanHealthLevel> stationQuery = new LambdaQueryWrapper<>(); if (stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0) > areaHighScore) {
stationQuery.like(IdxBizFanHealthLevel::getStatus, stationMap.getKey()); areaHighScore = stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0);
stationQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "场站"); }
stationQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, stationDto.getScore()); }
stationQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, stationDto.getScore());
IdxBizFanHealthLevel stationLevel = idxBizFanHealthLevelMapper.selectOne(stationQuery); FullViewRecallInfoDTO stationDto = new FullViewRecallInfoDTO();
stationDto.setStatus(ObjectUtils.isNotEmpty(stationLevel) ? stationLevel.getHealthLevel() : ""); stationDto.setKey(areaMapDto.getKey() + "-" + stationInt);
if (ObjectUtils.isEmpty(stationLevel)) { stationDto.setName(stationMap.getKey());
LambdaQueryWrapper<IdxBizPvHealthLevel> stationPvQuery = new LambdaQueryWrapper<>();
stationPvQuery.like(IdxBizPvHealthLevel::getStatus, stationMap.getKey()); stationDto.setStatus("");
stationPvQuery.eq(IdxBizPvHealthLevel::getAnalysisObjType, "场站"); stationDto.setScore(stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0));
stationPvQuery.lt(IdxBizPvHealthLevel::getGroupLowerLimit, stationDto.getScore()); LambdaQueryWrapper<IdxBizFanHealthLevel> stationQuery = new LambdaQueryWrapper<>();
stationPvQuery.ge(IdxBizPvHealthLevel::getGroupUpperLimit, stationDto.getScore()); stationQuery.like(IdxBizFanHealthLevel::getStatus, stationMap.getKey());
IdxBizPvHealthLevel stationPvLevel = idxBizPvHealthLevelMapper.selectOne(stationPvQuery); stationQuery.eq(IdxBizFanHealthLevel::getAnalysisObjType, "场站");
if (ObjectUtils.isNotEmpty(stationPvLevel)) { stationQuery.lt(IdxBizFanHealthLevel::getGroupLowerLimit, stationDto.getScore());
stationDto.setStatus(stationPvLevel.getHealthLevel()); stationQuery.ge(IdxBizFanHealthLevel::getGroupUpperLimit, stationDto.getScore());
} IdxBizFanHealthLevel stationLevel = idxBizFanHealthLevelMapper.selectOne(stationQuery);
} stationDto.setStatus(ObjectUtils.isNotEmpty(stationLevel) ? stationLevel.getHealthLevel() : "");
stationDto.setParentKey(areaMapDto.getKey()); if (ObjectUtils.isEmpty(stationLevel)) {
areaMapDto.getChildren().add(stationDto); LambdaQueryWrapper<IdxBizPvHealthLevel> stationPvQuery = new LambdaQueryWrapper<>();
stationInt++; stationPvQuery.like(IdxBizPvHealthLevel::getStatus, stationMap.getKey());
for (Map.Entry<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>> equipmentMap : stationMap.getValue().entrySet()) { stationPvQuery.eq(IdxBizPvHealthLevel::getAnalysisObjType, "场站");
stationPvQuery.lt(IdxBizPvHealthLevel::getGroupLowerLimit, stationDto.getScore());
stationPvQuery.ge(IdxBizPvHealthLevel::getGroupUpperLimit, stationDto.getScore());
if (stationLowScore == null && stationHighScore == null) { IdxBizPvHealthLevel stationPvLevel = idxBizPvHealthLevelMapper.selectOne(stationPvQuery);
stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0); if (ObjectUtils.isNotEmpty(stationPvLevel)) {
stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0); stationDto.setStatus(stationPvLevel.getHealthLevel());
} else { }
if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) < stationLowScore) { }
stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0); stationDto.setParentKey(areaMapDto.getKey());
} areaMapDto.getChildren().add(stationDto);
if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) > stationHighScore) { stationInt++;
stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0); for (Map.Entry<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>> equipmentMap : stationMap
} .getValue().entrySet()) {
}
if (stationLowScore == null && stationHighScore == null) {
FullViewRecallInfoDTO equipmentMapDto = new FullViewRecallInfoDTO(); stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
equipmentMapDto.setKey(stationDto.getKey() + "-" + equipmentInt); stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
equipmentMapDto.setName(equipmentMap.getKey()); } else {
equipmentMapDto.setScoreRange(""); if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) < stationLowScore) {
IdxBizFanHealthLevel levelInfo = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "设备", equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0)); stationLowScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
equipmentMapDto.setStatus(levelInfo.getHealthLevel()); }
equipmentMapDto.setScore(equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0)); if (equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0) > stationHighScore) {
equipmentMapDto.setParentKey(stationDto.getKey()); stationHighScore = equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0);
stationDto.getChildren().add(equipmentMapDto); }
equipmentInt++; }
for (Map.Entry<String, Map<String, List<FullViewRecallDataDTO>>> subSystemMap : equipmentMap.getValue().entrySet()) {
FullViewRecallInfoDTO subSystemMapDto = new FullViewRecallInfoDTO(); FullViewRecallInfoDTO equipmentMapDto = new FullViewRecallInfoDTO();
subSystemMapDto.setKey(equipmentMapDto.getKey() + "-" + subSystemInt); equipmentMapDto.setKey(stationDto.getKey() + "-" + equipmentInt);
subSystemMapDto.setName(subSystemMap.getKey()); equipmentMapDto.setName(equipmentMap.getKey());
subSystemMapDto.setScoreRange(""); equipmentMapDto.setScoreRange("");
IdxBizFanHealthLevel levelInfo = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(),
"设备", equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
equipmentMapDto.setStatus(levelInfo.getHealthLevel());
equipmentMapDto.setScore(equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
equipmentMapDto.setParentKey(stationDto.getKey());
stationDto.getChildren().add(equipmentMapDto);
equipmentInt++;
for (Map.Entry<String, Map<String, List<FullViewRecallDataDTO>>> subSystemMap : equipmentMap
.getValue().entrySet()) {
FullViewRecallInfoDTO subSystemMapDto = new FullViewRecallInfoDTO();
subSystemMapDto.setKey(equipmentMapDto.getKey() + "-" + subSystemInt);
subSystemMapDto.setName(subSystemMap.getKey());
subSystemMapDto.setScoreRange("");
// subSystemMapDto.setStatus(null); // subSystemMapDto.setStatus(null);
IdxBizFanHealthLevel levelInfoZxt = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "子系统", subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0)); IdxBizFanHealthLevel levelInfoZxt = getHealthLevelByScore(healthLevelInfoList,
subSystemMapDto.setStatus(levelInfoZxt.getHealthLevel()); stationMap.getKey(), "子系统",
subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0));
subSystemMapDto.setScore(subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0)); subSystemMapDto.setStatus(levelInfoZxt.getHealthLevel());
subSystemMapDto.setParentKey(equipmentMapDto.getKey());
equipmentMapDto.getChildren().add(subSystemMapDto); subSystemMapDto.setScore(subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0));
subSystemInt++; subSystemMapDto.setParentKey(equipmentMapDto.getKey());
for (Map.Entry<String, List<FullViewRecallDataDTO>> pointNameMap : subSystemMap.getValue().entrySet()) { equipmentMapDto.getChildren().add(subSystemMapDto);
FullViewRecallInfoDTO pointNameMapDto = new FullViewRecallInfoDTO(); subSystemInt++;
pointNameMapDto.setKey(subSystemMapDto.getKey() + "-" + pointNameInt); for (Map.Entry<String, List<FullViewRecallDataDTO>> pointNameMap : subSystemMap.getValue()
pointNameMapDto.setName(pointNameMap.getKey()); .entrySet()) {
FullViewRecallInfoDTO pointNameMapDto = new FullViewRecallInfoDTO();
FullViewRecallDataDTO fullViewRecallDataDTO = pointNameMap.getValue().get(0); pointNameMapDto.setKey(subSystemMapDto.getKey() + "-" + pointNameInt);
pointNameMapDto.setName(pointNameMap.getKey());
pointNameMapDto.setScoreRange("");
FullViewRecallDataDTO fullViewRecallDataDTO = pointNameMap.getValue().get(0);
IdxBizFanHealthLevel levelInfoBL = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "测点", pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0));
pointNameMapDto.setStatus(levelInfoBL.getHealthLevel()); pointNameMapDto.setScoreRange("");
pointNameMapDto.setScore(pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0)); IdxBizFanHealthLevel levelInfoBL = getHealthLevelByScore(healthLevelInfoList,
pointNameMapDto.setParentKey(subSystemMapDto.getKey()); stationMap.getKey(), "测点",
subSystemMapDto.getChildren().add(pointNameMapDto); pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_"
+ fullViewRecallDataDTO.getIndexAddress(), 100.0));
pointNameInt++; pointNameMapDto.setStatus(levelInfoBL.getHealthLevel());
}
} pointNameMapDto.setScore(pointNameIndexInfoMap.getOrDefault(
} fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(),
stationDto.setScoreRange("(最低：" + stationLowScore + "分, 最高：" + stationHighScore + "分)"); 100.0));
} pointNameMapDto.setParentKey(subSystemMapDto.getKey());
subSystemMapDto.getChildren().add(pointNameMapDto);
areaMapDto.setScoreRange("(最低：" + areaLowScore + "分, 最高：" + areaHighScore + "分)");
} pointNameInt++;
List<FullViewRecallInfoDTO> resultList = new ArrayList<>(); }
resultList.add(allMapDto); }
resultList = getFullViewRecallResultByCurrentUser(resultList); }
return ResponseHelper.buildResponse(resultList); stationDto.setScoreRange("(最低：" + stationLowScore + "分, 最高：" + stationHighScore + "分)");
} }
areaMapDto.setScoreRange("(最低：" + areaLowScore + "分, 最高：" + areaHighScore + "分)");
private IdxBizFanHealthLevel getHealthLevelByScore(List<IdxBizFanHealthLevel> healthLevelInfoList, String station, String type, Double score) { }
List<FullViewRecallInfoDTO> resultList = new ArrayList<>();
IdxBizFanHealthLevel resultDto = new IdxBizFanHealthLevel(); resultList.add(allMapDto);
resultList = getFullViewRecallResultByCurrentUser(resultList);
String stationType = "风电站"; return ResponseHelper.buildResponse(resultList);
List<IdxBizFanHealthLevel> collect = healthLevelInfoList.stream().filter(item -> item.getAnalysisObjType().contains(station)).collect(Collectors.toList()); }
for (IdxBizFanHealthLevel item : collect) {
if (item.getAnalysisObjType().contains("子阵")) { private IdxBizFanHealthLevel getHealthLevelByScore(List<IdxBizFanHealthLevel> healthLevelInfoList, String station,
stationType = "光伏站"; String type, Double score) {
break;
} IdxBizFanHealthLevel resultDto = new IdxBizFanHealthLevel();
}
for (IdxBizFanHealthLevel item : collect) { String stationType = "风电站";
if (type.equals("设备") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) { List<IdxBizFanHealthLevel> collect = healthLevelInfoList.stream()
resultDto = item; .filter(item -> item.getAnalysisObjType().contains(station)).collect(Collectors.toList());
break; for (IdxBizFanHealthLevel item : collect) {
} if (item.getAnalysisObjType().contains("子阵")) {
if (type.equals("子系统") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) { stationType = "光伏站";
resultDto = item; break;
break; }
} }
if (type.equals("测点") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) { for (IdxBizFanHealthLevel item : collect) {
resultDto = item; if (type.equals("设备") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type)
break; && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
} resultDto = item;
if (type.equals("设备") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("子阵") && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) { break;
resultDto = item; }
break; if (type.equals("子系统") && stationType.equals("风电站") && item.getAnalysisObjType().contains(type)
} && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
if (type.equals("子系统") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("设备") && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) { resultDto = item;
resultDto = item; break;
break; }
} if (type.equals("测点") && item.getAnalysisObjType().contains(type) && score >= item.getGroupLowerLimit()
} && score <= item.getGroupUpperLimit()) {
return resultDto; resultDto = item;
} break;
}
private List<String> getGatewayIds() { if (type.equals("设备") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("子阵")
List<String> permissions = permissionService.getCurrentUserPermissions(); && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
if (Objects.isNull(permissions)) { resultDto = item;
permissions = Collections.emptyList(); break;
} }
return permissions; if (type.equals("子系统") && stationType.equals("光伏站") && item.getAnalysisObjType().contains("设备")
} && score >= item.getGroupLowerLimit() && score <= item.getGroupUpperLimit()) {
resultDto = item;
private List<FullViewRecallInfoDTO> getFullViewRecallResultByCurrentUser(List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS) { break;
List<FullViewRecallInfoDTO> result = new ArrayList<>(); }
if (fullViewRecallInfoDTOS.size() > 0) { }
String rootNodeName = permissionService.getCurrentUserPersmissions(); return resultDto;
if (rootNodeName.equals("all")) { }
return fullViewRecallInfoDTOS;
} else { private List<String> getGatewayIds() {
List<String> stringList = Arrays.asList(rootNodeName,rootNodeName.replace("片区","区域"),rootNodeName.replace("区域","片区"),rootNodeName.replace("电站","电场"),rootNodeName.replace("电场","电站")); List<String> permissions = permissionService.getCurrentUserPermissions();
List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS1 = fullViewRecallInfoDTOS.get(0).getChildren().stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList()); if (Objects.isNull(permissions)) {
if (fullViewRecallInfoDTOS1.size() > 0) { permissions = Collections.emptyList();
return fullViewRecallInfoDTOS1; }
} else { return permissions;
List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS2 = fullViewRecallInfoDTOS.get(0).getChildren(); }
for (FullViewRecallInfoDTO fullViewRecallInfoDTO : fullViewRecallInfoDTOS2) {
List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS3=fullViewRecallInfoDTO.getChildren().stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList()); private List<FullViewRecallInfoDTO> getFullViewRecallResultByCurrentUser(
if (fullViewRecallInfoDTOS3.size()>0){ List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS) {
return fullViewRecallInfoDTOS3; List<FullViewRecallInfoDTO> result = new ArrayList<>();
} if (fullViewRecallInfoDTOS.size() > 0) {
} String rootNodeName = permissionService.getCurrentUserPersmissions();
} if (rootNodeName.equals("all")) {
} return fullViewRecallInfoDTOS;
} } else {
return result; List<String> stringList = Arrays.asList(rootNodeName, rootNodeName.replace("片区", "区域"),
} rootNodeName.replace("区域", "片区"), rootNodeName.replace("电站", "电场"),
rootNodeName.replace("电场", "电站"));
List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS1 = fullViewRecallInfoDTOS.get(0).getChildren()
.stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList());
if (fullViewRecallInfoDTOS1.size() > 0) {
return fullViewRecallInfoDTOS1;
} else {
List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS2 = fullViewRecallInfoDTOS.get(0).getChildren();
for (FullViewRecallInfoDTO fullViewRecallInfoDTO : fullViewRecallInfoDTOS2) {
List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS3 = fullViewRecallInfoDTO.getChildren()
.stream().filter(item -> stringList.contains(item.getName()))
.collect(Collectors.toList());
if (fullViewRecallInfoDTOS3.size() > 0) {
return fullViewRecallInfoDTOS3;
}
}
}
}
}
return result;
}
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/kafka/Constant.java
View file @ def1b30d
...@@ -13,20 +13,21 @@ import java.util.Date; ...@@ -13,20 +13,21 @@ import java.util.Date;
public interface Constant { public interface Constant {
// 风电相关性消费者 // 风电相关性消费者
String kafkaTopicConsumer = "FanConditionVariables"; String kafkaTopicConsumer = "FAN_XGX";
// 光伏相关性消费者 // 光伏相关性消费者
String kafkaTopicConsumerPv = "PvConditionVariables"; String kafkaTopicConsumerPv = "PV_XGX";
// 风电 工况区间划分 // 风电 工况区间划分
String kafkaTopicConsumerGKHFFan = "FanConditionVariablesGKHF"; String kafkaTopicConsumerGKHFFan = "FAN_QJHF";
// 光伏 工况区间划分 // 光伏 工况区间划分
String kafkaTopicConsumerGKHFPv = "PvConditionVariablesGKHF"; String kafkaTopicConsumerGKHFPv = "PV_QJHF";
// 风电 中心值计算 // 风电 中心值计算
String kafkaTopicConsumerZXZFan = "FanConditionVariablesGZXZ"; String kafkaTopicConsumerZXZFan = "FAN_ZXZ";
// 光伏 中心值计算 // 光伏 中心值计算
String kafkaTopicConsumerZXZPv = "PvConditionVariablesZXZ"; String kafkaTopicConsumerZXZPv = "PV_ZXZ";
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/BuDunGenDto.java
View file @ def1b30d
...@@ -4,11 +4,13 @@ import lombok.Data; ...@@ -4,11 +4,13 @@ import lombok.Data;
@Data @Data
public class BuDunGenDto { public class BuDunGenDto {
private Double day; private String station_name;
private Double month; private Double actual_installed_capacity;
private Double year; private Double day;
private Double month_complete; private Double month;
private Double year_complete; private Double year;
private Double year_hour_number; private Double month_complete;
private Double cumulative; private Double year_complete;
private Double year_hour_number;
private Double cumulative;
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/TdEngineAnalysisConfig.java 0 → 100644
View file @ def1b30d
package com.yeejoin.amos.boot.module.jxiop.biz.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
/**
* 从数据源配置
* 若需要配置更多数据源 , 直接在yml中添加数据源配置再增加相应的新的数据源配置类即可
*/
@Configuration
@MapperScan(basePackages = "com.yeejoin.amos.boot.module.jxiop.biz.tdanalysismapper", sqlSessionFactoryRef = "taosAnalysisSqlSessionFactory")
public class TdEngineAnalysisConfig {
private Logger logger = LoggerFactory.getLogger(TdEngineAnalysisConfig.class);
// 精确到 cluster 目录，以便跟其他数据源隔离
private static final String MAPPER_LOCATION = "classpath*:mapper/tdengineanalysis/*.xml";
@Value("${spring.db4.datasource.url}")
private String dbUrl;
@Value("${spring.db4.datasource.username}")
private String username;
@Value("${spring.db4.datasource.password}")
private String password;
@Value("${spring.db4.datasource.driver-class-name}")
private String driverClassName;
@Bean(name = "taosAnalysisDataSource") //声明其为Bean实例
public DataSource clusterDataSource() {
DruidDataSource datasource = new DruidDataSource();
datasource.setUrl(this.dbUrl);
datasource.setUsername(username);
datasource.setPassword(password);
datasource.setDriverClassName(driverClassName);
return datasource;
}
@Bean(name = "taosAnalysisTransactionManager")
public DataSourceTransactionManager clusterTransactionManager() {
return new DataSourceTransactionManager(clusterDataSource());
}
@Bean(name = "taosAnalysisSqlSessionFactory")
public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("taosDataSource") DataSource culsterDataSource)
throws Exception {
final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
sessionFactory.setDataSource(culsterDataSource);
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
.getResources(TdEngineAnalysisConfig.MAPPER_LOCATION));
sessionFactory.setTypeAliasesPackage("com.yeejoin.amos.boot.module.jxiop.biz.entity");
//mybatis 数据库字段与实体类属性驼峰映射配置
sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
return sessionFactory.getObject();
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java
View file @ def1b30d
...@@ -130,9 +130,9 @@ public class CommonConstans { ...@@ -130,9 +130,9 @@ public class CommonConstans {
public static final String YEAR_GEN_ATTAINMENT_RATE = "年计划完成率"; public static final String YEAR_GEN_ATTAINMENT_RATE = "年计划完成率";
//年利用小时数 //年利用小时数
public static final String YEAR_GEN_HOURS = "年利用小时数"; public static final String YEAR_GEN_HOURS = "年利用小时数";
public static final String WIND_SPEED_THIRTY_SECONDS = "30秒平均风速"; public static final String WIND_SPEED_THIRTY_SECONDS = "总30秒平均风速";
public static final String TOTAL_RADIATION = "辐照度"; public static final String TOTAL_RADIATION = "总辐照度";
public static final String TOTAL_RADIATION_SUM = "累计辐照度"; public static final String TOTAL_RADIATION_SUM = "总累计辐照度";
public static final String ACTIVE_POWER = "有功功率"; public static final String ACTIVE_POWER = "有功功率";
......
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 @ def1b30d
...@@ -12,21 +12,13 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic; ...@@ -12,21 +12,13 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.api.service.IMapRegionService;
import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.*; import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
import com.yeejoin.amos.boot.module.jxiop.biz.service.MonitorService; import com.yeejoin.amos.boot.module.jxiop.biz.service.MonitorService;
import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.*; import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import javafx.scene.control.Tab;
import org.aspectj.apache.bcel.classfile.Module;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.influxdb.dto.QueryResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
...@@ -37,7 +29,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper; ...@@ -37,7 +29,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*; import java.util.*;
import java.util.logging.Handler;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@RestController @RestController
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IndicatorData.java
View file @ def1b30d
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.entity; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.entity;
import lombok.Data; import lombok.Data;
import java.io.PipedReader;
import java.util.Date; import java.util.Date;
@Data @Data
...@@ -23,7 +24,7 @@ public class IndicatorData { ...@@ -23,7 +24,7 @@ public class IndicatorData {
private String unit; private String unit;
private String value; private String value="0";
private Float valueF ; private Float valueF ;
...@@ -35,4 +36,11 @@ public class IndicatorData { ...@@ -35,4 +36,11 @@ public class IndicatorData {
private String displayName; private String displayName;
private String xtime; private String xtime;
private String pointSeq;
private String pointAddress;
private String pointLocation;
private String pointType;
private String pointName;
private String dasTime;
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/MonitorService.java
View file @ def1b30d
...@@ -89,7 +89,6 @@ public interface MonitorService { ...@@ -89,7 +89,6 @@ public interface MonitorService {
IPage<Map> getStationOverViewFanByStationId( String stationId); IPage<Map> getStationOverViewFanByStationId( String stationId);
/** /**
* @Descritpion 根据入参动态获取全国发电量数据 * @Descritpion 根据入参动态获取全国发电量数据
* @param stationId
* @return * @return
*/ */
Map<String,Object> gettimedateyfd( ); Map<String,Object> gettimedateyfd( );
...@@ -109,5 +108,15 @@ public interface MonitorService { ...@@ -109,5 +108,15 @@ public interface MonitorService {
*/ */
ResultsData getElectricQuantityList(int current, int size, StationBasic stationBasic); ResultsData getElectricQuantityList(int current, int size, StationBasic stationBasic);
/**
* @Description 动态获取电量表计数据
*/
void getTotalData(); void getTotalData();
/**
* @Description 获取全国功率曲线
* @return
*/
Map<String, Object> getDetailsWindSpeedAlldataqg();
} }
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 @ def1b30d
...@@ -19,8 +19,10 @@ import com.yeejoin.amos.boot.module.jxiop.api.util.HttpRequestUtil; ...@@ -19,8 +19,10 @@ import com.yeejoin.amos.boot.module.jxiop.api.util.HttpRequestUtil;
import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration; import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans; import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.*; import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
import com.yeejoin.amos.boot.module.jxiop.biz.service.CoreCommonService; import com.yeejoin.amos.boot.module.jxiop.biz.service.CoreCommonService;
import com.yeejoin.amos.boot.module.jxiop.biz.service.MonitorService; import com.yeejoin.amos.boot.module.jxiop.biz.service.MonitorService;
import com.yeejoin.amos.boot.module.jxiop.biz.tdanalysismapper.IndicatorDataNewMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
...@@ -36,13 +38,14 @@ import org.springframework.util.ObjectUtils; ...@@ -36,13 +38,14 @@ import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper; import org.typroject.tyboot.component.emq.EmqKeeper;
import java.io.IOException;; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.parseArray; import static com.alibaba.fastjson.JSON.parseArray;
...@@ -57,6 +60,7 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -57,6 +60,7 @@ public class MonitorServiceImpl implements MonitorService {
private final HttpRequestUtil httpRequestUtil; private final HttpRequestUtil httpRequestUtil;
private final CoreCommonService coreCommonService; private final CoreCommonService coreCommonService;
private final StationElectricityMeterMapper stationElectricityMeterMapper; private final StationElectricityMeterMapper stationElectricityMeterMapper;
private final IndicatorDataNewMapper indicatorDataNewMapper;
@Value("classpath:/json/overview.json") @Value("classpath:/json/overview.json")
private Resource overview; private Resource overview;
@Value("classpath:/json/overviewGF.json") @Value("classpath:/json/overviewGF.json")
...@@ -308,7 +312,7 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -308,7 +312,7 @@ public class MonitorServiceImpl implements MonitorService {
@Override @Override
public SeriesData getSeriesDataqy(String areaCode) { public SeriesData getSeriesDataqy(String areaCode) {
MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("areaCode", areaCode)); MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("area_code", areaCode));
String areaName = ""; String areaName = "";
if (!ObjectUtils.isEmpty(mapRegion) && !ObjectUtils.isEmpty(mapRegion.getName()) && !mapRegion.getName().contains(Constants.areaChinese)) { if (!ObjectUtils.isEmpty(mapRegion) && !ObjectUtils.isEmpty(mapRegion.getName()) && !mapRegion.getName().contains(Constants.areaChinese)) {
areaName = mapRegion.getName() + Constants.areaChinese; areaName = mapRegion.getName() + Constants.areaChinese;
...@@ -348,7 +352,7 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -348,7 +352,7 @@ public class MonitorServiceImpl implements MonitorService {
@Override @Override
public Page<HashMap<String, String>> socialContribution(String areaCode) { public Page<HashMap<String, String>> socialContribution(String areaCode) {
Double totalAnnual = 0.0; Double totalAnnual = 0.0;
MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("areaCode", areaCode)); MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("area_code", areaCode));
String areaName = ""; String areaName = "";
if (!ObjectUtils.isEmpty(mapRegion) && !ObjectUtils.isEmpty(mapRegion.getName()) && !mapRegion.getName().contains(Constants.areaChinese)) { if (!ObjectUtils.isEmpty(mapRegion) && !ObjectUtils.isEmpty(mapRegion.getName()) && !mapRegion.getName().contains(Constants.areaChinese)) {
areaName = mapRegion.getName() + Constants.areaChinese; areaName = mapRegion.getName() + Constants.areaChinese;
...@@ -388,7 +392,7 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -388,7 +392,7 @@ public class MonitorServiceImpl implements MonitorService {
String areaName = ""; String areaName = "";
String requestUrl = Constants.BASE_URL + "?" + Constants.get_hours_num_top + "&topValue=5&tabValue=" + day; String requestUrl = Constants.BASE_URL + "?" + Constants.get_hours_num_top + "&topValue=5&tabValue=" + day;
if (areaCode != null) { if (areaCode != null) {
MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("areaCode", areaCode)); MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("area_code", areaCode));
if (!ObjectUtils.isEmpty(mapRegion) && !ObjectUtils.isEmpty(mapRegion.getName()) && !mapRegion.getName().contains(Constants.areaChinese)) { if (!ObjectUtils.isEmpty(mapRegion) && !ObjectUtils.isEmpty(mapRegion.getName()) && !mapRegion.getName().contains(Constants.areaChinese)) {
areaName = mapRegion.getName() + Constants.areaChinese; areaName = mapRegion.getName() + Constants.areaChinese;
} }
...@@ -893,4 +897,109 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -893,4 +897,109 @@ public class MonitorServiceImpl implements MonitorService {
} }
} }
public Map<String, Object> getDetailsWindSpeedAlldataqg() {
List<StationCacheInfoDto> stationCacheInfoDtos = getListStationCacheInfoDto();
AtomicReference<Double> installedCapacity = new AtomicReference<>(0.0);
stationCacheInfoDtos.forEach( stationCacheInfoDto-> {
installedCapacity.updateAndGet(v -> v + Double.parseDouble(stationCacheInfoDto.getInstalledCapacity()));
});
Map<String, Object> map = new HashMap<>();
List<String> values = new ArrayList<>();
List<String> time = new ArrayList<>();
Map<String, Object> activePowerInfo = new HashMap<>();
List<IndicatorData> activePowerList = new ArrayList<>();
activePowerList = indicatorDataNewMapper.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.ACTIVE_POWER);
Map<String,List<IndicatorData>> stringObjectMap =activePowerList.stream().collect(Collectors.groupingBy(IndicatorData::getDasTime));
stringObjectMap.keySet().stream().forEach(dasTime -> {
time.add(dasTime.split(":")[1]);
Double vl= stringObjectMap.get(dasTime).stream().mapToDouble(IndicatorData::getValueF).sum();
values.add(String.format(CommonConstans.Twodecimalplaces, vl));
});
String max = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).max().getAsDouble());
String min = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).min().getAsDouble());
String mean = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).average().getAsDouble());
activePowerInfo.put("mean", mean);
activePowerInfo.put("max", max);
activePowerInfo.put("min", min);
activePowerInfo.put("maxTime", time.get(values.lastIndexOf(max)));
activePowerInfo.put("minTime", time.get(values.lastIndexOf(min)));
activePowerInfo.put("load", String.format(CommonConstans.Twodecimalplaces, Double.valueOf(values.get(values.size() - 1)) / installedCapacity.get()));
List<Map<String, Object>> seriesData = new ArrayList<>();
Map<String, Object> map3 = new HashMap<>();
Map<String, Object> map1 = new HashMap<>();
Map<String, Object> map2 = new HashMap<>();
map1.put("data", values);
seriesData.add(map1);
map.put("seriesData", seriesData);
map.put("axisData", time);
System.out.println(JSON.toJSONString(map));
try {
emqKeeper.getMqttClient().publish( "all_Power_table", JSON.toJSON(map).toString().getBytes("UTF-8"), 1, true);
emqKeeper.getMqttClient().publish("all_Power_info", JSON.toJSON(activePowerInfo).toString().getBytes("UTF-8"), 1, true);
} catch (Exception exception) {
exception.printStackTrace();
}
return map;
}
public Map<String, Object> getDetailsWindqy(String s ) {
List<StationCacheInfoDto> stationCacheInfoDtos = getListStationCacheInfoDto();
AtomicReference<Double> installedCapacity = new AtomicReference<>(0.0);
stationCacheInfoDtos = stationCacheInfoDtos.stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getBelongArea().equals(s)).collect(Collectors.toList());
stationCacheInfoDtos.forEach(stationCacheInfoDto -> {
installedCapacity.updateAndGet(v -> v + Double.parseDouble(stationCacheInfoDto.getInstalledCapacity()));
});
Map<String, Object> map = new HashMap<>();
List<String> values = new ArrayList<>();
List<String> fanGateWayIds = stationCacheInfoDtos.stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getFanGatewayId()!=null).map(StationCacheInfoDto::getFanGatewayId).collect(Collectors.toList());
List<String> boostGateWayIds = stationCacheInfoDtos.stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getBoosterGatewayId()!=null).map(StationCacheInfoDto::getBoosterGatewayId).collect(Collectors.toList());
fanGateWayIds.addAll(boostGateWayIds);
String gatewayIds =Optional.ofNullable(fanGateWayIds).orElse(new ArrayList<>()).stream().distinct().collect(Collectors.joining(","));
List<String> time = new ArrayList<>();
Map<String, Object> activePowerInfo = new HashMap<>();
List<IndicatorData> activePowerList = new ArrayList<>();
activePowerList = indicatorDataNewMapper.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.ACTIVE_POWER,gatewayIds);
Map<String,List<IndicatorData>> stringObjectMap =activePowerList.stream().collect(Collectors.groupingBy(IndicatorData::getDasTime));
stringObjectMap.keySet().stream().forEach(dasTime -> {
time.add(dasTime.split(":")[1]);
Double vl= stringObjectMap.get(dasTime).stream().mapToDouble(IndicatorData::getValueF).sum();
values.add(String.format(CommonConstans.Twodecimalplaces, vl));
});
String max = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).max().getAsDouble());
String min = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).min().getAsDouble());
String mean = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).average().getAsDouble());
activePowerInfo.put("mean", mean);
activePowerInfo.put("max", max);
activePowerInfo.put("min", min);
activePowerInfo.put("maxTime", time.get(values.lastIndexOf(max)));
activePowerInfo.put("minTime", time.get(values.lastIndexOf(min)));
activePowerInfo.put("load", String.format(CommonConstans.Twodecimalplaces, Double.valueOf(values.get(values.size() - 1)) / installedCapacity.get()));
List<Map<String, Object>> seriesData = new ArrayList<>();
Map<String, Object> map3 = new HashMap<>();
Map<String, Object> map1 = new HashMap<>();
Map<String, Object> map2 = new HashMap<>();
map1.put("data", values);
seriesData.add(map1);
map.put("seriesData", seriesData);
map.put("axisData", time);
try {
emqKeeper.getMqttClient().publish( s+"_Power_table", JSON.toJSON(map).toString().getBytes("UTF-8"), 1, true);
emqKeeper.getMqttClient().publish(s+"_Power_info", JSON.toJSON(activePowerInfo).toString().getBytes("UTF-8"), 1, true);
} catch (Exception exception) {
exception.printStackTrace();
}
return map;
}
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdanalysismapper/IndicatorDataNewMapper.java 0 → 100644
View file @ def1b30d
package com.yeejoin.amos.boot.module.jxiop.biz.tdanalysismapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface IndicatorDataNewMapper extends BaseMapper<IndicatorData> {
@Select("select LAST(address)address,LAST(gateway_id)gatewayId,LAST(data_type)dataType,LAST(equipment_index_name)equipmentIndexName,LAST(`value_f`)valueF,LAST(equipment_number)equipmentNumber,LAST(created_time)createdTime from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and gateway_id =#{gatewayId} and ts >=#{startTime} and ts <=#{endTime} group by address ")
List<IndicatorData> selectlastfd(@Param("equipmentIndexName") String equipmentIndexName,@Param("gatewayId") String gatewayId,@Param("startTime") String startTime, @Param("endTime") String endTime);
@Select("select LAST(address)address,LAST(gateway_id)gatewayId,LAST(data_type)dataType,LAST(equipment_index_name)equipmentIndexName,LAST(`value_f`)valueF,LAST(equipment_number)equipmentNumber,LAST(created_time)createdTime from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and gateway_id =#{gatewayId} and ts >=#{startTime} and ts <=#{endTime} group by address ")
List<IndicatorData> selectlastgf(@Param("equipmentIndexName") String equipmentIndexName,@Param("gatewayId") String gatewayId,@Param("startTime") String startTime, @Param("endTime") String endTime);
@Select("select created_time createdTime, `value_f` as valueF from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and ts >= #{startTime} and ts <= #{endTime} and gateway_id =#{gatewayId}")
List<IndicatorData> selectDataByequipmentIndexNameAndtime(@Param("equipmentIndexName") String equipmentIndexName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
@Select("select sum(valueFs) valueF,xtime from (select SUBSTR(`created_time`, 11,6) xtime, `value_f` as valueFs from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and ts >= #{startTime} and ts <= #{endTime} and gateway_id in (#{gatewayId})) group by xtime order by xtime ")
List<IndicatorData> selectDataByequipmentIndexNameAndtimeqg(@Param("equipmentIndexName") String equipmentIndexName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
@Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where point_name =#{pointName} and ts >= TODAY()-8h and point_type ='SYNTHETIC'")
List<IndicatorData> selectDataByequipmentIndexNameAndtimeqgNew(@Param("equipmentIndexName") String pointName);
@Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where point_name =#{pointName} and ts >= TODAY()-8h and gateway_id in (#{gatewayId})) and point_type ='SYNTHETIC'")
List<IndicatorData> selectDataByequipmentIndexNameAndtimeqgNew(@Param("equipmentIndexName") String pointName,@Param("gatewayId") String gatewayId);
@Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and equipment_number = #{equipmentNumber} and ts >= #{startTime} and ts <= #{endTime} and gateway_id = #{gatewayId}")
List<IndicatorData> selectDataByequipmentIndexNameAndtimeAndEquipmentNumber(@Param("equipmentIndexName") String equipmentIndexName, @Param("equipmentNumber") String equipmentNumber, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
@Select("select `value`, created_time, `value_f` as valueF, equipment_index_name from iot_data.indicator_data where equipment_index_name like '%路电流%' and equipment_number = #{equipmentNumber} and ts >= #{startTime} and ts <= #{endTime} and gateway_id =#{gatewayId}")
List<IndicatorData> selectDataByequipmentIndexNameAndtimeAndEquipmentNumberPv(@Param("equipmentNumber") String equipmentNumber, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-dev.properties
View file @ def1b30d
...@@ -11,13 +11,16 @@ spring.db2.datasource.url=jdbc:mysql://139.9.173.44:3306/jxiop_sync_data?allowMu ...@@ -11,13 +11,16 @@ spring.db2.datasource.url=jdbc:mysql://139.9.173.44:3306/jxiop_sync_data?allowMu
spring.db2.datasource.username=root spring.db2.datasource.username=root
spring.db2.datasource.password=Yeejoin@2020 spring.db2.datasource.password=Yeejoin@2020
spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
##db3
spring.db3.datasource.url=jdbc:TAOS-RS://139.9.170.47:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true spring.db3.datasource.url=jdbc:TAOS-RS://139.9.170.47:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
spring.db3.datasource.username=root spring.db3.datasource.username=root
spring.db3.datasource.password=taosdata spring.db3.datasource.password=taosdata
spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
##db4
spring.db4.datasource.url=jdbc:TAOS-RS://139.9.170.47:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
spring.db4.datasource.username=root
spring.db4.datasource.password=taosdata
spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
## eureka properties: ## eureka properties:
eureka.instance.hostname=172.16.10.220 eureka.instance.hostname=172.16.10.220
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-dev1.properties 0 → 100644
View file @ def1b30d
## DB properties:
## db1-production database
spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db1.datasource.url=jdbc:mysql://10.20.1.157:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db1.datasource.username=root
spring.db1.datasource.password=Yeejoin@2020
spring.db1.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
## db2-sync_data
spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db2.datasource.url=jdbc:mysql://10.20.1.157:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db2.datasource.username=root
spring.db2.datasource.password=Yeejoin@2020
spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
##db3
spring.db3.datasource.url=jdbc:TAOS-RS://10.20.1.157:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
spring.db3.datasource.username=root
spring.db3.datasource.password=taosdata
spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
##db4
spring.db4.datasource.url=jdbc:TAOS-RS://10.20.1.157:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
spring.db4.datasource.username=root
spring.db4.datasource.password=taosdata
spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
## eureka properties:
eureka.instance.hostname=172.16.10.220
eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
## redis properties:
spring.redis.database=1
spring.redis.host=10.20.1.210
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.cache.type=GENERIC
j2cache.open-spring-cache=true
j2cache.cache-clean-mode=passive
j2cache.allow-null-values=true
j2cache.redis-client=lettuce
j2cache.l2-cache-open=true
j2cache.broadcast=net.oschina.j2cache.cache.support.redis.SpringRedisPubSubPolicy
j2cache.L1.provider_class=caffeine
j2cache.L2.provider_class=net.oschina.j2cache.cache.support.redis.SpringRedisProvider
j2cache.L2.config_section=lettuce
j2cache.sync_ttl_to_redis=true
j2cache.default_cache_null_object=false
j2cache.serialization=fst
caffeine.properties=/caffeine.properties
lettuce.mode=single
lettuce.namespace=
lettuce.storage=generic
lettuce.channel=j2cache
lettuce.scheme=redis
lettuce.hosts=${spring.redis.host}:${spring.redis.port}
lettuce.password=${spring.redis.password}
lettuce.database=${spring.redis.database}
lettuce.sentinelMasterId=
lettuce.maxTotal=100
lettuce.maxIdle=10
lettuce.minIdle=10
lettuce.timeout=10000
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.220:1883
emqx.user-name=admin
emqx.password=public
mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
emqx.max-inflight=1000
## influxDB
#spring.influx.url= http://172.16.3.155:18186
#spring.influx.password=Yeejoin@2020
#spring.influx.user=root
#spring.influx.database=iot_platform
#spring.influx.retention_policy=default
#spring.influx.retention_policy_time=30d
#spring.influx.actions=10000
#spring.influx.bufferLimit=20000
## influxDB
#spring.influx.url= http://139.9.171.247:8086
#spring.influx.password=Yeejoin@2023
#spring.influx.user=admin
#spring.influx.database=iot_platform
#spring.influx.retention_policy=default
#spring.influx.retention_policy_time=30d
#spring.influx.actions=10000
#spring.influx.bufferLimit=20000
#spring.influx.url=http://10.20.1.157:18086
#spring.influx.password=Yeejoin@2020
#spring.influx.user=root
#spring.influx.database=iot_platform
#spring.influx.retention_policy=default
#spring.influx.retention_policy_time=30d
#spring.influx.actions=10000
#spring.influx.bufferLimit=20000
knife4j.production=false
knife4j.enable=true
knife4j.basic.enable=true
knife4j.basic.username=admin
knife4j.basic.password=a1234560
management.security.enabled=true
spring.security.user.name=admin
spring.security.user.password=a1234560
fire-rescue=123
mybatis-plus.global-config.db-config.update-strategy=ignored
# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
amos.secret.key=qaz
# if your service can't be access ,you can use this setting , you need change ip as your.
#eureka.instance.prefer-ip-address=true
#eureka.instance.ip-address=172.16.3.122
spring.activemq.broker-url=tcp://10.20.1.210:61616
spring.activemq.user=admin
spring.activemq.password=admin
spring.jms.pub-sub-domain=false
myqueue=amos.privilege.v1.JXIOP.AQSC_FDGL.userBusiness
spring.elasticsearch.rest.uris=http://10.20.0.223:9200
spring.elasticsearch.rest.connection-timeout=30000
spring.elasticsearch.rest.username=elastic
spring.elasticsearch.rest.password=Yeejoin@2020
spring.elasticsearch.rest.read-timeout=30000
# ?????????
fan.statuts.stattuspath=upload/jxiop/device_status
pictureUrl=upload/jxiop/syz/
# Ԥ
idx.predict.serviceUrl=http://10.20.1.157:8095/jxdj/predict-data
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application.properties
View file @ def1b30d
...@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-BIGSCREEN ...@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-BIGSCREEN
server.servlet.context-path=/jxiop-bigscreen server.servlet.context-path=/jxiop-bigscreen
server.port=33300 server.port=33300
server.uri-encoding=UTF-8 server.uri-encoding=UTF-8
spring.profiles.active=dev spring.profiles.active=dev1
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
logging.config=classpath:logback-${spring.profiles.active}.xml logging.config=classpath:logback-${spring.profiles.active}.xml
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/logback-dev1.xml 0 → 100644
View file @ def1b30d
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>7</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<!--日志文件最大的大小-->
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>30mb</MaxFileSize>
</triggeringPolicy>
</appender>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="DEBUG"/>
<logger name="java.sql.Connection" level="DEBUG"/>
<logger name="java.sql.Statement" level="DEBUG"/>
<logger name="java.sql.PreparedStatement" level="DEBUG"/>
<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
<logger name="org.springframework" level="DEBUG"/>
<logger name="org.typroject" level="DEBUG"/>
<logger name="com.yeejoin" level="DEBUG"/>
<!-- 日志输出级别 -->
<root level="INFO">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
</root>
</configuration>
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 @ def1b30d
package com.yeejoin.amos.boot.module.jxiop.biz.service.impl; package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.DesensitizedUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -63,331 +62,331 @@ import java.util.stream.Collectors; ...@@ -63,331 +62,331 @@ import java.util.stream.Collectors;
*/ */
@Slf4j @Slf4j
@Service @Service
public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBasic, PersonBasicMapper> implements IPersonBasicService { public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBasic, PersonBasicMapper>
implements IPersonBasicService {
@Autowired
PersonBasicMapper personBasicMapper; @Autowired
PersonBasicMapper personBasicMapper;
//人员账号信息service // 人员账号信息service
@Autowired @Autowired
PersonAccountServiceImpl personAccountService; PersonAccountServiceImpl personAccountService;
//人员归属信息service // 人员归属信息service
@Autowired @Autowired
PersonAscriptionServiceImpl personAscriptionService; PersonAscriptionServiceImpl personAscriptionService;
//人员资质信息service // 人员资质信息service
@Autowired @Autowired
PersonCertificateServiceImpl personCertificateService; PersonCertificateServiceImpl personCertificateService;
//人员教育信息 // 人员教育信息
@Autowired @Autowired
PersonSkillEducationServiceImpl personSkillEducationService; PersonSkillEducationServiceImpl personSkillEducationService;
@Value("${amos.secret.key}") @Value("${amos.secret.key}")
String secretKey; String secretKey;
@Autowired @Autowired
QuerueProduce querueProduce; QuerueProduce querueProduce;
@Autowired @Autowired
private AmosFeignService amosFeignService; private AmosFeignService amosFeignService;
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;
@Autowired @Autowired
protected EmqKeeper emqKeeper; protected EmqKeeper emqKeeper;
@Autowired
@Autowired private AgencyuserFeign agencyuserFeign;
private AgencyuserFeign agencyuserFeign;
@Autowired
@Autowired private UserEmpowerMapper userEmpowerMapper;
private UserEmpowerMapper userEmpowerMapper;
/**
/** * 人员赋码触发风险模型
* 人员赋码触发风险模型 */
*/ public static final String RYFM_DATA_MQTT_TOPIC = "ryfm/data/analysis";
public static final String RYFM_DATA_MQTT_TOPIC = "ryfm/data/analysis";
/**
* 人员红黄码恢复为绿码
/** */
* 人员红黄码恢复为绿码 public static final String RYFM_GREEN = "ryfm/person/green";
*/
public static final String RYFM_GREEN = "ryfm/person/green"; private String UPDATE = "UPDATE";
private String INSERT = "INSERT";
@Autowired
PersonAccountFedMapper personAccountFedMapper;
private String UPDATE="UPDATE";
private String INSERT="INSERT"; /**
@Autowired * 分页查询
PersonAccountFedMapper personAccountFedMapper; */
/** public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page) {
* 分页查询 return this.queryForPage(page, null, false);
*/ }
public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page) {
return this.queryForPage(page, null, false); /**
} * 列表查询 示例
*/
/** public List<PersonBasicDto> queryForPersonBasicList() {
* 列表查询 示例 return this.queryForList("", false);
*/ }
public List<PersonBasicDto> queryForPersonBasicList() {
return this.queryForList("", false); public void addRedisPostAndCerInfo() {
} List<DictionarieValueModel> elevatorCategory = null;
try {
public void addRedisPostAndCerInfo() { elevatorCategory = amosFeignService.listDictionaryByDictCode("YGZYJNJDZS");
List<DictionarieValueModel> elevatorCategory = null; } catch (Exception e) {
try { e.printStackTrace();
elevatorCategory = amosFeignService.listDictionaryByDictCode("YGZYJNJDZS"); }
} catch (Exception e) { Map<String, String> collect = elevatorCategory.stream().collect(
e.printStackTrace(); Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
} redisUtils.set(Constants.JXIOP_DICT_POST, collect);
Map<String, String> collect = elevatorCategory.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
redisUtils.set(Constants.JXIOP_DICT_POST, collect); List<DictionarieValueModel> elevator = null;
try {
List<DictionarieValueModel> elevator = null; elevator = amosFeignService.listDictionaryByDictCode("岗位资质鉴定证书");
try { } catch (Exception e) {
elevator = amosFeignService.listDictionaryByDictCode("岗位资质鉴定证书"); e.printStackTrace();
} catch (Exception e) { }
e.printStackTrace(); Map<String, String> collect2 = elevator.stream().collect(
} Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
Map<String, String> collect2 = elevator.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc)); redisUtils.set(Constants.JXIOP_DICT_CERTIFICATES, collect2);
redisUtils.set(Constants.JXIOP_DICT_CERTIFICATES, collect2); }
}
public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount, String content) {
RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount, String content) { riskBizInfoVo.setWarningObjectName(
RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo(); personAccount.getProjectName() + personBasic.getPostName() + personAccount.getName());
riskBizInfoVo.setWarningObjectName(personAccount.getProjectName() + personBasic.getPostName() + personAccount.getName()); riskBizInfoVo.setWarningObjectCode(String.valueOf(personBasic.getSequenceNbr()));
riskBizInfoVo.setWarningObjectCode(String.valueOf(personBasic.getSequenceNbr())); riskBizInfoVo.setSourceAttribution(personBasic.getProjectOrgCode());
riskBizInfoVo.setSourceAttribution(personBasic.getProjectOrgCode()); riskBizInfoVo.setSourceAttributionDesc(personAccount.getProjectName());
riskBizInfoVo.setSourceAttributionDesc(personAccount.getProjectName()); riskBizInfoVo.setWarningObjectType("RYFM");
riskBizInfoVo.setWarningObjectType("RYFM"); List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>(); RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo(); dynamicDetailsVo.setTabName("预警详情");
dynamicDetailsVo.setTabName("预警详情"); detailsVos.add(dynamicDetailsVo);
detailsVos.add(dynamicDetailsVo); riskBizInfoVo.setDynamicDetails(detailsVos);
riskBizInfoVo.setDynamicDetails(detailsVos); CustomizeItems customizeItems = new CustomizeItems();
CustomizeItems customizeItems = new CustomizeItems(); customizeItems.setWarningContent(content);
customizeItems.setWarningContent(content); riskBizInfoVo.setCustomizeItems(customizeItems);
riskBizInfoVo.setCustomizeItems(customizeItems); return riskBizInfoVo;
return riskBizInfoVo; }
}
/**
* 新增
/** */
* 新增 @Transactional
*/ public void addPerson(PersonDto model, HttpServletRequest httpServletRequest) throws Exception {
@Transactional if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
public void addPerson(PersonDto model, HttpServletRequest httpServletRequest) throws Exception { addRedisPostAndCerInfo();
if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) { }
addRedisPostAndCerInfo(); // 岗位所需证书信息
} Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
// 岗位所需证书信息 // 证书临期信息
Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST); Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
// 证书临期信息
Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES); // 获取人员基本信息数据
PersonUser personUser = model.getPersonUser();
//获取人员基本信息数据 // 获取人员账号信息
PersonUser personUser = model.getPersonUser(); PersonAccount personAccount = model.getPersonAccount();
//获取人员账号信息 personUser.setPhone(personAccount.getPhoneNum());
PersonAccount personAccount = model.getPersonAccount(); // 人员基础信息
personUser.setPhone(personAccount.getPhoneNum()); PersonBasic personBasic = new PersonBasic();
//人员基础信息 BeanUtils.copyProperties(personUser, personBasic);
PersonBasic personBasic = new PersonBasic(); // 默认红码
BeanUtils.copyProperties(personUser, personBasic); personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
//默认红码 personBasic.setQrcodeDesc("证书不全");
personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode()); // 该岗位应获得的证书
personBasic.setQrcodeDesc("证书不全"); List<String> list2 = new ArrayList<>();
// 该岗位应获得的证书 if (StringUtils.isNotEmpty(personUser.getPostName())) {
List<String> list2 = new ArrayList<>(); String certificates = postNameMap.get(personUser.getPostName());
if (StringUtils.isNotEmpty(personUser.getPostName())) { if (!StringUtils.isEmpty(certificates)) {
String certificates = postNameMap.get(personUser.getPostName()); list2 = Arrays.asList(certificates.split(","));
if (!StringUtils.isEmpty(certificates)) { }
list2 = Arrays.asList(certificates.split(",")); }
} List<String> list = new ArrayList(list2);
} // 人员资质信息
List<String> list = new ArrayList(list2); Integer isInMonth = 0;
//人员资质信息 Integer isOver = 0;
Integer isInMonth = 0; CertificationInfo personCertificate = model.getPersonCertificate();
Integer isOver = 0;
CertificationInfo personCertificate = model.getPersonCertificate(); // 过期的证书
List<String> overCertificateList = new ArrayList<>();
// 过期的证书 // 临期证书
List<String> overCertificateList = new ArrayList<>(); List<String> inMonthCertificateList = new ArrayList<>();
// 临期证书 if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
List<String> inMonthCertificateList = new ArrayList<>(); for (PersonCertificate item : personCertificate.getCertificationInfo()) {
if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) { if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) {
for (PersonCertificate item : personCertificate.getCertificationInfo()) { int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3
if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) { : Integer.parseInt(item.getValidPeriod());
int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod()); Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod); if (list.contains(item.getCertificateName()) && DateUtils.dateCompare(date, new Date()) == -1) {
if (list.contains(item.getCertificateName()) && isOver = 1;
DateUtils.dateCompare(date, new Date()) == -1) { overCertificateList.add(item.getCertificateName());
isOver = 1; }
overCertificateList.add(item.getCertificateName()); if (list.contains(item.getCertificateName())
} && DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer
if (list.contains(item.getCertificateName()) && .valueOf(certificatesMap.get(item.getCertificateName()))
DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer.valueOf(certificatesMap.get(item.getCertificateName())) && && DateUtils.dateCompare(date, new Date()) == 1) {
DateUtils.dateCompare(date, new Date()) == 1) { isInMonth = 1;
isInMonth = 1; inMonthCertificateList.add(item.getCertificateName());
inMonthCertificateList.add(item.getCertificateName()); }
} }
} list.remove(item.getCertificateName());
list.remove(item.getCertificateName()); }
} }
} // 缺证
// 缺证 List<String> noCertificateList = new ArrayList<>(list);
List<String> noCertificateList = new ArrayList<>(list); List<String> strings = new ArrayList<>();
List<String> strings = new ArrayList<>(); if (CollectionUtils.isNotEmpty(overCertificateList)) {
if (CollectionUtils.isNotEmpty(overCertificateList)) { strings.add("过期证书：" + String.join("，", overCertificateList));
strings.add("过期证书：" + String.join("，" , overCertificateList)); }
} if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
if (CollectionUtils.isNotEmpty(inMonthCertificateList)) { strings.add("临期证书：" + String.join("，", inMonthCertificateList));
strings.add("临期证书：" + String.join("，" , inMonthCertificateList)); }
} if (CollectionUtils.isNotEmpty(noCertificateList)) {
if (CollectionUtils.isNotEmpty(noCertificateList)) { strings.add("缺少证书：" + String.join("，", noCertificateList));
strings.add("缺少证书：" + String.join("，" , noCertificateList)); }
} String join = "";
String join = ""; if (CollectionUtils.isNotEmpty(strings)) {
if (CollectionUtils.isNotEmpty(strings)) { join = String.join("；", strings);
join = String.join("；", strings); }
} personBasic.setMissingCertificate(join);
personBasic.setMissingCertificate(join);
if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) { personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode()); personBasic.setQrcodeDesc("证书齐全");
personBasic.setQrcodeDesc("证书齐全"); personBasic.setQrcodeDate(new Date());
personBasic.setQrcodeDate(new Date()); } else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
} else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) { personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode()); personBasic.setQrcodeDesc("证书不全");
personBasic.setQrcodeDesc("证书不全"); personBasic.setQrcodeDate(new Date());
personBasic.setQrcodeDate(new Date()); } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
} else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) { personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode()); personBasic.setQrcodeDesc("证书临期");
personBasic.setQrcodeDesc("证书临期"); personBasic.setQrcodeDate(new Date());
personBasic.setQrcodeDate(new Date()); }
} CompanyModel companyModel = new CompanyModel();
CompanyModel companyModel = new CompanyModel(); // 单位
//单位 companyModel = this.getCompanyModel(personAccount.getProjectId());
companyModel = this.getCompanyModel(personAccount.getProjectId()); personBasic.setProjectOrgCode(companyModel.getOrgCode());
personBasic.setProjectOrgCode(companyModel.getOrgCode());
if (personUser.getNativePlace() != null) {
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
if (personUser.getNativePlace()!=null) { }
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace())); this.baseMapper.insert(personBasic);
}
this.baseMapper.insert(personBasic); if ("证书不全".equals(personBasic.getQrcodeDesc()) || "证书临期".equals(personBasic.getQrcodeDesc())) {
personBasic.setProjectOrgCode(companyModel.getOrgCode());
if ("证书不全".equals(personBasic.getQrcodeDesc()) || "证书临期".equals(personBasic.getQrcodeDesc())) { personAccount.setProjectName(companyModel.getCompanyName());
personBasic.setProjectOrgCode(companyModel.getOrgCode()); BizMessage bizMessage = new BizMessage();
personAccount.setProjectName(companyModel.getCompanyName()); bizMessage.setIndexKey("RYFM");
BizMessage bizMessage = new BizMessage(); bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
bizMessage.setIndexKey("RYFM"); RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc()); bizMessage.setBizInfo(riskBizInfoVo);
RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join); bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr()));
bizMessage.setBizInfo(riskBizInfoVo); try {
bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr())); emqKeeper.getMqttClient().publish(RYFM_DATA_MQTT_TOPIC,
try { JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
emqKeeper.getMqttClient().publish(RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false); } catch (MqttException e) {
} catch (MqttException e) { e.printStackTrace();
e.printStackTrace(); }
} }
} if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) { personCertificate.getCertificationInfo().forEach(item -> {
personCertificate.getCertificationInfo().forEach(item -> { item.setPersonId(personBasic.getSequenceNbr());
item.setPersonId(personBasic.getSequenceNbr()); personCertificateService.save(item);
personCertificateService.save(item); });
}); }
} // 人员技能学历信息
//人员技能学历信息 PersonSkillEducation personSkillEducation = new PersonSkillEducation();
PersonSkillEducation personSkillEducation = new PersonSkillEducation(); BeanUtils.copyProperties(personUser, personSkillEducation);
BeanUtils.copyProperties(personUser, personSkillEducation); personSkillEducation.setPersonId(personBasic.getSequenceNbr());
personSkillEducation.setPersonId(personBasic.getSequenceNbr()); personSkillEducationService.save(personSkillEducation);
personSkillEducationService.save(personSkillEducation);
// 人员账号信息
//人员账号信息 personAccount.setPersonId(personBasic.getSequenceNbr());
personAccount.setPersonId(personBasic.getSequenceNbr()); personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey)); personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey)); personAccountService.save(personAccount);
personAccountService.save(personAccount); // 新增平台账号
//新增平台账号 // 组装数据
//组装数据 AgencyUserModel usd = new AgencyUserModel();
AgencyUserModel usd = new AgencyUserModel(); // 应用
//应用 usd.setAppCodes(personAccount.getApplication());
usd.setAppCodes(personAccount.getApplication()); // 手机号
//手机号 usd.setMobile(personUser.getPhone());
usd.setMobile(personUser.getPhone()); // 角色
//角色 Map<Long, List<Long>> map = new HashMap<>();
Map<Long, List<Long>> map = new HashMap<>(); List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim()))
List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组 .collect(Collectors.toList()); // 测点数组
if (personAccount.getDepartmentId() != null) { if (personAccount.getDepartmentId() != null) {
map.put(personAccount.getDepartmentId(), cdids); map.put(personAccount.getDepartmentId(), cdids);
} else { } else {
map.put(personAccount.getProjectId(), cdids); map.put(personAccount.getProjectId(), cdids);
} }
usd.setOrgRoleSeqs(map); usd.setOrgRoleSeqs(map);
//密码 // 密码
usd.setPassword(personAccount.getPassword()); usd.setPassword(personAccount.getPassword());
//二次密码 // 二次密码
usd.setRePassword(personAccount.getSecondaryPassword()); usd.setRePassword(personAccount.getSecondaryPassword());
//用户名 // 用户名
usd.setRealName(personAccount.getName()); usd.setRealName(personAccount.getName());
//账号 // 账号
usd.setUserName(personAccount.getAccountName()); usd.setUserName(personAccount.getAccountName());
usd.setLockStatus("UNLOCK"); usd.setLockStatus("UNLOCK");
//新增平台用户 // 新增平台用户
AgencyUserModel agencyUserModel = this.setcreateUser(usd); AgencyUserModel agencyUserModel = this.setcreateUser(usd);
//设置userID // 设置userID
usd.setUserId(agencyUserModel.getUserId()); usd.setUserId(agencyUserModel.getUserId());
//设置工号 // 设置工号
usd.setUserName(personAccount.getJobNumber()); usd.setUserName(personAccount.getJobNumber());
//创建支持工号登录 // 创建支持工号登录
this.createLoginInfo(usd); this.createLoginInfo(usd);
//查询部门 // 查询部门
DepartmentModel departmentModel = null; DepartmentModel departmentModel = null;
if (personAccount.getDepartmentId() != null) { if (personAccount.getDepartmentId() != null) {
departmentModel = this.getdepartmentModel(personAccount.getDepartmentId()); departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
} }
if (departmentModel != null) { if (departmentModel != null) {
//personBasic.setProjectOrgCode(departmentModel.getOrgCode()); // personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName()); personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
} }
// personBasic.setProjectOrgCode(companyModel.getOrgCode()); // personBasic.setProjectOrgCode(companyModel.getOrgCode());
// //
// //
// if (personUser.getNativePlace()!=null) { // if (personUser.getNativePlace()!=null) {
// personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace())); // personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
// } // }
personAccount.setPuserId(agencyUserModel.getUserId()); personAccount.setPuserId(agencyUserModel.getUserId());
personAccount.setProjectName(companyModel.getCompanyName()); personAccount.setProjectName(companyModel.getCompanyName());
// this.personBasicMapper.updateById(personBasic); // this.personBasicMapper.updateById(personBasic);
this.personAccountService.updateById(personAccount); this.personAccountService.updateById(personAccount);
//----------------------------权限表中新增数据----------------------------- // ----------------------------权限表中新增数据-----------------------------
StdUserEmpower stdUserEmpower = new StdUserEmpower(); StdUserEmpower stdUserEmpower = new StdUserEmpower();
stdUserEmpower.setPermissionType("YTH"); stdUserEmpower.setPermissionType("YTH");
stdUserEmpower.setRecDate(new Date()); stdUserEmpower.setRecDate(new Date());
stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission())); stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
stdUserEmpower.setAmosUserId(personAccount.getPuserId()); stdUserEmpower.setAmosUserId(personAccount.getPuserId());
userEmpowerMapper.insert(stdUserEmpower); userEmpowerMapper.insert(stdUserEmpower);
//----------------------------户用管理端区域公司--------------------------- // ----------------------------户用管理端区域公司---------------------------
StdUserEmpower stdUserEmpowerhygf = new StdUserEmpower(); StdUserEmpower stdUserEmpowerhygf = new StdUserEmpower();
List<CompanyModel> co= userEmpowerMapper.getCompanyBoList("region",null,null); List<CompanyModel> co = userEmpowerMapper.getCompanyBoList("region", null, null);
List<String> re= personAccount.getRegionalCompaniesSeq(); List<String> re = personAccount.getRegionalCompaniesSeq();
String flag=personAccount.getRegionalCompaniesSeqFlag(); String flag = personAccount.getRegionalCompaniesSeqFlag();
if(flag!=null&&!flag.isEmpty()){ if (flag != null && !flag.isEmpty()) {
if(flag.equals("all")){ if (flag.equals("all")) {
List<String> all=new ArrayList<>(); List<String> all = new ArrayList<>();
all.add("all"); all.add("all");
stdUserEmpowerhygf.setAmosOrgCode(all); stdUserEmpowerhygf.setAmosOrgCode(all);
}else{ } else {
stdUserEmpowerhygf.setAmosOrgCode(re); stdUserEmpowerhygf.setAmosOrgCode(re);
} }
} }
List<String> exre= personAccount.getExternalRegionalCompaniesSeq(); List<String> exre = personAccount.getExternalRegionalCompaniesSeq();
// if(exre!=null&&!exre.isEmpty()){ // if(exre!=null&&!exre.isEmpty()){
// List<String> pexre=new ArrayList<>(); // List<String> pexre=new ArrayList<>();
// List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList()); // List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList());
...@@ -398,278 +397,275 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -398,278 +397,275 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
// } // }
// stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre); // stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre);
// } // }
stdUserEmpowerhygf.setEliminateAmosOrgCode(exre); stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
stdUserEmpowerhygf.setPermissionType("HYGF"); stdUserEmpowerhygf.setPermissionType("HYGF");
stdUserEmpowerhygf.setRecDate(new Date()); stdUserEmpowerhygf.setRecDate(new Date());
stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId()); stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
userEmpowerMapper.insert(stdUserEmpowerhygf); userEmpowerMapper.insert(stdUserEmpowerhygf);
// ----------------------------权限表中新增数据-----------------------------
PersonAccountFed personAccountFed = new PersonAccountFed();
BeanUtils.copyProperties(personAccount, personAccountFed);
personAccountFed.setSyncState(0);
personAccountFed.setSyncDate(new Date());
personAccountFedMapper.insert(personAccountFed);
//----------------------------权限表中新增数据-----------------------------
PersonAccountFed personAccountFed = new PersonAccountFed(); Map<String, Object> data = new HashMap<>();
BeanUtils.copyProperties(personAccount, personAccountFed); data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
personAccountFed.setSyncState(0); ProduceMsg produceMsg = new ProduceMsg(data, INSERT, agencyUserModel.getUserId());
personAccountFed.setSyncDate(new Date()); querueProduce.produceMsg(JSON.toJSONString(produceMsg));
personAccountFedMapper.insert(personAccountFed);
}
Map<String, Object> data=new HashMap<>();
data.put("SEQUENCE_NBR",agencyUserModel.getSequenceNbr()); @Transactional
ProduceMsg produceMsg= new ProduceMsg(data, INSERT,agencyUserModel.getUserId()); public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest, Long sequenceNbr)
querueProduce.produceMsg(JSON.toJSONString(produceMsg)); throws ParseException {
} if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
addRedisPostAndCerInfo();
}
@Transactional // 岗位所需证书信息
public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest, Long sequenceNbr) throws ParseException { Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
// 证书临期信息
if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) { Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
addRedisPostAndCerInfo();
} // 获取人员基本信息数据
// 岗位所需证书信息 PersonUser personUser = model.getPersonUser();
Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST); // 获取人员账号信息
// 证书临期信息 PersonAccount personAccount = model.getPersonAccount();
Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES); PersonAccount oldpersonAccount = new PersonAccount();
personUser.setPhone(personAccount.getPhoneNum());
//获取人员基本信息数据
PersonUser personUser = model.getPersonUser(); // 人员基础信息
//获取人员账号信息 PersonBasic personBasic = personBasicMapper.selectById(sequenceNbr);
PersonAccount personAccount = model.getPersonAccount(); personBasic.setSequenceNbr(sequenceNbr);
PersonAccount oldpersonAccount = new PersonAccount(); personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
personUser.setPhone(personAccount.getPhoneNum()); personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
//人员基础信息 // 人员归属信息
PersonBasic personBasic = personBasicMapper.selectById(sequenceNbr); PersonSkillEducation personSkillEducation = new PersonSkillEducation();
personBasic.setSequenceNbr(sequenceNbr); BeanUtils.copyProperties(personUser, personSkillEducation);
personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey)); personSkillEducation.setPersonId(personBasic.getSequenceNbr());
personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey)); PersonSkillEducation personSkillEducationd = personSkillEducationService
.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
//人员归属信息 personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
PersonSkillEducation personSkillEducation = new PersonSkillEducation(); personSkillEducationService.updateById(personSkillEducation);
BeanUtils.copyProperties(personUser, personSkillEducation);
personSkillEducation.setPersonId(personBasic.getSequenceNbr()); // 获取人员资质信息
PersonSkillEducation personSkillEducationd = personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr())); CertificationInfo personCertificate = model.getPersonCertificate();
personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
personSkillEducationService.updateById(personSkillEducation); LambdaUpdateWrapper<PersonCertificate> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(PersonCertificate::getPersonId, personBasic.getSequenceNbr());
//获取人员资质信息 personCertificateService.remove(wrapper);
CertificationInfo personCertificate = model.getPersonCertificate();
// 默认红码
LambdaUpdateWrapper<PersonCertificate> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(PersonCertificate::getPersonId, personBasic.getSequenceNbr());
personCertificateService.remove(wrapper);
//默认红码
// personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode()); // personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
// 该岗位应获得的证书 // 该岗位应获得的证书
List<String> list2 = new ArrayList<>(); List<String> list2 = new ArrayList<>();
if (StringUtils.isNotEmpty(personUser.getPostName())) { if (StringUtils.isNotEmpty(personUser.getPostName())) {
String certificates = String.valueOf(postNameMap.get(personUser.getPostName())); String certificates = String.valueOf(postNameMap.get(personUser.getPostName()));
if (!StringUtils.isEmpty(certificates)) { if (!StringUtils.isEmpty(certificates)) {
list2 = Arrays.asList(certificates.split(",")); list2 = Arrays.asList(certificates.split(","));
} }
} }
List<String> list = new ArrayList(list2); List<String> list = new ArrayList(list2);
//人员资质信息 // 人员资质信息
Integer isInMonth = 0; Integer isInMonth = 0;
Integer isOver = 0; Integer isOver = 0;
// 过期的证书 // 过期的证书
List<String> overCertificateList = new ArrayList<>(); List<String> overCertificateList = new ArrayList<>();
// 临期证书 // 临期证书
List<String> inMonthCertificateList = new ArrayList<>(); List<String> inMonthCertificateList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) { if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
for (PersonCertificate item : personCertificate.getCertificationInfo()) { for (PersonCertificate item : personCertificate.getCertificationInfo()) {
if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) { if (StringUtils.isNotEmpty(item.getValidPeriod()) && !Objects.isNull(item.getCertificateTime())) {
int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod()); int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3
Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod); : Integer.parseInt(item.getValidPeriod());
if (list.contains(item.getCertificateName()) && Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
DateUtils.dateCompare(date, new Date()) == -1) { if (list.contains(item.getCertificateName()) && DateUtils.dateCompare(date, new Date()) == -1) {
isOver = 1; isOver = 1;
overCertificateList.add(item.getCertificateName()); overCertificateList.add(item.getCertificateName());
} }
if (list.contains(item.getCertificateName()) && if (list.contains(item.getCertificateName())
DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer.valueOf(certificatesMap.get(item.getCertificateName())) && && DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer
DateUtils.dateCompare(date, new Date()) == 1) { .valueOf(certificatesMap.get(item.getCertificateName()))
isInMonth = 1; && DateUtils.dateCompare(date, new Date()) == 1) {
inMonthCertificateList.add(item.getCertificateName()); isInMonth = 1;
} inMonthCertificateList.add(item.getCertificateName());
item.setPersonId(personBasic.getSequenceNbr()); }
personCertificateService.save(item); item.setPersonId(personBasic.getSequenceNbr());
} personCertificateService.save(item);
list.remove(item.getCertificateName()); }
} list.remove(item.getCertificateName());
} }
// 缺证 }
List<String> noCertificateList = new ArrayList<>(list); // 缺证
List<String> noCertificateList = new ArrayList<>(list);
List<String> strings = new ArrayList<>();
if (CollectionUtils.isNotEmpty(overCertificateList)) { List<String> strings = new ArrayList<>();
strings.add("过期证书：" + String.join("，" , overCertificateList)); if (CollectionUtils.isNotEmpty(overCertificateList)) {
} strings.add("过期证书：" + String.join("，", overCertificateList));
if (CollectionUtils.isNotEmpty(inMonthCertificateList)) { }
strings.add("临期证书：" + String.join("，" , inMonthCertificateList)); if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
} strings.add("临期证书：" + String.join("，", inMonthCertificateList));
if (CollectionUtils.isNotEmpty(noCertificateList)) { }
strings.add("缺少证书：" + String.join("，" , noCertificateList)); if (CollectionUtils.isNotEmpty(noCertificateList)) {
} strings.add("缺少证书：" + String.join("，", noCertificateList));
}
String join = "";
if (CollectionUtils.isNotEmpty(strings)) { String join = "";
join = String.join("；", strings); if (CollectionUtils.isNotEmpty(strings)) {
} join = String.join("；", strings);
String missingCertificateOld = personBasic.getMissingCertificate(); }
personBasic.setMissingCertificate(join); String missingCertificateOld = personBasic.getMissingCertificate();
CompanyModel companyModel = new CompanyModel(); personBasic.setMissingCertificate(join);
//单位 CompanyModel companyModel = new CompanyModel();
companyModel = this.getCompanyModel(personAccount.getProjectId()); // 单位
companyModel = this.getCompanyModel(personAccount.getProjectId());
String qrcodeColorOld = personBasic.getQrcodeColor();
if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) { String qrcodeColorOld = personBasic.getQrcodeColor();
personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode()); if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
personBasic.setQrcodeDesc("证书齐全"); personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
personBasic.setQrcodeDate(new Date()); personBasic.setQrcodeDesc("证书齐全");
} else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) { personBasic.setQrcodeDate(new Date());
personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode()); } else if ((CollectionUtils.isEmpty(list) && isOver == 1) || (CollectionUtils.isNotEmpty(list))) {
personBasic.setQrcodeDesc("证书不全"); personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
personBasic.setQrcodeDate(new Date()); personBasic.setQrcodeDesc("证书不全");
} else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) { personBasic.setQrcodeDate(new Date());
personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode()); } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
personBasic.setQrcodeDesc("证书临期"); personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
personBasic.setQrcodeDate(new Date()); personBasic.setQrcodeDesc("证书临期");
} personBasic.setQrcodeDate(new Date());
personBasic.setProjectOrgCode(companyModel.getOrgCode()); }
personAccount.setProjectName(companyModel.getCompanyName()); personBasic.setProjectOrgCode(companyModel.getOrgCode());
personAccount.setProjectName(companyModel.getCompanyName());
// 人员账号信息
personAccount.setPersonId(sequenceNbr);
//人员账号信息 oldpersonAccount = personAccountService.getById(personAccount.getSequenceNbr());
personAccount.setPersonId(sequenceNbr); personAccountService.updateById(personAccount);
oldpersonAccount=personAccountService.getById(personAccount.getSequenceNbr()); // 新增平台账号
personAccountService.updateById(personAccount); // 组装数据
//新增平台账号 AgencyUserModel usd = new AgencyUserModel();
//组装数据 // 应用
AgencyUserModel usd = new AgencyUserModel(); usd.setAppCodes(personAccount.getApplication());
//应用 // 手机号
usd.setAppCodes(personAccount.getApplication()); usd.setMobile(personUser.getPhone());
//手机号 // 角色
usd.setMobile(personUser.getPhone()); Map<Long, List<Long>> map = new HashMap<>();
//角色 List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim()))
Map<Long, List<Long>> map = new HashMap<>(); .collect(Collectors.toList()); // 测点数组
List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组 if (personAccount.getDepartmentId() != null) {
if (personAccount.getDepartmentId() != null) {
map.put(personAccount.getDepartmentId(), cdids);
map.put(personAccount.getDepartmentId(), cdids); } else {
} else { map.put(personAccount.getProjectId(), cdids);
map.put(personAccount.getProjectId(), cdids); }
} usd.setOrgRoleSeqs(map);
usd.setOrgRoleSeqs(map); // 密码
//密码 usd.setPassword(personAccount.getPassword());
usd.setPassword(personAccount.getPassword()); // 二次密码
//二次密码 usd.setRePassword(personAccount.getSecondaryPassword());
usd.setRePassword(personAccount.getSecondaryPassword()); // 用户名
//用户名 usd.setRealName(personAccount.getName());
usd.setRealName(personAccount.getName()); // 账号
//账号 usd.setUserName(personAccount.getAccountName());
usd.setUserName(personAccount.getAccountName()); usd.setLockStatus("UNLOCK");
usd.setLockStatus("UNLOCK"); usd.setUserId(personAccount.getPuserId());
usd.setUserId(personAccount.getPuserId()); usd.setOriginalPassword(oldpersonAccount.getPassword());
usd.setOriginalPassword(oldpersonAccount.getPassword()); // 新增平台用户
//新增平台用户 AgencyUserModel agencyUserModel = this.updateuser(personAccount.getPuserId(), usd);
AgencyUserModel agencyUserModel = this.updateuser(personAccount.getPuserId(), usd); log.info("更新平台账户信息：：" + JSONObject.toJSONString(usd));
log.info("更新平台账户信息：："+ JSONObject.toJSONString(usd)); // 设置userID
//设置userID usd.setUserId(agencyUserModel.getUserId());
usd.setUserId(agencyUserModel.getUserId()); // 设置工号
//设置工号 usd.setUserName(personAccount.getJobNumber());
usd.setUserName(personAccount.getJobNumber()); // 创建支持工号登录
//创建支持工号登录 this.updateLoginInfo(oldpersonAccount.getJobNumber(), usd);
this.updateLoginInfo(oldpersonAccount.getJobNumber(),usd); // 查询部门
//查询部门 DepartmentModel departmentModel = null;
DepartmentModel departmentModel = null; if (personAccount.getDepartmentId() != null) {
if (personAccount.getDepartmentId() != null) { departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
departmentModel = this.getdepartmentModel(personAccount.getDepartmentId()); }
} BeanUtils.copyProperties(personUser, personBasic, "qrcodeDesc", "qrcodeColor");
BeanUtils.copyProperties(personUser, personBasic, "qrcodeDesc", "qrcodeColor"); if (departmentModel != null) {
if (departmentModel != null) { // personBasic.setProjectOrgCode(departmentModel.getOrgCode());
//personBasic.setProjectOrgCode(departmentModel.getOrgCode()); personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName()); }
} personBasic.setProjectOrgCode(companyModel.getOrgCode());
personBasic.setProjectOrgCode(companyModel.getOrgCode());
if (personUser.getNativePlace() != null) {
if (personUser.getNativePlace() != null) { personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace())); }
} personAccount.setProjectName(companyModel.getCompanyName());
personAccount.setProjectName(companyModel.getCompanyName());
if (!join.equals(missingCertificateOld)) {
if (!join.equals(missingCertificateOld)) { personBasic.setRecDate(new Date());
personBasic.setRecDate(new Date()); this.personBasicMapper.updateById(personBasic);
this.personBasicMapper.updateById(personBasic); if (("证书不全".equals(personBasic.getQrcodeDesc()) || "证书临期".equals(personBasic.getQrcodeDesc()))) {
if (("证书不全".equals(personBasic.getQrcodeDesc()) || BizMessage bizMessage = new BizMessage();
"证书临期".equals(personBasic.getQrcodeDesc()))) { bizMessage.setIndexKey("RYFM");
BizMessage bizMessage = new BizMessage(); bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
bizMessage.setIndexKey("RYFM"); RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc()); bizMessage.setBizInfo(riskBizInfoVo);
RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join); bizMessage.setDataSource("人员赋码");
bizMessage.setBizInfo(riskBizInfoVo); try {
bizMessage.setDataSource("人员赋码"); emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC,
try { JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false); } catch (MqttException e) {
} catch (MqttException e) { e.printStackTrace();
e.printStackTrace(); }
} } else if ("证书齐全".equals(personBasic.getQrcodeDesc())) {
} else if ("证书齐全".equals(personBasic.getQrcodeDesc())) { HashMap<String, String> personMap = new HashMap<>();
HashMap<String, String> personMap = new HashMap<>(); personMap.put("objectId", String.valueOf(personBasic.getSequenceNbr()));
personMap.put("objectId", String.valueOf(personBasic.getSequenceNbr())); personMap.put("qrCodeColor", qrcodeColorOld);
personMap.put("qrCodeColor", qrcodeColorOld); personMap.put("warningObjectType", "RYFM");
personMap.put("warningObjectType", "RYFM"); personMap.put("sourceAttribution", personBasic.getProjectOrgCode());
personMap.put("sourceAttribution", personBasic.getProjectOrgCode()); personMap.put("sourceAttributionDesc", personAccount.getProjectName());
personMap.put("sourceAttributionDesc", personAccount.getProjectName()); personMap.put("warningSourceType", "人员赋码");
personMap.put("warningSourceType", "人员赋码"); try {
try { emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_GREEN,
emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_GREEN, JSON.toJSONString(personMap).getBytes(StandardCharsets.UTF_8), 2, false); JSON.toJSONString(personMap).getBytes(StandardCharsets.UTF_8), 2, false);
} catch (MqttException e) { } catch (MqttException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
} else { } else {
this.personBasicMapper.updateById(personBasic); this.personBasicMapper.updateById(personBasic);
} }
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH")); StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
if(ObjectUtils.isEmpty(stdUserEmpower)){ .eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
stdUserEmpower = new StdUserEmpower(); if (ObjectUtils.isEmpty(stdUserEmpower)) {
stdUserEmpower.setRecDate(new Date()); stdUserEmpower = new StdUserEmpower();
stdUserEmpower.setPermissionType("YTH"); stdUserEmpower.setRecDate(new Date());
stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission())); stdUserEmpower.setPermissionType("YTH");
stdUserEmpower.setAmosUserId(personAccount.getPuserId()); stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
userEmpowerMapper.insert(stdUserEmpower); stdUserEmpower.setAmosUserId(personAccount.getPuserId());
}else { userEmpowerMapper.insert(stdUserEmpower);
stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission())); } else {
stdUserEmpower.setRecDate(new Date()); stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
userEmpowerMapper.updateById(stdUserEmpower); stdUserEmpower.setRecDate(new Date());
} userEmpowerMapper.updateById(stdUserEmpower);
//户用角色权限 }
// 户用角色权限
StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF"));
if(ObjectUtils.isEmpty(stdUserEmpowerhygf)){ StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
stdUserEmpowerhygf=new StdUserEmpower(); .eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF"));
List<CompanyModel> co= userEmpowerMapper.getCompanyBoList("region",null,null); if (ObjectUtils.isEmpty(stdUserEmpowerhygf)) {
List<String> re= personAccount.getRegionalCompaniesSeq(); stdUserEmpowerhygf = new StdUserEmpower();
String flag=personAccount.getRegionalCompaniesSeqFlag(); List<CompanyModel> co = userEmpowerMapper.getCompanyBoList("region", null, null);
if(flag!=null&&!flag.isEmpty()){ List<String> re = personAccount.getRegionalCompaniesSeq();
if(flag.equals("all")){ String flag = personAccount.getRegionalCompaniesSeqFlag();
List<String> all=new ArrayList<>(); if (flag != null && !flag.isEmpty()) {
all.add("all"); if (flag.equals("all")) {
stdUserEmpowerhygf.setAmosOrgCode(all); List<String> all = new ArrayList<>();
}else{ all.add("all");
stdUserEmpowerhygf.setAmosOrgCode(re); stdUserEmpowerhygf.setAmosOrgCode(all);
} } else {
} stdUserEmpowerhygf.setAmosOrgCode(re);
List<String> exre= personAccount.getExternalRegionalCompaniesSeq(); }
}
List<String> exre = personAccount.getExternalRegionalCompaniesSeq();
// if(exre!=null&&!exre.isEmpty()){ // if(exre!=null&&!exre.isEmpty()){
// List<String> pexre=new ArrayList<>(); // List<String> pexre=new ArrayList<>();
// List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList()); // List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList());
...@@ -680,27 +676,27 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -680,27 +676,27 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
// } // }
// stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre); // stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre);
// } // }
stdUserEmpowerhygf.setEliminateAmosOrgCode(exre); stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
stdUserEmpowerhygf.setPermissionType("HYGF"); stdUserEmpowerhygf.setPermissionType("HYGF");
stdUserEmpowerhygf.setRecDate(new Date()); stdUserEmpowerhygf.setRecDate(new Date());
stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId()); stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
userEmpowerMapper.insert(stdUserEmpowerhygf); userEmpowerMapper.insert(stdUserEmpowerhygf);
}else { } else {
// List<CompanyModel> co= userEmpowerMapper.getCompanyBoList("region",null,null); // List<CompanyModel> co= userEmpowerMapper.getCompanyBoList("region",null,null);
List<String> re= personAccount.getRegionalCompaniesSeq(); List<String> re = personAccount.getRegionalCompaniesSeq();
String flag=personAccount.getRegionalCompaniesSeqFlag(); String flag = personAccount.getRegionalCompaniesSeqFlag();
if(flag!=null&&!flag.isEmpty()){ if (flag != null && !flag.isEmpty()) {
if(flag.equals("all")){ if (flag.equals("all")) {
List<String> all=new ArrayList<>(); List<String> all = new ArrayList<>();
all.add("all"); all.add("all");
stdUserEmpowerhygf.setAmosOrgCode(all); stdUserEmpowerhygf.setAmosOrgCode(all);
}else{ } else {
stdUserEmpowerhygf.setAmosOrgCode(re); stdUserEmpowerhygf.setAmosOrgCode(re);
} }
}else{ } else {
stdUserEmpowerhygf.setAmosOrgCode(re); stdUserEmpowerhygf.setAmosOrgCode(re);
} }
List<String> exre= personAccount.getExternalRegionalCompaniesSeq(); List<String> exre = personAccount.getExternalRegionalCompaniesSeq();
// if(exre!=null&&!exre.isEmpty()){ // if(exre!=null&&!exre.isEmpty()){
// List<String> pexre=new ArrayList<>(); // List<String> pexre=new ArrayList<>();
// List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList()); // List<CompanyModel> exreco = co.stream().filter(product -> !"area".equals(product.getLevel())).collect(Collectors.toList());
...@@ -711,260 +707,268 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -711,260 +707,268 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
// } // }
// stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre); // stdUserEmpowerhygf.setEliminateAmosOrgCode(pexre);
// } // }
stdUserEmpowerhygf.setEliminateAmosOrgCode(exre); stdUserEmpowerhygf.setEliminateAmosOrgCode(exre);
stdUserEmpowerhygf.setPermissionType("HYGF"); stdUserEmpowerhygf.setPermissionType("HYGF");
stdUserEmpowerhygf.setRecDate(new Date()); stdUserEmpowerhygf.setRecDate(new Date());
stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId()); stdUserEmpowerhygf.setAmosUserId(personAccount.getPuserId());
userEmpowerMapper.updateById(stdUserEmpowerhygf); userEmpowerMapper.updateById(stdUserEmpowerhygf);
} }
personAccountService.updateById(personAccount); personAccountService.updateById(personAccount);
PersonAccountFed personAccountFed = new PersonAccountFed(); PersonAccountFed personAccountFed = new PersonAccountFed();
BeanUtils.copyProperties(personAccount, personAccountFed); BeanUtils.copyProperties(personAccount, personAccountFed);
personAccountFed.setSyncState(1); personAccountFed.setSyncState(1);
personAccountFed.setSyncDate(new Date()); personAccountFed.setSyncDate(new Date());
personAccountFedMapper.updateById(personAccountFed); personAccountFedMapper.updateById(personAccountFed);
Map<String, Object> data=new HashMap<>(); Map<String, Object> data = new HashMap<>();
data.put("SEQUENCE_NBR",agencyUserModel.getSequenceNbr()); data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
ProduceMsg produceMsg= new ProduceMsg(data, UPDATE,agencyUserModel.getUserId()); ProduceMsg produceMsg = new ProduceMsg(data, UPDATE, agencyUserModel.getUserId());
querueProduce.produceMsg(JSON.toJSONString(produceMsg)); querueProduce.produceMsg(JSON.toJSONString(produceMsg));
return model; return model;
} }
@Transactional @Transactional
public PersonDto getPerson(Long sequenceNbr,String type) { public PersonDto getPerson(Long sequenceNbr, String type) {
PersonDto personDto = new PersonDto(); PersonDto personDto = new PersonDto();
PersonUser personUser = new PersonUser(); PersonUser personUser = new PersonUser();
QueryWrapper<PersonBasic> wrapper1 = new QueryWrapper(); QueryWrapper<PersonBasic> wrapper1 = new QueryWrapper();
wrapper1.eq("sequence_nbr", sequenceNbr); wrapper1.eq("sequence_nbr", sequenceNbr);
wrapper1.eq("is_delete", 0); wrapper1.eq("is_delete", 0);
//人员基础信息 // 人员基础信息
PersonBasic personBasic = this.getOne(wrapper1); PersonBasic personBasic = this.getOne(wrapper1);
BeanUtils.copyProperties(personBasic, personUser); BeanUtils.copyProperties(personBasic, personUser);
//人员技能学历信息 // 人员技能学历信息
QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper(); QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper();
wrapper2.eq("person_id", sequenceNbr); wrapper2.eq("person_id", sequenceNbr);
PersonSkillEducation personSkillEducation = personSkillEducationService.getOne(wrapper2); PersonSkillEducation personSkillEducation = personSkillEducationService.getOne(wrapper2);
BeanUtils.copyProperties(personSkillEducation, personUser); BeanUtils.copyProperties(personSkillEducation, personUser);
//人员资质信息 // 人员资质信息
LambdaQueryWrapper<PersonCertificate> personCertificateLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonCertificate> personCertificateLambdaQueryWrapper = new LambdaQueryWrapper<>();
personCertificateLambdaQueryWrapper.eq(PersonCertificate::getPersonId, sequenceNbr); personCertificateLambdaQueryWrapper.eq(PersonCertificate::getPersonId, sequenceNbr);
List<PersonCertificate> list = personCertificateService.list(personCertificateLambdaQueryWrapper); List<PersonCertificate> list = personCertificateService.list(personCertificateLambdaQueryWrapper);
CertificationInfo certificationInfo = new CertificationInfo(); CertificationInfo certificationInfo = new CertificationInfo();
certificationInfo.setCertificationInfo(list); certificationInfo.setCertificationInfo(list);
QueryWrapper<PersonAccount> wrapper4 = new QueryWrapper(); QueryWrapper<PersonAccount> wrapper4 = new QueryWrapper();
wrapper4.eq("person_id", sequenceNbr); wrapper4.eq("person_id", sequenceNbr);
//人员账号信息 // 人员账号信息
PersonAccount personAccount = personAccountService.getOne(wrapper4); PersonAccount personAccount = personAccountService.getOne(wrapper4);
personAccount.setPhoneNum(personBasic.getPhone()); personAccount.setPhoneNum(personBasic.getPhone());
//对于密码进行解密 // 对于密码进行解密
if("look".equals(type)){ if ("look".equals(type)) {
personAccount.setIdNumber(DesensitizedUtil.idCardNum(personAccount.getIdNumber(),0,4)); personAccount.setIdNumber(DesensitizedUtil.idCardNum(personAccount.getIdNumber(), 0, 4));
}else{ } else {
personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey)); personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey)); personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey));
} }
if (personBasic.getNativePlace() != null) { if (personBasic.getNativePlace() != null) {
personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class)); personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
} }
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH")); StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
if(!ObjectUtils.isEmpty(stdUserEmpower)){ .eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
personAccount.setYthPermission(stdUserEmpower.getAmosOrgCode().get(0)); if (!ObjectUtils.isEmpty(stdUserEmpower)) {
} personAccount.setYthPermission(stdUserEmpower.getAmosOrgCode().get(0));
}
StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>()
StdUserEmpower stdUserEmpowerhygf = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF")); .eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "HYGF"));
if(!ObjectUtils.isEmpty(stdUserEmpowerhygf)){ if (!ObjectUtils.isEmpty(stdUserEmpowerhygf)) {
if(stdUserEmpowerhygf.getAmosOrgCode()==null||stdUserEmpowerhygf.getAmosOrgCode().size()==0){ if (stdUserEmpowerhygf.getAmosOrgCode() == null || stdUserEmpowerhygf.getAmosOrgCode().size() == 0) {
// List<String> list2 = new ArrayList<>(); // List<String> list2 = new ArrayList<>();
// list2.add("all"); // list2.add("all");
personAccount.setRegionalCompaniesSeq(null); personAccount.setRegionalCompaniesSeq(null);
}else if(stdUserEmpowerhygf.getAmosOrgCode().size()==1&&stdUserEmpowerhygf.getAmosOrgCode().get(0).equals("all")){ } else if (stdUserEmpowerhygf.getAmosOrgCode().size() == 1
&& stdUserEmpowerhygf.getAmosOrgCode().get(0).equals("all")) {
personAccount.setRegionalCompaniesSeqFlag("all"); personAccount.setRegionalCompaniesSeqFlag("all");
personAccount.setRegionalCompaniesSeq(null); personAccount.setRegionalCompaniesSeq(null);
}else{ } else {
personAccount.setRegionalCompaniesSeqFlag("no"); personAccount.setRegionalCompaniesSeqFlag("no");
personAccount.setRegionalCompaniesSeq(stdUserEmpowerhygf.getAmosOrgCode()); personAccount.setRegionalCompaniesSeq(stdUserEmpowerhygf.getAmosOrgCode());
} }
personAccount.setExternalRegionalCompaniesSeq(stdUserEmpowerhygf.getEliminateAmosOrgCode()); personAccount.setExternalRegionalCompaniesSeq(stdUserEmpowerhygf.getEliminateAmosOrgCode());
} }
personDto.setPersonUser(personUser); personDto.setPersonUser(personUser);
personDto.setPersonCertificate(certificationInfo); personDto.setPersonCertificate(certificationInfo);
personDto.setPersonAccount(personAccount); personDto.setPersonAccount(personAccount);
return personDto; return personDto;
} }
@Transactional @Transactional
public int deletePerson(String[] ids) { public int deletePerson(String[] ids) {
//查询所有平台用户 // 查询所有平台用户
QueryWrapper<PersonAccount> wrapper = new QueryWrapper(); QueryWrapper<PersonAccount> wrapper = new QueryWrapper();
wrapper.in("person_id", ids); wrapper.in("person_id", ids);
List<PersonAccount> list = personAccountService.list(wrapper); List<PersonAccount> list = personAccountService.list(wrapper);
List<String> userid = new ArrayList<>(); List<String> userid = new ArrayList<>();
// List<String> loginId = new ArrayList<>(); // List<String> loginId = new ArrayList<>();
for (PersonAccount personAccount : list) { for (PersonAccount personAccount : list) {
userid.add(personAccount.getPuserId()); userid.add(personAccount.getPuserId());
// loginId.add(personAccount.getJobNumber()); // loginId.add(personAccount.getJobNumber());
} }
//删除平台 // 删除平台
int deleteResult = personBasicMapper.deleteList(ids); int deleteResult = personBasicMapper.deleteList(ids);
this.deleuser(String.join(",", userid)); this.deleuser(String.join(",", userid));
//// this.deleteLoginInfo(String.join(",", loginId)); //// this.deleteLoginInfo(String.join(",", loginId));
// this.deleteLoginInfo(loginId.get(1)); // this.deleteLoginInfo(loginId.get(1));
QueryWrapper<PersonAccountFed> wrapper1 = new QueryWrapper(); QueryWrapper<PersonAccountFed> wrapper1 = new QueryWrapper();
wrapper1.in("person_id",ids); wrapper1.in("person_id", ids);
personAccountFedMapper.delete(wrapper1); personAccountFedMapper.delete(wrapper1);
userEmpowerMapper.delete(new QueryWrapper<StdUserEmpower>().in("amos_user_id", userid).eq("permission_type", "YTH")); userEmpowerMapper
return deleteResult; .delete(new QueryWrapper<StdUserEmpower>().in("amos_user_id", userid).eq("permission_type", "YTH"));
} return deleteResult;
}
//新增平台用户
private AgencyUserModel setcreateUser(AgencyUserModel userDto) { // 新增平台用户
FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.create(userDto); private AgencyUserModel setcreateUser(AgencyUserModel userDto) {
FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.create(userDto);
AgencyUserModel user = new AgencyUserModel();
AgencyUserModel user = new AgencyUserModel();
if (!ObjectUtils.isEmpty(amosUser)) {
if (amosUser.getStatus() == 200) { if (!ObjectUtils.isEmpty(amosUser)) {
user = amosUser.getResult(); if (amosUser.getStatus() == 200) {
} else { user = amosUser.getResult();
throw new RuntimeException(amosUser.getMessage()); } else {
} throw new RuntimeException(amosUser.getMessage());
} }
return user; }
} return user;
private LoginInfoModel createLoginInfo(AgencyUserModel userDto) { }
FeignClientResult<LoginInfoModel> amosLoginfo = null;
try { private LoginInfoModel createLoginInfo(AgencyUserModel userDto) {
amosLoginfo = Privilege.agencyUserClient.createLoginInfo(userDto); FeignClientResult<LoginInfoModel> amosLoginfo = null;
} catch (Exception e) { try {
FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userDto.getUserId(),true); amosLoginfo = Privilege.agencyUserClient.createLoginInfo(userDto);
throw new RuntimeException(e); } catch (Exception e) {
} FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userDto.getUserId(),
return amosLoginfo.getResult(); true);
} throw new RuntimeException(e);
}
//修改平台用户 return amosLoginfo.getResult();
private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) { }
FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.update(userDto, userId);
FeignClientResult<AgencyUserModel> amosUser1 = Privilege.agencyUserClient.modifyPassword(userId,userDto); // 修改平台用户
AgencyUserModel user = new AgencyUserModel(); private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) {
if (!ObjectUtils.isEmpty(amosUser)) { FeignClientResult<AgencyUserModel> amosUser = null;
if (amosUser.getStatus() == 200) { FeignClientResult<AgencyUserModel> amosUser1 = null;
user = amosUser.getResult(); try {
} else { amosUser = Privilege.agencyUserClient.update(userDto, userId);
throw new RuntimeException(amosUser.getMessage()); amosUser1 = Privilege.agencyUserClient.modifyPassword(userId, userDto);
} } catch (Exception e) {
} e.printStackTrace();
if (!ObjectUtils.isEmpty(amosUser1)) { }
if (amosUser1.getStatus() == 200) {
user = amosUser1.getResult(); AgencyUserModel user = new AgencyUserModel();
} else { if (!ObjectUtils.isEmpty(amosUser)) {
throw new RuntimeException(amosUser1.getMessage()); if (amosUser.getStatus() == 200) {
} user = amosUser.getResult();
} } else {
return user; throw new RuntimeException(amosUser.getMessage());
} }
private LoginInfoModel updateLoginInfo(String loginId,AgencyUserModel userDto) { }
FeignClientResult<LoginInfoModel> amosLoginfo = null; if (!ObjectUtils.isEmpty(amosUser1)) {
try { if (amosUser1.getStatus() == 200) {
amosLoginfo = Privilege.agencyUserClient.updateLoginInfo(userDto,loginId); user = amosUser1.getResult();
//amosLoginfo = agencyuserFeign.updateLoginInfo(userDto, loginId); } else {
} catch (Exception e) { throw new RuntimeException(amosUser1.getMessage());
throw new RuntimeException(e); }
} }
return amosLoginfo.getResult(); return user;
} }
private DepartmentModel getdepartmentModel(Long departmentId) {
FeignClientResult<DepartmentModel> de = Privilege.departmentClient.seleteOne(departmentId); private LoginInfoModel updateLoginInfo(String loginId, AgencyUserModel userDto) {
FeignClientResult<LoginInfoModel> amosLoginfo = null;
DepartmentModel departmentModel = new DepartmentModel(); try {
amosLoginfo = Privilege.agencyUserClient.updateLoginInfo(userDto, loginId);
if (!ObjectUtils.isEmpty(de)) { // amosLoginfo = agencyuserFeign.updateLoginInfo(userDto, loginId);
if (de.getStatus() == 200) { } catch (Exception e) {
departmentModel = de.getResult(); throw new RuntimeException(e);
} else { }
throw new RuntimeException(de.getMessage()); return amosLoginfo.getResult();
} }
}
return departmentModel; private DepartmentModel getdepartmentModel(Long departmentId) {
} FeignClientResult<DepartmentModel> de = Privilege.departmentClient.seleteOne(departmentId);
public CompanyModel getCompanyModel(Long projectId) { DepartmentModel departmentModel = new DepartmentModel();
FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
CompanyModel companyModel = new CompanyModel(); if (!ObjectUtils.isEmpty(de)) {
if (de.getStatus() == 200) {
if (!ObjectUtils.isEmpty(cResult)) { departmentModel = de.getResult();
if (cResult.getStatus() == 200) { } else {
companyModel = cResult.getResult(); throw new RuntimeException(de.getMessage());
} else { }
throw new RuntimeException(cResult.getMessage()); }
} return departmentModel;
} }
return companyModel;
} public CompanyModel getCompanyModel(Long projectId) {
FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
private void deleuser(String userid) { CompanyModel companyModel = new CompanyModel();
FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userid,true);
if (!ObjectUtils.isEmpty(cResult)) {
if (!ObjectUtils.isEmpty(cResult)) { if (cResult.getStatus() == 200) {
if (cResult.getStatus() != 200) { companyModel = cResult.getResult();
throw new RuntimeException(cResult.getMessage()); } else {
} throw new RuntimeException(cResult.getMessage());
} }
} }
return companyModel;
private String deleteLoginInfo(String loginId) { }
FeignClientResult<String> amosLoginfo = null;
try { private void deleuser(String userid) {
amosLoginfo = Privilege.agencyUserClient.deleteLoginInfo(loginId); FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userid, true);
} catch (Exception e) {
throw new RuntimeException(e); if (!ObjectUtils.isEmpty(cResult)) {
} if (cResult.getStatus() != 200) {
return amosLoginfo.getResult(); throw new RuntimeException(cResult.getMessage());
} }
/** }
* 分页查询 }
*/
public Page<UserMapperDto> queryPage(Page<UserMapperDto> page, private String deleteLoginInfo(String loginId) {
String name, FeignClientResult<String> amosLoginfo = null;
String accountName, try {
String projectName, String orgCode) { amosLoginfo = Privilege.agencyUserClient.deleteLoginInfo(loginId);
} catch (Exception e) {
List<UserMapperDto> list = personBasicMapper.queryPage((page.getCurrent() - 1) * page.getSize(), page.getSize(), name, throw new RuntimeException(e);
accountName, }
projectName, orgCode); return amosLoginfo.getResult();
List<UserMapperDto> listcount = personBasicMapper.queryPagecount(name, }
accountName,
projectName, orgCode); /**
page.setTotal(listcount.size()); * 分页查询
page.setRecords(list); */
return page; public Page<UserMapperDto> queryPage(Page<UserMapperDto> page, String name, String accountName, String projectName,
} String orgCode) {
public List<Map<String, Object>> getPersonYardStatistics(String parentCode) { List<UserMapperDto> list = personBasicMapper.queryPage((page.getCurrent() - 1) * page.getSize(), page.getSize(),
List<Map<String, Object>> resultList = personBasicMapper.getPersonYardStatistics(parentCode); name, accountName, projectName, orgCode);
resultList.forEach(item -> { List<UserMapperDto> listcount = personBasicMapper.queryPagecount(name, accountName, projectName, orgCode);
String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor"))); page.setTotal(listcount.size());
item.put("name", name); page.setRecords(list);
item.put("value", Integer.parseInt(item.get("value").toString())); return page;
}); }
return resultList;
} public List<Map<String, Object>> getPersonYardStatistics(String parentCode) {
List<Map<String, Object>> resultList = personBasicMapper.getPersonYardStatistics(parentCode);
resultList.forEach(item -> {
String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
item.put("name", name);
item.put("value", Integer.parseInt(item.get("value").toString()));
});
return resultList;
}
// public Page<Map<String, Object>> getPersonYardByPage(String parentCode, // public Page<Map<String, Object>> getPersonYardByPage(String parentCode,
// Integer current, // Integer current,
......
amos-boot-system-jxiop/amos-boot-module-jxiop-das/pom.xml
View file @ def1b30d
...@@ -15,22 +15,6 @@ ...@@ -15,22 +15,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<!--
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-ugp-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.amosframework.boot</groupId>-->
<!-- <artifactId>amos-boot-module-common-biz</artifactId>-->
<!-- <version>${amos-biz-boot.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.amosframework.boot</groupId>-->
<!-- <artifactId>amos-boot-biz-common</artifactId>-->
<!-- <version>1.0.0</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId> <artifactId>druid-spring-boot-starter</artifactId>
...@@ -39,6 +23,7 @@ ...@@ -39,6 +23,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
<version>2.1.6.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -66,6 +51,11 @@ ...@@ -66,6 +51,11 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.47</version> <version>1.2.47</version>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.16</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-das/src/main/java/com/yeejoin/amos/AmosJxiopDasApplication.java
View file @ def1b30d
...@@ -31,7 +31,7 @@ import java.net.InetAddress; ...@@ -31,7 +31,7 @@ import java.net.InetAddress;
@EnableAsync @EnableAsync
@EnableScheduling @EnableScheduling
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class}) @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class})
@MapperScan({"com.yeejoin.amos.boot.module.das.mapper.msyql","com.yeejoin.amos.boot.module.das.mapper.tdengineanalysis","com.yeejoin.amos.boot.module.das.mapper.tdengineiot"}) @MapperScan({"com.yeejoin.amos.boot.module.das.mapper.msyql","com.yeejoin.amos.boot.module.das.mapper.analysis","com.yeejoin.amos.boot.module.das.mapper.iot"})
@ComponentScan({"springfox.documentation.schema", "com.yeejoin.amos.boot.module.das","com.yeejoin.amos.boot.module.das.service.impl","org.typroject.tyboot.component"}) @ComponentScan({"springfox.documentation.schema", "com.yeejoin.amos.boot.module.das","com.yeejoin.amos.boot.module.das.service.impl","org.typroject.tyboot.component"})
public class AmosJxiopDasApplication { public class AmosJxiopDasApplication {
......
amos-boot-system-jxiop/amos-boot-module-jxiop-das/src/main/java/com/yeejoin/amos/boot/module/das/entity/analysis/IndicatorData.java
View file @ def1b30d
...@@ -16,9 +16,11 @@ public class IndicatorData { ...@@ -16,9 +16,11 @@ public class IndicatorData {
private Date createdTime; private Date createdTime;
private String gatewayId; private String gatewayId;
private String dataType; private String dataType;
private String dasTime;
private String pointSeq; private String pointSeq;
private String pointAddress; private String pointAddress;
private String pointLocation; private String pointLocation;
private String pointType;
private String pointName; private String pointName;
private String value="0"; private String value="0";
private Double valueF; private Double valueF;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-das/src/main/java/com/yeejoin/amos/boot/module/das/mapper/analysis/IndicatorDataMapper.java
View file @ def1b30d
...@@ -8,6 +8,6 @@ import java.util.List; ...@@ -8,6 +8,6 @@ import java.util.List;
@Component @Component
public interface IndicatorDataMapper { public interface IndicatorDataMapper {
int insertBatch(@Param("list") List<IndicatorData> list, @Param("gatewayId")String gatewayId); int insertBatch(@Param("list") List<IndicatorData> list, @Param("gatewayId")String gatewayId,@Param("dasTime")String dasTime);
void createTable(); void createTable();
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-das/src/main/java/com/yeejoin/amos/boot/module/das/mapper/mysql/FrontGatewayDevicePointsMapper.java
View file @ def1b30d
...@@ -8,6 +8,6 @@ import java.util.List; ...@@ -8,6 +8,6 @@ import java.util.List;
public interface FrontGatewayDevicePointsMapper extends BaseMapper<FrontGatewayDevicePoints> { public interface FrontGatewayDevicePointsMapper extends BaseMapper<FrontGatewayDevicePoints> {
@Select("select distinct gateway_id from iot_front_gateway_device_points") @Select("select distinct gateway_id from iot_front_gateway_device_points")
List<String> getGatewayIds(); List<String> getGatewayIds();
@Select("select SEQUENCE_NBR,POINT_NAME,POINT_DATA_TYPE,POINT_ADDRESS,POINT_LOCATION from iot_front_gateway_device_points where gateway_id = #{gatewayId}") @Select("select SEQUENCE_NBR,POINT_NAME,POINT_DATA_TYPE,POINT_ADDRESS,POINT_LOCATION,POINT_TYPE,DATA_TYPE from iot_front_gateway_device_points where gateway_id = #{gatewayId}")
List<FrontGatewayDevicePoints> getFrontGatewayDevicePointsByGatewayId(String gatewayId); List<FrontGatewayDevicePoints> getFrontGatewayDevicePointsByGatewayId(String gatewayId);
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-das/src/main/java/com/yeejoin/amos/boot/module/das/service/impl/DasServiceImpl.java
View file @ def1b30d
package com.yeejoin.amos.boot.module.das.service.impl; package com.yeejoin.amos.boot.module.das.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
...@@ -18,6 +19,7 @@ import org.springframework.scheduling.annotation.Scheduled; ...@@ -18,6 +19,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper; import org.typroject.tyboot.component.emq.EmqKeeper;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -41,16 +43,17 @@ public class DasServiceImpl implements DasService { ...@@ -41,16 +43,17 @@ public class DasServiceImpl implements DasService {
* 完成后，会记录此次操作所花费的时间。 * 完成后，会记录此次操作所花费的时间。
*/ */
public void dataSolidification() { public void dataSolidification() {
String dasTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:00");
log.info("数据采集开始执行-采集时间：：" + dasTime );
// 记录操作开始时间 // 记录操作开始时间
Long startTime = System.currentTimeMillis(); Long startTime = System.currentTimeMillis();
// 创建新表 // 创建新表
indicatorDataMapper.createTable(); indicatorDataMapper.createTable();
// 获取所有网关ID // 获取所有网关ID
List<String> gateWayIds = frontGatewayDevicePointsMapper.getGatewayIds(); List<String> gateWayIds = frontGatewayDevicePointsMapper.getGatewayIds();
// 并行处理每个网关ID的数据凝固 // 并行处理每个网关ID的数据凝固
gateWayIds.parallelStream().forEach(gatewayId -> { gateWayIds.parallelStream().forEach(gatewayId -> {
dataSolidificationByGatewayId(gatewayId); dataSolidificationByGatewayId(gatewayId,dasTime);
}); });
// 记录操作结束时间 // 记录操作结束时间
Long endTime = System.currentTimeMillis(); Long endTime = System.currentTimeMillis();
...@@ -66,7 +69,7 @@ public class DasServiceImpl implements DasService { ...@@ -66,7 +69,7 @@ public class DasServiceImpl implements DasService {
* @param gatewayId 网关的唯一标识符，用于查询相关设备点信息和数据点值。 * @param gatewayId 网关的唯一标识符，用于查询相关设备点信息和数据点值。
*/ */
@Async("jxiopAsyncExecutor") @Async("jxiopAsyncExecutor")
public void dataSolidificationByGatewayId(String gatewayId) { public void dataSolidificationByGatewayId(String gatewayId,String dasTime) {
// 根据网关ID查询设备点信息 // 根据网关ID查询设备点信息
List<FrontGatewayDevicePoints> tempPoints = frontGatewayDevicePointsMapper.getFrontGatewayDevicePointsByGatewayId(gatewayId); List<FrontGatewayDevicePoints> tempPoints = frontGatewayDevicePointsMapper.getFrontGatewayDevicePointsByGatewayId(gatewayId);
if (!ObjectUtils.isEmpty(tempPoints)) { if (!ObjectUtils.isEmpty(tempPoints)) {
...@@ -90,6 +93,7 @@ public class DasServiceImpl implements DasService { ...@@ -90,6 +93,7 @@ public class DasServiceImpl implements DasService {
indicatorData.setPointAddress(point.getPointAddress()); indicatorData.setPointAddress(point.getPointAddress());
indicatorData.setPointLocation(point.getPointLocation()); indicatorData.setPointLocation(point.getPointLocation());
indicatorData.setPointName(point.getPointName()); indicatorData.setPointName(point.getPointName());
indicatorData.setPointType(point.getPointType());
// 设置数据点的值，如果是布尔值则进行转换 // 设置数据点的值，如果是布尔值则进行转换
indicatorData.setValue(stbMap.get(point.getSequenceNbr().toString())); indicatorData.setValue(stbMap.get(point.getSequenceNbr().toString()));
if (!ObjectUtils.isEmpty(indicatorData.getValue()) && !booleans.contains(indicatorData.getValue())) { if (!ObjectUtils.isEmpty(indicatorData.getValue()) && !booleans.contains(indicatorData.getValue())) {
...@@ -104,10 +108,9 @@ public class DasServiceImpl implements DasService { ...@@ -104,10 +108,9 @@ public class DasServiceImpl implements DasService {
// 批量插入构建的数据模型到数据库 // 批量插入构建的数据模型到数据库
Lists.partition(listAll, 1000).stream().forEach( Lists.partition(listAll, 1000).stream().forEach(
list -> { list -> {
indicatorDataMapper.insertBatch(list, gatewayId); indicatorDataMapper.insertBatch(list, gatewayId,dasTime);
} }
); );
// 向EMQX发送消息，通知数据同步成功 // 向EMQX发送消息，通知数据同步成功
try { try {
HashMap<String, String> syncFlag = new HashMap<>(); HashMap<String, String> syncFlag = new HashMap<>();
......
amos-boot-system-jxiop/amos-boot-module-jxiop-das/src/main/resources/application-dev.properties
View file @ def1b30d
...@@ -31,6 +31,8 @@ spring.redis.password=yeejoin@2020 ...@@ -31,6 +31,8 @@ spring.redis.password=yeejoin@2020
emqx.clean-session=true emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]} emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://10.20.1.210:2883 emqx.broker=tcp://10.20.1.210:2883
emqx.client-user-name=admin
emqx.client-password=public
emqx.user-name=admin emqx.user-name=admin
emqx.password=public emqx.password=public
mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
......
amos-boot-system-jxiop/amos-boot-module-jxiop-das/src/main/resources/mapper/analysis/IndicatorDataMapper.xml
View file @ def1b30d
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
<update id="createTable"> <update id="createTable">
create STABLE if not exists indicator_data create STABLE if not exists indicator_data
(created_time timestamp, (created_time timestamp,
das_time VARCHAR(100),
data_type NCHAR(12), data_type NCHAR(12),
point_seq VARCHAR(100) , point_seq VARCHAR(100) ,
point_address VARCHAR(100) , point_address VARCHAR(100) ,
point_location VARCHAR(500) , point_location VARCHAR(500) ,
point_name VARCHAR(200), point_name VARCHAR(200),
point_type VARCHAR(50),
`value` VARCHAR(50), `value` VARCHAR(50),
`value_f` float) `value_f` float)
TAGS (gateway_id binary(64)); TAGS (gateway_id binary(64));
...@@ -24,11 +26,13 @@ ...@@ -24,11 +26,13 @@
indicator_data_#{gatewayId,jdbcType=VARCHAR} USING indicator_data indicator_data_#{gatewayId,jdbcType=VARCHAR} USING indicator_data
TAGS (#{gatewayId,jdbcType=VARCHAR}) TAGS (#{gatewayId,jdbcType=VARCHAR})
VALUES (NOW + #{index}a, VALUES (NOW + #{index}a,
#{dasTime,jdbcType=VARCHAR},
#{item.dataType,jdbcType=VARCHAR}, #{item.dataType,jdbcType=VARCHAR},
#{item.pointSeq,jdbcType=VARCHAR}, #{item.pointSeq,jdbcType=VARCHAR},
#{item.pointAddress,jdbcType=VARCHAR}, #{item.pointAddress,jdbcType=VARCHAR},
#{item.pointLocation,jdbcType=VARCHAR}, #{item.pointLocation,jdbcType=VARCHAR},
#{item.pointName,jdbcType=VARCHAR}, #{item.pointName,jdbcType=VARCHAR},
#{item.pointType,jdbcType=VARCHAR},
#{item.value,jdbcType=VARCHAR}, #{item.value,jdbcType=VARCHAR},
#{item.valueF,jdbcType=FLOAT}) #{item.valueF,jdbcType=FLOAT})
</foreach> </foreach>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/StationCacheInfoDto.java
View file @ def1b30d
...@@ -21,7 +21,7 @@ public class StationCacheInfoDto implements Serializable { ...@@ -21,7 +21,7 @@ public class StationCacheInfoDto implements Serializable {
//所属片区 //所属片区
private String belongArea; private String belongArea;
//装机容量 //装机容量
private String installedCapacity="0.0"; private String installedCapacity;
//设备数量 //设备数量
private String equipmentNumbers; private String equipmentNumbers;
//风机网关 //风机网关
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/CoreCommonService.java
View file @ def1b30d
...@@ -14,7 +14,7 @@ import java.util.stream.Collectors; ...@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
public interface CoreCommonService { public interface CoreCommonService {
/** /**
* @deprecated 远程调用core服务根据厂长名称 * @deprecated 远程调用core服务根据场站名称
* @param stationNames 要查的场站名称需要使用逗号分隔 eg：夏造风机,石灰山风机 * @param stationNames 要查的场站名称需要使用逗号分隔 eg：夏造风机,石灰山风机
* @param pointsNames 要查的测点名称需要使用逗号分隔开 eg:日发电量,月发电量，年发电 * @param pointsNames 要查的测点名称需要使用逗号分隔开 eg:日发电量,月发电量，年发电
* @return CoreValuesDto * @return CoreValuesDto
......
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 @ def1b30d
...@@ -17,7 +17,6 @@ import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto; ...@@ -17,7 +17,6 @@ import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz; import com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz;
import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper; import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESEquipmentsRepository; import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESEquipmentsRepository;
//import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.index.query.*; import org.elasticsearch.index.query.*;
import org.elasticsearch.script.Script; import org.elasticsearch.script.Script;
...@@ -49,8 +48,6 @@ import java.util.stream.Collectors; ...@@ -49,8 +48,6 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class CommonServiceImpl { public class CommonServiceImpl {
// @Autowired
// InfluxdbUtil influxdbUtil;
@Autowired @Autowired
SjglZsjZsbtzMapper sjglZsjZsbtzMapper; SjglZsjZsbtzMapper sjglZsjZsbtzMapper;
@Autowired @Autowired
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CoreCommonServiceImpl.java
View file @ def1b30d
...@@ -28,14 +28,19 @@ public class CoreCommonServiceImpl implements CoreCommonService { ...@@ -28,14 +28,19 @@ public class CoreCommonServiceImpl implements CoreCommonService {
@Override @Override
public List<CoreValuesDto> getValuesByStationNamesAndPointsNames(String stationNames, String pointsNames) { public List<CoreValuesDto> getValuesByStationNamesAndPointsNames(String stationNames, String pointsNames) {
List<CoreValuesDto> result = new ArrayList<>();
try {
FeignClientResult<List<Object>> feignClientResult = coreFeignClient.getValues(stationNames, pointsNames); FeignClientResult<List<Object>> feignClientResult = coreFeignClient.getValues(stationNames, pointsNames);
List<Object> list = feignClientResult.getResult(); List<Object> list = feignClientResult.getResult();
List<CoreValuesDto> result = new ArrayList<>();
list.forEach(o -> { list.forEach(o -> {
CoreValuesDto coreValuesDto = JSONObject.parseObject(JSONObject.toJSONString(o), CoreValuesDto.class); CoreValuesDto coreValuesDto = JSONObject.parseObject(JSONObject.toJSONString(o), CoreValuesDto.class);
coreValuesDto.setDataMap(coreValuesDto.getData().stream().flatMap(m -> m.entrySet().stream()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> b))); coreValuesDto.setDataMap(coreValuesDto.getData().stream().flatMap(m -> m.entrySet().stream()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> b)));
result.add(coreValuesDto); result.add(coreValuesDto);
}); });
}catch (Exception e){
e.printStackTrace();
return new ArrayList<>();
}
return result; return result;
} }
......
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 @ def1b30d
...@@ -254,7 +254,6 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -254,7 +254,6 @@ public class MonitorServiceImpl implements MonitorService {
List<StationCoordinate> stationCoordinateList = stationCoordinateMapper.selectList(new QueryWrapper<StationCoordinate>().isNotNull("station_id").eq("is_main_coordinate", 0)); List<StationCoordinate> stationCoordinateList = stationCoordinateMapper.selectList(new QueryWrapper<StationCoordinate>().isNotNull("station_id").eq("is_main_coordinate", 0));
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
HashMap<String, Double> hashMap = new HashMap<>(); HashMap<String, Double> hashMap = new HashMap<>();
StationCacheInfoDto stationCacheInfoDto = list.get(i); StationCacheInfoDto stationCacheInfoDto = list.get(i);
RegionNationWideDto regionNationWideDto = new RegionNationWideDto(); RegionNationWideDto regionNationWideDto = new RegionNationWideDto();
regionNationWideDto.setStaitionId(String.valueOf(stationCacheInfoDto.getStationId())); regionNationWideDto.setStaitionId(String.valueOf(stationCacheInfoDto.getStationId()));
...@@ -279,7 +278,13 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -279,7 +278,13 @@ public class MonitorServiceImpl implements MonitorService {
speendOrirradiate =String.format(CommonConstans.Twodecimalplaces,buDunStationDetailInfo.getWind_as_irradiance()); speendOrirradiate =String.format(CommonConstans.Twodecimalplaces,buDunStationDetailInfo.getWind_as_irradiance());
} }
} }
BuDunStationDetailInfo buDunStationDetailInfo = buDunStationDetailInfos.stream().filter(buDunStationDetailInfo1 -> buDunStationDetailInfo1.getStation_name().contains(stationCacheInfoDto.getStationName().replace("风电站","").replace("风电场","").replace("光伏电站",""))).findFirst().orElse(null);
if(!ObjectUtils.isEmpty(buDunStationDetailInfo)&&!ObjectUtils.isEmpty(buDunStationDetailInfo.getWind_as_irradiance())){
speendOrirradiate = buDunStationDetailInfo.getWind_as_irradiance().toString();
if(ObjectUtils.isEmpty(regionNationWideDto.getStationCapacity())&&!ObjectUtils.isEmpty(buDunStationDetailInfo.getActual_installed_capacity())){
regionNationWideDto.setStationCapacity(buDunStationDetailInfo.getActual_installed_capacity().toString());
}
}
regionNationWideDto.setSpeendOrirradiate(speendOrirradiate); regionNationWideDto.setSpeendOrirradiate(speendOrirradiate);
StationCoordinate stationCoordinate = stationCoordinateList.stream().filter(stationCoordinate1 -> String.valueOf(stationCoordinate1.getStationId()).equals(stationCacheInfoDto.getStationId())).collect(Collectors.toList()).get(0); StationCoordinate stationCoordinate = stationCoordinateList.stream().filter(stationCoordinate1 -> String.valueOf(stationCoordinate1.getStationId()).equals(stationCacheInfoDto.getStationId())).collect(Collectors.toList()).get(0);
hashMap.put("lng", Double.valueOf(stationCoordinate.getLongitude())); hashMap.put("lng", Double.valueOf(stationCoordinate.getLongitude()));
...@@ -356,24 +361,25 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -356,24 +361,25 @@ public class MonitorServiceImpl implements MonitorService {
AtomicReference<Double> fdzannualPower = new AtomicReference<>(0.0); AtomicReference<Double> fdzannualPower = new AtomicReference<>(0.0);
AtomicReference<Double> gfzannualPower = new AtomicReference<>(0.0); AtomicReference<Double> gfzannualPower = new AtomicReference<>(0.0);
List<CoreValuesDto> coreValuesDtos = coreCommonService.getValuesByStationNamesAndPointsNames(null, null); List<CoreValuesDto> coreValuesDtos = coreCommonService.getValuesByStationNamesAndPointsNames(null, null);
String requestUrl = Constants.BASE_URL + "?" + Constants.get_province_station_item + "&provinceName" + provinceName; String requestUrl = Constants.BASE_URL + "?" + Constants.get_province_station_item + "&provinceName=" + provinceName;
List<BuDunStationDetailInfo> buDunStationDetailInfos = httpRequestUtil.getResPonse(requestUrl, Constants.REQUEST_GET, "", Constants.resovleRule_data, BuDunStationDetailInfo.class); List<BuDunStationDetailInfo> buDunStationDetailInfos = httpRequestUtil.getResPonse(requestUrl, Constants.REQUEST_GET, "", Constants.resovleRule_data, BuDunStationDetailInfo.class);
if (buDunStationDetailInfos.size() > 0) { if (buDunStationDetailInfos.size() > 0) {
buDunStationDetailInfos.forEach(buDunStationDetailInfo -> { buDunStationDetailInfos.forEach(buDunStationDetailInfo -> {
CompletionOfPowerIndicatorsDto completionOfPowerIndicatorsDto = new CompletionOfPowerIndicatorsDto(); CompletionOfPowerIndicatorsDto completionOfPowerIndicatorsDto = new CompletionOfPowerIndicatorsDto();
completionOfPowerIndicatorsDto.setStationName(buDunStationDetailInfo.getStation_name()); completionOfPowerIndicatorsDto.setStationName(buDunStationDetailInfo.getStation_name());
completionOfPowerIndicatorsDto.setInstallCapactity(String.valueOf(buDunStationDetailInfo.getActual_installed_capacity())); completionOfPowerIndicatorsDto.setInstallCapactity(String.valueOf(buDunStationDetailInfo.getActual_installed_capacity()));
completionOfPowerIndicatorsDto.setWindSpeedOrIrradiance(String.format(CommonConstans.Twodecimalplaces, buDunStationDetailInfo.getWind_as_irradiance())); completionOfPowerIndicatorsDto.setWindSpeedOrIrradiance(!ObjectUtils.isEmpty(buDunStationDetailInfo.getWind_as_irradiance())?String.format(CommonConstans.Twodecimalplaces, buDunStationDetailInfo.getWind_as_irradiance()):"--");
completionOfPowerIndicatorsDto.setDailyPower(String.format(CommonConstans.Fourdecimalplaces, buDunStationDetailInfo.getDay())); completionOfPowerIndicatorsDto.setDailyPower(String.format(CommonConstans.Fourdecimalplaces, buDunStationDetailInfo.getDay()));
completionOfPowerIndicatorsDto.setMonthlyPower(String.format(CommonConstans.Fourdecimalplaces, buDunStationDetailInfo.getMonth())); completionOfPowerIndicatorsDto.setMonthlyPower(String.format(CommonConstans.Fourdecimalplaces, buDunStationDetailInfo.getMonth()));
completionOfPowerIndicatorsDto.setAnnualPower(String.format(CommonConstans.Fourdecimalplaces, buDunStationDetailInfo.getYear())); completionOfPowerIndicatorsDto.setAnnualPower(String.format(CommonConstans.Fourdecimalplaces, buDunStationDetailInfo.getYear()));
StationCacheInfoDto stationCacheInfoDto = stationCacheInfoDtoList.stream().filter(stationCacheInfoDto1 -> stationCacheInfoDto1.getStationName().contains(buDunStationDetailInfo.getStation_name().replace("电场","").replace("电站",""))).findFirst().get(); StationCacheInfoDto stationCacheInfoDto = stationCacheInfoDtoList.stream().filter(stationCacheInfoDto1 -> stationCacheInfoDto1.getStationName().contains(buDunStationDetailInfo.getStation_name().replace("电场","").replace("电站","").replace("光伏电站",""))).findFirst().orElse(null);
if (stationCacheInfoDto.getStationCoreName() != null && stationCacheInfoDto.getBoosterCoreName() != null) { if (!ObjectUtils.isEmpty(stationCacheInfoDto)&&stationCacheInfoDto.getStationCoreName() != null && stationCacheInfoDto.getBoosterCoreName() != null) {
List<CoreValuesDto> coreValuesDtoList = coreValuesDtos.stream().filter(coreValuesDto -> coreValuesDto.getName().equals(stationCacheInfoDto.getStationCoreName()) || coreValuesDto.getName().equals(stationCacheInfoDto.getBoosterCoreName())).collect(Collectors.toList()); List<CoreValuesDto> coreValuesDtoList = coreValuesDtos.stream().filter(coreValuesDto -> coreValuesDto.getName().equals(stationCacheInfoDto.getStationCoreName()) || coreValuesDto.getName().equals(stationCacheInfoDto.getBoosterCoreName())).collect(Collectors.toList());
completionOfPowerIndicatorsDto.setActivePower(String.format(CommonConstans.Twodecimalplaces, (coreCommonService.getSumOfByPointName(coreValuesDtoList, CommonConstans.ACTIVE_POWER)))); completionOfPowerIndicatorsDto.setActivePower(String.format(CommonConstans.Twodecimalplaces, (coreCommonService.getSumOfByPointName(coreValuesDtoList, CommonConstans.ACTIVE_POWER))));
}else { }else {
completionOfPowerIndicatorsDto.setActivePower("--"); completionOfPowerIndicatorsDto.setActivePower("--");
} }
completionOfPowerIndicatorsDtoList.add(completionOfPowerIndicatorsDto);
}); });
} }
String provincelUrl = Constants.BASE_URL + "?" + Constants.get_province_item_url + "&provinceName=" + provinceName; String provincelUrl = Constants.BASE_URL + "?" + Constants.get_province_item_url + "&provinceName=" + provinceName;
...@@ -481,7 +487,7 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -481,7 +487,7 @@ public class MonitorServiceImpl implements MonitorService {
String requestUrl = Constants.BASE_URL + "?" + Constants.get_area_item_url; String requestUrl = Constants.BASE_URL + "?" + Constants.get_area_item_url;
if (!ObjectUtils.isEmpty(areaName)) { if (!ObjectUtils.isEmpty(areaName)) {
if (!areaName.contains(Constants.areaChinese)) { if (!areaName.contains(Constants.areaChinese)) {
areaName = Constants.areaChinese; areaName =areaName+ Constants.areaChinese;
} }
requestUrl = requestUrl + "&areaName=" + areaName; requestUrl = requestUrl + "&areaName=" + areaName;
} }
...@@ -573,7 +579,7 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -573,7 +579,7 @@ public class MonitorServiceImpl implements MonitorService {
List<HashMap<String, String>> mapList = new ArrayList<>(); List<HashMap<String, String>> mapList = new ArrayList<>();
String requestUrl = Constants.BASE_URL + "?" + Constants.get_month_top_url + "&topValue=5"; String requestUrl = Constants.BASE_URL + "?" + Constants.get_month_top_url + "&topValue=5";
if (!ObjectUtils.isEmpty(areaName)) { if (!ObjectUtils.isEmpty(areaName)) {
if (areaName.contains(Constants.areaChinese)) { if (!areaName.contains(Constants.areaChinese)) {
areaName = areaName + Constants.areaChinese; areaName = areaName + Constants.areaChinese;
} }
requestUrl = requestUrl + "&areaName=" + areaName; requestUrl = requestUrl + "&areaName=" + areaName;
...@@ -640,7 +646,7 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -640,7 +646,7 @@ public class MonitorServiceImpl implements MonitorService {
List<StationBasic> gfdzlist = new ArrayList<>(); List<StationBasic> gfdzlist = new ArrayList<>();
String requestUrl = Constants.BASE_URL + "?" + Constants.get_hours_num_top + "&topValue=3&tabValue=" + tabValue; String requestUrl = Constants.BASE_URL + "?" + Constants.get_hours_num_top + "&topValue=3&tabValue=" + tabValue;
if (!ObjectUtils.isEmpty(areaName)) { if (!ObjectUtils.isEmpty(areaName)) {
if (areaName.contains(Constants.areaChinese)) { if (!areaName.contains(Constants.areaChinese)) {
areaName = areaName + Constants.areaChinese; areaName = areaName + Constants.areaChinese;
} }
requestUrl = requestUrl + "&areaName=" + areaName; requestUrl = requestUrl + "&areaName=" + areaName;
......
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 @ def1b30d
...@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.netflix.loadbalancer.RetryRule;
import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto; import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
import com.yeejoin.amos.boot.module.jxiop.api.entity.Region; import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic; import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
...@@ -17,11 +16,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationPlanMapper; ...@@ -17,11 +16,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationPlanMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments; import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans; import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.ESEquipmentsDTO; import com.yeejoin.amos.boot.module.jxiop.biz.dto.ESEquipmentsDTO;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto; import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto;
//import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
//import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
import io.swagger.models.auth.In;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
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