Skip to content

A
amos-boot-biz
Commit d1513f1b authored by wujiang's avatar wujiang
Browse files
Options

修改一体化现场问题

parent 043c39de
Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 224 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java
View file @ d1513f1b
...@@ -1666,9 +1666,9 @@ public class CommonServiceImpl { ...@@ -1666,9 +1666,9 @@ public class CommonServiceImpl {
Table healthData = Table.create("healthData"); Table healthData = Table.create("healthData");
healthData.addColumns(DoubleColumn.create("analysisVariable", analysisVariable), DoubleColumn.create("stdDev", stdDev), DoubleColumn.create("centerValue", centerValue), StringColumn.create("ProcessPoint1Id", ProcessPoint1Id), DoubleColumn.create("ProcessPoint1", ProcessPoint1), StringColumn.create("ProcessPoint2Id", ProcessPoint2Id), DoubleColumn.create("ProcessPoint2", ProcessPoint2), StringColumn.create("ProcessPoint3Id", ProcessPoint3Id), DoubleColumn.create("ProcessPoint3", ProcessPoint3), StringColumn.create("analysisVariableId", analysisVariableIds)); healthData.addColumns(DoubleColumn.create("analysisVariable", analysisVariable), DoubleColumn.create("stdDev", stdDev), DoubleColumn.create("centerValue", centerValue), StringColumn.create("ProcessPoint1Id", ProcessPoint1Id), DoubleColumn.create("ProcessPoint1", ProcessPoint1), StringColumn.create("ProcessPoint2Id", ProcessPoint2Id), DoubleColumn.create("ProcessPoint2", ProcessPoint2), StringColumn.create("ProcessPoint3Id", ProcessPoint3Id), DoubleColumn.create("ProcessPoint3", ProcessPoint3), StringColumn.create("analysisVariableId", analysisVariableIds));
logger.info("------------------------------------------开始调用健康指数计算算法开始----------------------------------------"); logger.info("------------------------------------------开始调用风机健康指数计算算法开始----------------------------------------");
logger.info("------------------------------------------调用地址:"+baseUrlZSFX); logger.info("------------------------------------------调用地址:"+baseUrlZSFX);
logger.info("------------------------------------------调用参数:"+JSON.toJSONString(requestMap)); //logger.info("------------------------------------------调用参数:"+JSON.toJSONString(requestMap));
String response = HttpUtil.createPost(baseUrlZSFX).body(JSON.toJSONString(requestMap)).execute().body(); String response = HttpUtil.createPost(baseUrlZSFX).body(JSON.toJSONString(requestMap)).execute().body();
JSONObject jsonObject = JSON.parseObject(response); JSONObject jsonObject = JSON.parseObject(response);
...@@ -1752,7 +1752,7 @@ public class CommonServiceImpl { ...@@ -1752,7 +1752,7 @@ public class CommonServiceImpl {
try { try {
logger.info("--------------------response： " + response); logger.info("--------------------response： " + response);
logger.info("------------------------------------------调用健康指数计算算法结束----------------------------------------"); logger.info("------------------------------------------调用风机健康指数计算算法结束----------------------------------------");
logger.info("------------------------------------------开始计算预警----------------------------------------"); logger.info("------------------------------------------开始计算预警----------------------------------------");
// healthStatusIndicatorService.healthWarningMinute(calendar, time); // healthStatusIndicatorService.healthWarningMinute(calendar, time);
...@@ -1949,9 +1949,9 @@ public class CommonServiceImpl { ...@@ -1949,9 +1949,9 @@ public class CommonServiceImpl {
Table healthData = Table.create("healthData"); Table healthData = Table.create("healthData");
healthData.addColumns(DoubleColumn.create("analysisVariable", analysisVariable), DoubleColumn.create("stdDev", stdDev), DoubleColumn.create("centerValue", centerValue), StringColumn.create("ProcessPoint1Id", ProcessPoint1Id), DoubleColumn.create("ProcessPoint1", ProcessPoint1), StringColumn.create("ProcessPoint2Id", ProcessPoint2Id), DoubleColumn.create("ProcessPoint2", ProcessPoint2), StringColumn.create("ProcessPoint3Id", ProcessPoint3Id), DoubleColumn.create("ProcessPoint3", ProcessPoint3), StringColumn.create("analysisVariableId", analysisVariableIds)); healthData.addColumns(DoubleColumn.create("analysisVariable", analysisVariable), DoubleColumn.create("stdDev", stdDev), DoubleColumn.create("centerValue", centerValue), StringColumn.create("ProcessPoint1Id", ProcessPoint1Id), DoubleColumn.create("ProcessPoint1", ProcessPoint1), StringColumn.create("ProcessPoint2Id", ProcessPoint2Id), DoubleColumn.create("ProcessPoint2", ProcessPoint2), StringColumn.create("ProcessPoint3Id", ProcessPoint3Id), DoubleColumn.create("ProcessPoint3", ProcessPoint3), StringColumn.create("analysisVariableId", analysisVariableIds));
logger.info("------------------------------------------开始调用健康指数计算算法开始----------------------------------------"); logger.info("------------------------------------------开始调用光伏健康指数计算算法开始----------------------------------------");
logger.info("------------------------------------------调用地址:"+baseUrlZSFX); logger.info("------------------------------------------调用地址:"+baseUrlZSFX);
logger.info("------------------------------------------调用参数:"+JSON.toJSONString(requestMap)); //logger.info("------------------------------------------调用参数:"+JSON.toJSONString(requestMap));
String response = HttpUtil.createPost(baseUrlZSFX).body(JSON.toJSONString(requestMap)).execute().body(); String response = HttpUtil.createPost(baseUrlZSFX).body(JSON.toJSONString(requestMap)).execute().body();
JSONObject jsonObject = JSON.parseObject(response); JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.containsKey("indexValue")) { if (jsonObject.containsKey("indexValue")) {
...@@ -2029,7 +2029,7 @@ public class CommonServiceImpl { ...@@ -2029,7 +2029,7 @@ public class CommonServiceImpl {
} }
try { try {
logger.info("--------------------response： " + response); logger.info("--------------------response： " + response);
logger.info("------------------------------------------调用健康指数计算算法结束----------------------------------------"); logger.info("------------------------------------------调用光伏健康指数计算算法结束----------------------------------------");
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/pom.xml
View file @ d1513f1b
...@@ -15,11 +15,12 @@ ...@@ -15,11 +15,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<!--
<dependency> <dependency>
<groupId>com.amosframework.boot</groupId> <groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-ugp-api</artifactId> <artifactId>amos-boot-module-ugp-api</artifactId>
<version>${amos-biz-boot.version}</version> <version>${amos-biz-boot.version}</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>com.amosframework.boot</groupId> <groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId> <artifactId>amos-boot-module-common-biz</artifactId>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java
View file @ d1513f1b
...@@ -13,5 +13,6 @@ import java.util.Map; ...@@ -13,5 +13,6 @@ import java.util.Map;
* @createDate: 2023/11/9 * @createDate: 2023/11/9
*/ */
public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> { public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
@Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
Map<String,String> getCompanyInfoByOrgCode(String orgCode);
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java
View file @ d1513f1b
package com.yeejoin.amos.boot.module.jxiop.biz.controller; package com.yeejoin.amos.boot.module.jxiop.biz.controller;
import com.alibaba.fastjson.JSON; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
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.api.dto.CompanyTreeDto;
import com.yeejoin.amos.boot.module.jxiop.api.dto.ListCompanyModel; import com.yeejoin.amos.boot.module.jxiop.api.dto.ListCompanyModel;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic; import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.StdUserEmpower;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.UserOrgTreeModel; import com.yeejoin.amos.feign.privilege.model.UserOrgTreeModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* @description: * @description:
...@@ -37,143 +46,196 @@ import java.util.stream.Collectors; ...@@ -37,143 +46,196 @@ import java.util.stream.Collectors;
@RestController @RestController
@Api(tags = "平台单位部门树") @Api(tags = "平台单位部门树")
@RequestMapping(value = "/companyClient") @RequestMapping(value = "/companyClient")
public class PrivilegeController extends BaseController{ public class PrivilegeController extends BaseController {
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;
@Autowired
private UserEmpowerMapper userEmpowerMapper;
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryOrgTree") @Value("${yth.qg.id}")
@ApiOperation(httpMethod = "GET",value = "查询单位、子单位、部门树", notes = "查询单位、子单位、部门树") private Long qgCompanyId;
public FeignClientResult<Collection<UserOrgTreeModel>> queryOrgTree() {
//获取当前登录人单位 @TycloudOperation(ApiLevel = UserType.AGENCY)
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); @GetMapping(value = "/queryOrgTree")
@ApiOperation(httpMethod = "GET", value = "查询单位、子单位、部门树", notes = "查询单位、子单位、部门树")
Long companyId=reginParams.getCompany().getSequenceNbr(); public FeignClientResult<Collection<UserOrgTreeModel>> queryOrgTree() {
// 获取当前登录人单位
FeignClientResult<Collection<UserOrgTreeModel>> de =Privilege.companyClient.queryOrgTree(companyId); ReginParams reginParams = JSONObject.parseObject(redisUtils
.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
return de; ReginParams.class);
}
Long companyId = reginParams.getCompany().getSequenceNbr();
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/subcompany") FeignClientResult<Collection<UserOrgTreeModel>> de = Privilege.companyClient.queryOrgTree(companyId);
@ApiOperation(httpMethod = "GET",value = "查询单位、子单位", notes = "查询单位、子单位")
public ResponseModel< Collection<CompanyModel>> subcompany(String orgCode,String type) { return de;
Long companyId =null; }
if(orgCode!=null){
@TycloudOperation(ApiLevel = UserType.AGENCY)
LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient @GetMapping(value = "/subcompany")
.queryByOrgcode(orgCode).getResult(); @ApiOperation(httpMethod = "GET", value = "查询单位、子单位", notes = "查询单位、子单位")
for (Map.Entry<Object, Object> it : l.entrySet()) { public ResponseModel<Collection<CompanyModel>> subcompany(String orgCode, String type) {
// Long companyId =null;
CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()), // if(orgCode!=null){
CompanyModel.class); // LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient
if (companyModel != null) { // .queryByOrgcode(orgCode).getResult();
companyId = companyModel.getSequenceNbr(); // for (Map.Entry<Object, Object> it : l.entrySet()) {
} //
break; // CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
} // CompanyModel.class);
// if (companyModel != null) {
}else{ // companyId = companyModel.getSequenceNbr();
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); // }
companyId = reginParams.getCompany().getSequenceNbr(); // break;
} // }
//获取当前登录人单位 //
List<ListCompanyModel> data = new ArrayList(); // }else{
FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId); // ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId); // companyId = reginParams.getCompany().getSequenceNbr();
CompanyModel companyModel=dat.getResult(); // }
List<CompanyModel> list =new ArrayList<>(); // //获取当前登录人单位
//如果是公司则获取所有片区 // List<ListCompanyModel> data = new ArrayList();
// 86*353*328*364
if(companyModel.getLevel().equals("categroy_leve2")){ // FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId);
Collection<CompanyModel> companyModelList= de.getResult(); // CompanyModel companyModel=dat.getResult();
companyModelList=companyModelList.stream().filter(companyModel1 ->companyModel1.getCompanyName().contains("区域")).collect(Collectors.toList()); // List<CompanyModel> list =new ArrayList<>();
companyModelList.parallelStream().forEach((companyModel1)->{companyModel1.setChildren(new ArrayList());}); // //如果是公司则获取所有片区
return ResponseHelper.buildResponse(companyModelList); //// 86*353*328*364
} // if(companyModel.getLevel().equals("departmentorcompany")){
//如果是片区则获取片区 // Collection<CompanyModel> companyModelList= de.getResult();
if(companyModel.getLevel().equals("area")){ // companyModelList=companyModelList.stream().filter(companyModel1 ->companyModel1.getCompanyName().contains("区域")).collect(Collectors.toList());
list.add(companyModel); // companyModelList.parallelStream().forEach((companyModel1)->{companyModel1.setChildren(new ArrayList());});
return ResponseHelper.buildResponse(list); // return ResponseHelper.buildResponse(companyModelList);
} // }
if(!"add".equals(type)){ // //如果是片区则获取片区
if(companyModel.getLevel().equals("station")){ // if(companyModel.getLevel().equals("area")){
FeignClientResult<CompanyModel> areaInfo = Privilege.companyClient.seleteOne(companyModel.getParentId()); // list.add(companyModel);
list.add(areaInfo.getResult()); // return ResponseHelper.buildResponse(list);
} // }
} // if(!"add".equals(type)){
//如果是场站获取片区 // if(companyModel.getLevel().equals("station")){
// FeignClientResult<CompanyModel> areaInfo = Privilege.companyClient.seleteOne(companyModel.getParentId());
// list.add(areaInfo.getResult());
// }
// }
// 如果是场站获取片区
// if(companyModel.getLevel().equals("station")){ // if(companyModel.getLevel().equals("station")){
// FeignClientResult<CompanyModel> areaInfo = Privilege.companyClient.seleteOne(companyModel.getParentId()); // FeignClientResult<CompanyModel> areaInfo = Privilege.companyClient.seleteOne(companyModel.getParentId());
// list.add(areaInfo.getResult()); // list.add(areaInfo.getResult());
// } // }
return ResponseHelper.buildResponse(list); String companyLevel = "categroy_leve2";
} String companyName = "";
Long parentId = null;
@TycloudOperation(ApiLevel = UserType.AGENCY) ReginParams reginParams = getSelectedOrgInfo();
@GetMapping(value = "/stationTree") String userId = reginParams.getUserModel().getUserId();
@ApiOperation(httpMethod = "GET",value = "查询所属场站", notes = "查询所属场站") StdUserEmpower stdUserEmpower = userEmpowerMapper
public ResponseModel< Collection<CompanyModel>> stationTree(String orgCode ) { .selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
Long companyId =null; Map<String, String> companyInfo = new HashMap<String, String>();
if(orgCode!=null){ if (ObjectUtils.isEmpty(stdUserEmpower)) {
// throw new BadRequest("您当前未配置数据权限！");
} else {
LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
.queryByOrgcode(orgCode).getResult(); companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
for (Map.Entry<Object, Object> it : l.entrySet()) { companyLevel = companyInfo.get("level").toString();
companyName = companyInfo.get("companyName").toString();
CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()), }
CompanyModel.class); FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(qgCompanyId);
if (companyModel != null) { List<CompanyModel> list = new ArrayList<>();
companyId = companyModel.getSequenceNbr(); // 如果是全国
} if (companyLevel.equals("categroy_leve2")) {
break; Collection<CompanyModel> companyModelList = de.getResult();
} companyModelList = companyModelList.stream()
.filter(companyModel1 -> companyModel1.getCompanyName().contains("区域"))
}else{ .collect(Collectors.toList());
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); companyModelList.parallelStream().forEach((companyModel1) -> {
companyId = reginParams.getCompany().getSequenceNbr(); companyModel1.setChildren(new ArrayList());
} });
return ResponseHelper.buildResponse(companyModelList);
List<ListCompanyModel> data = new ArrayList(); }
FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId); // 如果是片区则获取片区
FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId); if (companyLevel.equals("area")||(!"add".equals(type)&&companyLevel.equals("station"))) {
CompanyModel companyModel=dat.getResult(); Collection<CompanyModel> companyModelList = de.getResult();
companyModel.setChildren(de.getResult()); companyModelList = companyModelList.stream()
List<CompanyModel> list =new ArrayList<>(); .filter(companyModel1 -> companyModel1.getCompanyName().contains("区域"))
list.add(companyModel); .collect(Collectors.toList());
return ResponseHelper.buildResponse(list); for (CompanyModel companyModel : companyModelList) {
} if (companyModel.getCompanyName().equals(companyName)) {
list.add(companyModel);
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) break;
@GetMapping(value = "/permissionTree") }
@ApiOperation(httpMethod = "GET",value = "查询所属场站", notes = "查询所属场站") }
public ResponseModel< Collection<CompanyModel>> permissionTree(@RequestParam(required = false,defaultValue = "86*353*328") String orgCode ) { list.parallelStream().forEach((companyModel1) -> {
Long companyId =null; companyModel1.setChildren(new ArrayList());
if(orgCode!=null){ });
LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient return ResponseHelper.buildResponse(list);
.queryByOrgcode(orgCode).getResult(); }
for (Map.Entry<Object, Object> it : l.entrySet()) { return ResponseHelper.buildResponse(list);
}
CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
CompanyModel.class); @TycloudOperation(ApiLevel = UserType.AGENCY)
if (companyModel != null) { @GetMapping(value = "/stationTree")
companyId = companyModel.getSequenceNbr(); @ApiOperation(httpMethod = "GET", value = "查询所属场站", notes = "查询所属场站")
} public ResponseModel<Collection<CompanyModel>> stationTree(String orgCode) {
break; Long companyId = null;
} if (orgCode != null) {
} LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient
List<ListCompanyModel> data = new ArrayList(); .queryByOrgcode(orgCode).getResult();
FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId); for (Map.Entry<Object, Object> it : l.entrySet()) {
FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId);
CompanyModel companyModel=dat.getResult(); CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
companyModel.setChildren(de.getResult()); CompanyModel.class);
List<CompanyModel> list =new ArrayList<>(); if (companyModel != null) {
list.add(companyModel); companyId = companyModel.getSequenceNbr();
return ResponseHelper.buildResponse(list); }
} break;
}
} else {
ReginParams reginParams = JSONObject.parseObject(redisUtils
.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
ReginParams.class);
companyId = reginParams.getCompany().getSequenceNbr();
}
List<ListCompanyModel> data = new ArrayList();
FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId);
FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId);
CompanyModel companyModel = dat.getResult();
companyModel.setChildren(de.getResult());
List<CompanyModel> list = new ArrayList<>();
list.add(companyModel);
return ResponseHelper.buildResponse(list);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/permissionTree")
@ApiOperation(httpMethod = "GET", value = "查询所属场站", notes = "查询所属场站")
public ResponseModel<Collection<CompanyModel>> permissionTree(
@RequestParam(required = false, defaultValue = "86*353*328") String orgCode) {
Long companyId = null;
if (orgCode != null) {
LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient
.queryByOrgcode(orgCode).getResult();
for (Map.Entry<Object, Object> it : l.entrySet()) {
CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
CompanyModel.class);
if (companyModel != null) {
companyId = companyModel.getSequenceNbr();
}
break;
}
}
List<ListCompanyModel> data = new ArrayList();
FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId);
FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId);
CompanyModel companyModel = dat.getResult();
companyModel.setChildren(de.getResult());
List<CompanyModel> list = new ArrayList<>();
list.add(companyModel);
return ResponseHelper.buildResponse(list);
}
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java
View file @ d1513f1b
...@@ -26,62 +26,63 @@ import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.EquipAlarmEventMapper; ...@@ -26,62 +26,63 @@ import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.EquipAlarmEventMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.EquipDivergenceAlarmEventMapper; import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.EquipDivergenceAlarmEventMapper;
@Service @Service
public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto, EquipAlarmEvent, EquipAlarmEventMapper> { public class EquipAlarmEventServiceImpl
extends BaseService<EquipAlarmEventDto, EquipAlarmEvent, EquipAlarmEventMapper> {
@Autowired @Autowired
EquipAlarmEventMapper equipAlarmEventMapper; EquipAlarmEventMapper equipAlarmEventMapper;
@Autowired @Autowired
StationBasicMapper stationBasicMapper; StationBasicMapper stationBasicMapper;
@Autowired @Autowired
EquipDivergenceAlarmEventMapper equipDivergenceAlarmEventMapper; EquipDivergenceAlarmEventMapper equipDivergenceAlarmEventMapper;
public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex, String frontModule) { public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex,
List<EquipAlarmEventDto> equipAlarmEvents = new ArrayList<>(); String frontModule) {
LambdaQueryWrapper<EquipAlarmEvent> queryWrapper = new LambdaQueryWrapper<>(); List<EquipAlarmEventDto> equipAlarmEvents = new ArrayList<>();
if(equipIndex!=null) LambdaQueryWrapper<EquipAlarmEvent> queryWrapper = new LambdaQueryWrapper<>();
{ if (equipIndex != null) {
queryWrapper.eq(EquipAlarmEvent::getEquipIndex, equipIndex); queryWrapper.eq(EquipAlarmEvent::getEquipIndex, equipIndex);
} }
queryWrapper.eq(EquipAlarmEvent::getGatewayId, gatewayId); queryWrapper.eq(EquipAlarmEvent::getGatewayId, gatewayId);
if(frontModule!=null) if (frontModule != null) {
{ queryWrapper.eq(EquipAlarmEvent::getFrontModule, frontModule);
queryWrapper.eq(EquipAlarmEvent::getFrontModule, frontModule); }
} Calendar calendar = Calendar.getInstance();
Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_MONTH, -7);
calendar.add(Calendar.DAY_OF_MONTH, -7); queryWrapper.gt(EquipAlarmEvent::getCreatedTime, calendar.getTime());
queryWrapper.gt(EquipAlarmEvent::getCreatedTime, calendar.getTime()); int count = equipAlarmEventMapper.selectCount(queryWrapper);
int count = equipAlarmEventMapper.selectCount(queryWrapper);
IPage<EquipAlarmEvent> p = new Page<>(current, size);
IPage<EquipAlarmEvent> p = new Page<>(current, size); equipAlarmEvents = equipAlarmEventMapper.getAlarmEventList(gatewayId, equipIndex, frontModule,
equipAlarmEvents= equipAlarmEventMapper.getAlarmEventList(gatewayId, equipIndex, frontModule, (p.getCurrent()-1)*p.getSize(), p.getSize(),calendar.getTime()); (p.getCurrent() - 1) * p.getSize(), p.getSize(), calendar.getTime());
// equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper); // equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
// equipAlarmEvents=page.getRecords(); // equipAlarmEvents=page.getRecords();
equipAlarmEvents.forEach(i->{ equipAlarmEvents.forEach(i -> {
if("true".equals(i.getValue())) if ("true".equals(i.getValue())) {
{ i.setValue("合");
i.setValue("合"); } else {
}else i.setValue("分");
{ }
i.setValue("分"); });
} DataGridMock DataGridMock = new DataGridMock(current, count, false, current, equipAlarmEvents);
}); ColModel colModelEventMovement = new ColModel("equipName", "equipName", "设备名", "设备名", "dataGrid", "equipName");
DataGridMock DataGridMock = new DataGridMock(current, count, false, current, equipAlarmEvents); ColModel colModelStationName = new ColModel("alarmDesc", "alarmDesc", "事件描述", "事件描述", "dataGrid", "alarmDesc");
ColModel colModelEventMovement = new ColModel("equipName", "equipName", "设备名", "设备名", "dataGrid", "equipName"); ColModel colModelEventDesc = new ColModel("createdTime", "createdTime", "告警时间", "告警时间", "dataGrid",
ColModel colModelStationName = new ColModel("alarmDesc", "alarmDesc", "事件描述", "事件描述", "dataGrid", "alarmDesc"); "createdTime");
ColModel colModelEventDesc = new ColModel("createdTime", "createdTime", "告警时间", "告警时间", "dataGrid", "createdTime"); ColModel colModelValueDesc = new ColModel("value", "value", "动作", "动作", "dataGrid", "value");
ColModel colModelValueDesc = new ColModel("value", "value", "动作", "动作", "dataGrid", "value"); List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc,
List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc,colModelValueDesc); colModelValueDesc);
ResultsData resultsData = new ResultsData(DataGridMock, listColModel); ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
return resultsData; return resultsData;
} }
public ResultsData getEquipDivergenceEvent(String gatewayId, int current, int size) { public ResultsData getEquipDivergenceEvent(String gatewayId, int current, int size) {
PageHelper.startPage(current, size); PageHelper.startPage(current, size);
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -2); calendar.add(Calendar.DAY_OF_MONTH, -2);
List<EquipDivergenceAlarmEvent> alarmEventList = equipDivergenceAlarmEventMapper.getEventList(gatewayId, null, null, List<EquipDivergenceAlarmEvent> alarmEventList = equipDivergenceAlarmEventMapper.getEventList(gatewayId, null,
calendar.getTime()); null, calendar.getTime());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar car = Calendar.getInstance(); Calendar car = Calendar.getInstance();
...@@ -91,12 +92,12 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto, ...@@ -91,12 +92,12 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
// } else if ("false".equals(i.getValue())) { // } else if ("false".equals(i.getValue())) {
// i.setValue("分"); // i.setValue("分");
// } // }
long mills = i.getCreatedTime() ; long mills = i.getCreatedTime() / 1000000;
car.setTimeInMillis(mills); car.setTimeInMillis(mills);
// System.out.println(sdf.format(car.getTime())); // System.out.println(sdf.format(car.getTime()));
String time = sdf.format(car.getTime()); String time = sdf.format(car.getTime());
if (time.contains("1970")) { if (time.contains("1970-")) {
mills = i.getCreatedTime()/ 1000000; mills = i.getCreatedTime();
car.setTimeInMillis(mills); car.setTimeInMillis(mills);
time = sdf.format(car.getTime()); time = sdf.format(car.getTime());
} }
...@@ -118,5 +119,5 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto, ...@@ -118,5 +119,5 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
colModelEventDesc, colModelValueDesc); colModelEventDesc, colModelValueDesc);
ResultsData resultsData = new ResultsData(DataGridMock, listColModel); ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
return resultsData; return resultsData;
} }
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ d1513f1b
...@@ -149,7 +149,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -149,7 +149,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
private EquipmentSpecificIndexMapper equipmentSpecificIndexMapper; private EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
@Autowired @Autowired
private UserEmpowerMapper userEmpowerMapper; private UserEmpowerMapper userEmpowerMapper;
@Override
public ResultsData getNationWideInfo(int current, int size, String gateway, String equipmentNumber) { public ResultsData getNationWideInfo(int current, int size, String gateway, String equipmentNumber) {
String table = gateway; String table = gateway;
Map<String, List<String>> queryCodntion = new HashMap<>(); Map<String, List<String>> queryCodntion = new HashMap<>();
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java
View file @ d1513f1b
...@@ -149,13 +149,19 @@ public class MonitoringServiceImpl { ...@@ -149,13 +149,19 @@ public class MonitoringServiceImpl {
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("30秒平均风速")); queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("30秒平均风速"));
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getFanGatewayId())); queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getFanGatewayId()));
List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class); List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
speendOrirradiate = String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getAvagerByEquipmentIndxName(result, "30秒平均风速")); if(result!=null)
} else if(stationCacheInfoDto.getStationType().contains("GFDZ")){ {
speendOrirradiate = String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getAvagerByEquipmentIndxName(result, "30秒平均风速"));
}
}else if(stationCacheInfoDto.getStationType().contains("GFDZ")){
Map<String, List<String>> queryCondtion = new HashMap<>(); Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("WTX-801_25_WTX-801_总辐射")); queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("WTX-801_25_WTX-801_总辐射"));
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getBoosterGatewayId())); queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getBoosterGatewayId()));
List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class); List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
speendOrirradiate = String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, "WTX-801_25_WTX-801_总辐射")); if(result!=null)
{
speendOrirradiate = String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, "WTX-801_25_WTX-801_总辐射"));
}
}else { }else {
speendOrirradiate="0.00"; speendOrirradiate="0.00";
} }
......
amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/AlarmEventServiceImpl.java
View file @ d1513f1b
...@@ -166,12 +166,12 @@ public class AlarmEventServiceImpl extends BaseService<AlarmEventDto, AlarmEvent ...@@ -166,12 +166,12 @@ public class AlarmEventServiceImpl extends BaseService<AlarmEventDto, AlarmEvent
i.setValue("分"); i.setValue("分");
} }
i.setStationName("升压站"); i.setStationName("升压站");
long mills = i.getCreatedTime() ; long mills = i.getCreatedTime()/ 1000000 ;
car.setTimeInMillis(mills); car.setTimeInMillis(mills);
// System.out.println(sdf.format(car.getTime())); // System.out.println(sdf.format(car.getTime()));
String time = sdf.format(car.getTime()); String time = sdf.format(car.getTime());
if (time.contains("1970")) { if (time.contains("1970-")) {
mills = i.getCreatedTime()/ 1000000; mills = i.getCreatedTime();
car.setTimeInMillis(mills); car.setTimeInMillis(mills);
time = sdf.format(car.getTime()); time = sdf.format(car.getTime());
} }
......
amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java
View file @ d1513f1b
...@@ -64,12 +64,12 @@ public class EquipAlarmEventServiceImpl ...@@ -64,12 +64,12 @@ public class EquipAlarmEventServiceImpl
} else if ("false".equals(i.getValue())) { } else if ("false".equals(i.getValue())) {
i.setValue("分"); i.setValue("分");
} }
long mills = i.getCreatedTime() ; long mills = i.getCreatedTime() / 1000000;
car.setTimeInMillis(mills); car.setTimeInMillis(mills);
// System.out.println(sdf.format(car.getTime())); // System.out.println(sdf.format(car.getTime()));
String time = sdf.format(car.getTime()); String time = sdf.format(car.getTime());
if (time.contains("1970")) { if (time.contains("1970-")) {
mills = i.getCreatedTime()/ 1000000; mills = i.getCreatedTime();
car.setTimeInMillis(mills); car.setTimeInMillis(mills);
time = sdf.format(car.getTime()); time = sdf.format(car.getTime());
} }
......
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