Skip to content

A
amos-boot-biz
Commit 3f16f65c authored by chenhao's avatar chenhao
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents c67ab427 08932d09
Hide whitespace changes
Inline Side-by-side
Showing with 1809 additions and 679 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/pom.xml
View file @ 3f16f65c
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<artifactId>amos-boot-module-command-api</artifactId> <artifactId>amos-boot-module-command-api</artifactId>
<dependencies> <dependencies>
<dependency> <!-- <dependency>-->
<groupId>org.springframework.boot</groupId> <!-- <groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-data-mongodb</artifactId> <!-- <artifactId>spring-boot-starter-data-mongodb</artifactId>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>
amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/SeismometeorologyDto.java
View file @ 3f16f65c
package com.yeejoin.amos.boot.module.command.api.dto; package com.yeejoin.amos.boot.module.command.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.mapping.MongoId;
import java.util.Date; import java.util.Date;
...@@ -19,39 +15,39 @@ import java.util.Date; ...@@ -19,39 +15,39 @@ import java.util.Date;
*/ */
@Data @Data
@ApiModel(value = "SeismometeorologyDto", description = "地震气象信息") @ApiModel(value = "SeismometeorologyDto", description = "地震气象信息")
@Document(collection = "heart_rate") //@Document(collection = "heart_rate")
public class SeismometeorologyDto { public class SeismometeorologyDto {
@MongoId // @MongoId
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "主键ID")
protected Long sequenceNbr; protected Long sequenceNbr;
@ApiModelProperty(value = "预警类型 1：警情通知 0：气象通知") @ApiModelProperty(value = "预警类型 1：警情通知 0：气象通知")
@Field("type") // @Field("type")
private String type; private String type;
@ApiModelProperty(value = "预警类型名称") @ApiModelProperty(value = "预警类型名称")
@Field("typeName") // @Field("typeName")
private String typeName; private String typeName;
@ApiModelProperty(value = "预警等级") @ApiModelProperty(value = "预警等级")
@Field("grade") // @Field("grade")
private String grade; private String grade;
@ApiModelProperty(value = "发布时间") @ApiModelProperty(value = "发布时间")
@Field("releaseTime") // @Field("releaseTime")
private Date releaseTime; private Date releaseTime;
@ApiModelProperty(value = "发布单位") @ApiModelProperty(value = "发布单位")
@Field("releaseCompany") // @Field("releaseCompany")
private String releaseCompany; private String releaseCompany;
@ApiModelProperty(value = "发布内容") @ApiModelProperty(value = "发布内容")
@Field("content") // @Field("content")
private String content; private String content;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipment.java
View file @ 3f16f65c
...@@ -179,7 +179,7 @@ public class FireEquipment implements Serializable { ...@@ -179,7 +179,7 @@ public class FireEquipment implements Serializable {
@ApiModelProperty(value = "资产生命周期日期") @ApiModelProperty(value = "资产生命周期日期")
@TableField("lifecycledate") @TableField("lifecycledate")
private String lifecycledate = ""; private Date lifecycledate;
@ApiModelProperty(value = "资产生命周期状态") @ApiModelProperty(value = "资产生命周期状态")
@TableField("lifecyclestate") @TableField("lifecyclestate")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/DateUtils.java
View file @ 3f16f65c
...@@ -23,7 +23,7 @@ public class DateUtils { ...@@ -23,7 +23,7 @@ public class DateUtils {
public static final String YEAR_PATTERN = "yyyy"; public static final String YEAR_PATTERN = "yyyy";
public static final String MINUTE_ONLY_PATTERN = "mm"; public static final String MINUTE_ONLY_PATTERN = "mm";
public static final String HOUR_ONLY_PATTERN = "HH"; public static final String HOUR_ONLY_PATTERN = "HH";
public static final String DATE_TIME_T_PATTERN = "yyyy-MM-dd'T'HH:mm:ss"; public static final String DATE_TIME_T_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
/** /**
* 获取当前时间 * 获取当前时间
* *
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderFillingCheckDataUnitDto.java
View file @ 3f16f65c
package com.yeejoin.amos.boot.module.tzs.flc.api.dto; package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
...@@ -53,4 +54,7 @@ public class CylinderFillingCheckDataUnitDto extends BaseDto { ...@@ -53,4 +54,7 @@ public class CylinderFillingCheckDataUnitDto extends BaseDto {
@ApiModelProperty(value = "充装月份") @ApiModelProperty(value = "充装月份")
private String fillingMonth; private String fillingMonth;
@ApiModelProperty(value = "充装年月")
private String fillingDate;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderFillingCheckDataUnit.java
View file @ 3f16f65c
...@@ -93,4 +93,11 @@ public class CylinderFillingCheckDataUnit extends BaseEntity { ...@@ -93,4 +93,11 @@ public class CylinderFillingCheckDataUnit extends BaseEntity {
*/ */
@TableField("filling_month") @TableField("filling_month")
private String fillingMonth; private String fillingMonth;
//filling_date
/**
* 充装年月
*/
@TableField("filling_date")
private String fillingDate;
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/pom.xml
View file @ 3f16f65c
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.amosframework.boot</groupId> <groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-biz</artifactId> <artifactId>amos-boot-module-biz</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>amos-boot-module-avic-biz</artifactId> <artifactId>amos-boot-module-avic-biz</artifactId>
<dependencies> <dependencies>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-avic-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>com.amosframework.boot</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId> <artifactId>amos-boot-module-avic-api</artifactId>
<version>3.2.6</version> <version>${amos-biz-boot.version}</version>
</dependency> </dependency>
</dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>3.2.6</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>indicators-feign</artifactId>
<version>1.0.4-SNAPSHOT</version>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java/com/yeejoin/amos/avic/controller/AvicCustomPathResource.java
View file @ 3f16f65c
...@@ -56,7 +56,6 @@ public class AvicCustomPathResource { ...@@ -56,7 +56,6 @@ public class AvicCustomPathResource {
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(); JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
Client client = dcf.createClient(webserviceUrl); Client client = dcf.createClient(webserviceUrl);
try { try {
// invoke("方法名",参数1,参数2,参数3....);
client.invoke("transferPathConfig", model); client.invoke("transferPathConfig", model);
} catch (java.lang.Exception e) { } catch (java.lang.Exception e) {
e.printStackTrace(); e.printStackTrace();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java/com/yeejoin/amos/avic/controller/WebServicesFileFransferResource.java
View file @ 3f16f65c
package com.yeejoin.amos.avic.controller; package com.yeejoin.amos.avic.controller;
import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.activation.DataHandler; import javax.activation.DataHandler;
import javax.activation.FileDataSource;
import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Client;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -28,7 +28,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel; ...@@ -28,7 +28,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.yeejoin.amos.avic.face.model.AvicCustomPathModel; import com.yeejoin.amos.avic.face.model.AvicCustomPathModel;
import com.yeejoin.amos.avic.face.model.InputStreamDataSource; import com.yeejoin.amos.avic.face.model.InputStreamDataSource;
import com.yeejoin.amos.avic.face.model.UploadFileModel; import com.yeejoin.indicators.feign.IndicatorsManager;
import com.yeejoin.indicators.feign.request.DataRecordRequest;
import com.yeejoin.indicators.feign.workflow.WorkFlowFeign;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -42,12 +44,21 @@ public class WebServicesFileFransferResource { ...@@ -42,12 +44,21 @@ public class WebServicesFileFransferResource {
@Value("${avic.webservice.path}") @Value("${avic.webservice.path}")
String webserviceUrl; String webserviceUrl;
@Autowired
IndicatorsManager indicatorsManager;
@Autowired
WorkFlowFeign workFlowFeign;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "传输文件") @ApiOperation(value = "传输文件")
@RequestMapping(value = "/file", method = RequestMethod.POST) @RequestMapping(value = "/file", method = RequestMethod.POST)
public ResponseModel postfile(@RequestPart MultipartFile[] files, @RequestParam String code, @RequestParam String path ) { public ResponseModel postfile(
@RequestPart MultipartFile[] files,
@RequestParam String code,
@RequestParam String path,
@RequestParam String processDefinitionId,
@RequestParam String taskId,
@RequestParam String bizId) {
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(); JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
Client client = dcf.createClient(webserviceUrl); Client client = dcf.createClient(webserviceUrl);
try { try {
...@@ -64,6 +75,14 @@ public class WebServicesFileFransferResource { ...@@ -64,6 +75,14 @@ public class WebServicesFileFransferResource {
client.invoke("useCodetransferFile", handler, file.getOriginalFilename(), path, code); client.invoke("useCodetransferFile", handler, file.getOriginalFilename(), path, code);
} }
} }
List<DataRecordRequest> list = new ArrayList<>();
DataRecordRequest dataRecordRequest = new DataRecordRequest();
dataRecordRequest.put("avicCode", code);
dataRecordRequest.put("targetPath", path);
list.add(dataRecordRequest);
indicatorsManager.indicatorClient.saveBizRecord(taskId, bizId, list);
workFlowFeign.startFormByProcess(null, processDefinitionId);
} catch (java.lang.Exception e) { } catch (java.lang.Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @ 3f16f65c
...@@ -14,7 +14,6 @@ import com.yeejoin.amos.boot.biz.common.enums.HomePageEnum; ...@@ -14,7 +14,6 @@ import com.yeejoin.amos.boot.biz.common.enums.HomePageEnum;
import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService; import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils; import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils; import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils;
import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
import com.yeejoin.amos.boot.module.command.api.dto.CarTaskDto; import com.yeejoin.amos.boot.module.command.api.dto.CarTaskDto;
import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto; import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService; import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
...@@ -81,8 +80,8 @@ public class CommandController extends BaseController { ...@@ -81,8 +80,8 @@ public class CommandController extends BaseController {
IFireTeamService iFireTeamService; IFireTeamService iFireTeamService;
@Autowired @Autowired
IWaterResourceService iWaterResourceService; IWaterResourceService iWaterResourceService;
@Autowired // @Autowired
SeismometeorologyDtoDao seismometeorologyDtoDao; // SeismometeorologyDtoDao seismometeorologyDtoDao;
@Autowired @Autowired
IOrgUsrService iOrgUsrService; IOrgUsrService iOrgUsrService;
@Autowired @Autowired
...@@ -631,7 +630,8 @@ public class CommandController extends BaseController { ...@@ -631,7 +630,8 @@ public class CommandController extends BaseController {
RequestData requestData = new RequestData(); RequestData requestData = new RequestData();
requestData.setWhether24(true); requestData.setWhether24(true);
List<AlertCalledZhDto> list = iAlertCalledService.alertCalledListByAlertStatus(null, null, requestData); List<AlertCalledZhDto> list = iAlertCalledService.alertCalledListByAlertStatus(null, null, requestData);
List<SeismometeorologyDto> li = seismometeorologyDtoDao.findCarStateByWatchSn(); // List<SeismometeorologyDto> li = seismometeorologyDtoDao.findCarStateByWatchSn();
List<SeismometeorologyDto> li =new ArrayList<>();
//数据组装 //数据组装
for (AlertCalledZhDto alertCalledZhDto : list) { for (AlertCalledZhDto alertCalledZhDto : list) {
...@@ -1062,8 +1062,8 @@ public class CommandController extends BaseController { ...@@ -1062,8 +1062,8 @@ public class CommandController extends BaseController {
@RequestMapping(value = "/findDutyCarStateBy", method = RequestMethod.GET) @RequestMapping(value = "/findDutyCarStateBy", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "当日气象预警", notes = "当日气象预警") @ApiOperation(httpMethod = "GET", value = "当日气象预警", notes = "当日气象预警")
public ResponseModel<Object> findDutyCarStateBy() throws Exception { public ResponseModel<Object> findDutyCarStateBy() throws Exception {
List<SeismometeorologyDto> li = seismometeorologyDtoDao.findDutyCarStateBy(); // List<SeismometeorologyDto> li = seismometeorologyDtoDao.findDutyCarStateBy();
return ResponseHelper.buildResponse(li); return ResponseHelper.buildResponse(null);
} }
/** /**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ 3f16f65c
...@@ -31,6 +31,7 @@ import org.springframework.data.domain.Page; ...@@ -31,6 +31,7 @@ import org.springframework.data.domain.Page;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.DateTimeUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
...@@ -866,11 +867,13 @@ public class TopographyController extends AbstractBaseController { ...@@ -866,11 +867,13 @@ public class TopographyController extends AbstractBaseController {
List<Date> dates = new ArrayList<>(); List<Date> dates = new ArrayList<>();
for (IotDataVO vo : timeList) { for (IotDataVO vo : timeList) {
SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DATE_TIME_T_PATTERN); SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DATE_TIME_T_PATTERN);
SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
logger.info("返回时间===================================(" + vo.getValue() + ") ======================================="); logger.info("返回时间===================================(" + vo.getValue() + ") =======================================");
Date date=sdf.parse(String.valueOf(vo.getValue())); Date date=sdf.parse(String.valueOf(vo.getValue()));
sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
String time= sdf.format(date); // String time= sdf.format(date);
dates.add(sdf.parse(time)); String time= DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
dates.add(sdf1.parse(time));
logger.info("返回时间===================================(" + sdf.parse(String.valueOf(vo.getValue())) + ") ======================================="); logger.info("返回时间===================================(" + sdf.parse(String.valueOf(vo.getValue())) + ") =======================================");
} }
List<EquipmentSpecificIndex> indexes = equipmentSpecificIndexMapper.getEquipmentSpeIndexByIotCodeAndTrend(iotCode); List<EquipmentSpecificIndex> indexes = equipmentSpecificIndexMapper.getEquipmentSpeIndexByIotCodeAndTrend(iotCode);
...@@ -928,4 +931,6 @@ public class TopographyController extends AbstractBaseController { ...@@ -928,4 +931,6 @@ public class TopographyController extends AbstractBaseController {
} }
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java
View file @ 3f16f65c
...@@ -105,6 +105,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec ...@@ -105,6 +105,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
CommonPageInfoParam param = new CommonPageInfoParam(); CommonPageInfoParam param = new CommonPageInfoParam();
if (AlarmTypeEnum.GZGJ.getCode().equals(alarmType)) { if (AlarmTypeEnum.GZGJ.getCode().equals(alarmType)) {
param.setIsFireAlarm("false"); param.setIsFireAlarm("false");
} else if (AlarmTypeEnum.HZGJ.getCode().equals(alarmType)) {
param.setAlarmType(alarmType);
} }
List<HashMap<String, Object>> list = this.baseMapper.getAlarmList(param); List<HashMap<String, Object>> list = this.baseMapper.getAlarmList(param);
List<EquipmentAlarmDownloadVO> equipmentDownloads = handleExportData(ids, list); List<EquipmentAlarmDownloadVO> equipmentDownloads = handleExportData(ids, list);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ 3f16f65c
...@@ -416,6 +416,17 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -416,6 +416,17 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
this.update(new LambdaUpdateWrapper<EquipmentSpecific>().set(EquipmentSpecific::getAgencyId, equipmentSpecific.getAgencyId()).set(EquipmentSpecific::getTeamId, equipmentSpecific.getTeamId()).eq(EquipmentSpecific::getId, equipmentSpecific.getId())); this.update(new LambdaUpdateWrapper<EquipmentSpecific>().set(EquipmentSpecific::getAgencyId, equipmentSpecific.getAgencyId()).set(EquipmentSpecific::getTeamId, equipmentSpecific.getTeamId()).eq(EquipmentSpecific::getId, equipmentSpecific.getId()));
if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) { if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) {
equipmentSpecific.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId()); equipmentSpecific.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId());
// 更新alarm表没有复位的装备位置信息
LambdaQueryWrapper<EquipmentSpecificAlarm> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(EquipmentSpecificAlarm::getEquipmentSpecificId, equipmentSpecific.getId());
queryWrapper.ne(EquipmentSpecificAlarm::getStatus, AlarmStatusEnum.HF.getCode());
List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
if (0 < alarms.size()) {
alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+ null == equipmentSpecific.getStockDetail().getDescription() ? "" : equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
equipmentSpecificAlarmService.updateBatchById(alarms);
}
} }
boolean updateById = this.updateById(equipmentSpecific); boolean updateById = this.updateById(equipmentSpecific);
if (updateById) { if (updateById) {
...@@ -474,17 +485,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -474,17 +485,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
equipmentSpecific.getStockDetail().setDescription(detail.getArea()); equipmentSpecific.getStockDetail().setDescription(detail.getArea());
stockDetailService.save(equipmentSpecific.getStockDetail()); stockDetailService.save(equipmentSpecific.getStockDetail());
// 更新alarm表没有复位的装备位置信息
LambdaQueryWrapper<EquipmentSpecificAlarm> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(EquipmentSpecificAlarm::getEquipmentSpecificId, equipmentSpecific.getId());
queryWrapper.ne(EquipmentSpecificAlarm::getStatus, AlarmStatusEnum.HF.getCode());
List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
if (0 < alarms.size()) {
alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+ equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
equipmentSpecificAlarmService.updateBatchById(alarms);
}
//生成入库单 //生成入库单
StockBill stockBill = buildStockBills(equipmentSpecific, reginParams, agencyUserModel); StockBill stockBill = buildStockBills(equipmentSpecific, reginParams, agencyUserModel);
stockBillService.save(stockBill); stockBillService.save(stockBill);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ 3f16f65c
...@@ -282,7 +282,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -282,7 +282,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
static void upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) { public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper(); LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode); queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey); queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
...@@ -295,6 +295,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -295,6 +295,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
if (!logs.isEmpty()) { if (!logs.isEmpty()) {
equipmentSpecificAlarmLogService.updateBatchById(logs); equipmentSpecificAlarmLogService.updateBatchById(logs);
} }
return logs;
} }
public void publishDataToCanvas(List<EquipmentSpecificIndex> indexList) { public void publishDataToCanvas(List<EquipmentSpecificIndex> indexList) {
...@@ -321,8 +322,17 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -321,8 +322,17 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
Map<String, Object> map = JSON.parseObject(JSON.toJSONString(equipmentStateVo)); Map<String, Object> map = JSON.parseObject(JSON.toJSONString(equipmentStateVo));
map.put(canvasTopic, topicObject); map.put(canvasTopic, topicObject);
// 发送数据至画布
mqttSendGateway.sendToMqtt(canvasTopic, JSON.toJSONString(map)); TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCompletion(int status) {
if (TransactionSynchronization.STATUS_COMMITTED == status) {
// 发送数据至画布
mqttSendGateway.sendToMqtt(canvasTopic, JSON.toJSONString(map));
}
}
});
} }
} }
...@@ -679,15 +689,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -679,15 +689,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
} }
}); });
//向画布推送
publishDataToCanvas(equipmentSpecificIndexList);
// 首页性能指标数据订阅 // 首页性能指标数据订阅
mqttSendGateway.sendToMqtt(indexTopic, JSON.toJSONString(indexStateList)); mqttSendGateway.sendToMqtt(indexTopic, JSON.toJSONString(indexStateList));
//组态大屏消息推送，设备表实时指标修改 //组态大屏消息推送，设备表实时指标修改
intePageSysDataRefresh(equipmentSpecificIndexList, topicEntity); intePageSysDataRefresh(equipmentSpecificIndexList, topicEntity);
//数字换流站同步指标修改 //数字换流站同步指标修改
syncSpecificIndexsToGS(equipmentSpecificIndexList); syncSpecificIndexsToGS(equipmentSpecificIndexList);
...@@ -696,7 +704,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -696,7 +704,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
//则更新拓扑节点数据及告警状态 //则更新拓扑节点数据及告警状态
updateNodeDateByEquipId(equipmentSpecificIndexList); updateNodeDateByEquipId(equipmentSpecificIndexList);
//向画布推送
publishDataToCanvas(equipmentSpecificIndexList);
} }
...@@ -714,23 +724,20 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -714,23 +724,20 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString()); mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
} else { } else {
upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService); equipmentAlarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService));
mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString()); mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString());
bool = Boolean.TRUE; bool = Boolean.TRUE;
} }
}); });
if(ObjectUtils.isEmpty(equipmentAlarmLogs)){
return;
}
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override @Override
public void afterCommit() { public void afterCommit() {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("seqNo", UUID.randomUUID().toString().replace("-", "").toLowerCase()); jsonObject.put("seqNo", UUID.randomUUID().toString().replace("-", "").toLowerCase());
mqttSendGateway.sendToMqtt(TopicEnum.ALARM_LOG_INSERT.getTopic(), jsonObject.toString()); mqttSendGateway.sendToMqtt(TopicEnum.ALARM_LOG_INSERT.getTopic(), jsonObject.toString());
mqttSendGateway.sendToMqtt(TopicEnum.EQZXDT.getTopic(), "");
// 数字换流站数据处理（高斯库同步及南瑞告警推送） // 数字换流站数据处理（高斯库同步及南瑞告警推送）
if (syncSwitch) { if (syncSwitch) {
List<FireEquipmentFireAlarm> alarmList = createFireEquipmentFireAlarmVo(equipmentAlarmLogs); List<FireEquipmentFireAlarm> alarmList = createFireEquipmentFireAlarmVo(equipmentAlarmLogs);
...@@ -761,7 +768,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -761,7 +768,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
// 向南瑞平台推送报警消息 // 向南瑞平台推送报警消息
syncDataService.syncCreatedSendAlarm(equipmentAlarmLogs); if(!bool){
syncDataService.syncCreatedSendAlarm(equipmentAlarmLogs);
}
} }
} }
}); });
...@@ -913,7 +922,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -913,7 +922,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override @Override
public void afterCommit() { public void afterCommit() {
mqttSendGateway.sendToMqtt(TopicEnum.EQZXDT.getTopic(), "");
mqttSendGateway.sendToMqtt(TopicEnum.EQXXTJ.getTopic(), ""); mqttSendGateway.sendToMqtt(TopicEnum.EQXXTJ.getTopic(), "");
iEquipmentSpecificSerivce.integrationPageSysDataRefresh(topicEntity.getCode()); iEquipmentSpecificSerivce.integrationPageSysDataRefresh(topicEntity.getCode());
iEquipmentSpecificSerivce.updateEquipmentSpecIndexRealtimeData(equipmentSpecificIndexList); iEquipmentSpecificSerivce.updateEquipmentSpecIndexRealtimeData(equipmentSpecificIndexList);
...@@ -960,7 +968,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -960,7 +968,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
} }
return ""; return "";
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java
View file @ 3f16f65c
...@@ -456,6 +456,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -456,6 +456,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
String monthStr = month < 10 ? "0" + month : month + ""; String monthStr = month < 10 ? "0" + month : month + "";
temp.setFillingMonth(monthStr); temp.setFillingMonth(monthStr);
temp.setFillingYear(year); temp.setFillingYear(year);
temp.setFillingDate(year + "-" + monthStr);
Integer countThisMonth = cylinderFillingRecordServiceImpl.getFillingCountByMonth(cylinderUnit.getAppId(), c.getTime()); Integer countThisMonth = cylinderFillingRecordServiceImpl.getFillingCountByMonth(cylinderUnit.getAppId(), c.getTime());
temp.setTotalSum((long) countThisMonth); temp.setTotalSum((long) countThisMonth);
// 获取本月数据 // 获取本月数据
...@@ -495,7 +496,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -495,7 +496,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
} }
/** /**
* 卸液量按单位统计 * 充装量、卸液量按单位统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") @Scheduled(cron = "0 0 2 * * ?")
......
amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql
View file @ 3f16f65c
...@@ -5100,99 +5100,251 @@ FROM ...@@ -5100,99 +5100,251 @@ FROM
DROP VIEW IF EXISTS `v_fire_equip_ffs_num`; DROP VIEW IF EXISTS `v_fire_equip_ffs_num`;
CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `v_fire_equip_ffs_num` AS CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `v_fire_equip_ffs_num` AS
SELECT SELECT
d.jygdgwdl, `d`.`jygdgwdl` AS `jygdgwdl`,
d.jygdgwdlpb, `d`.`jygdgwdlpb` AS `jygdgwdlpb`,
d.jygdgwdlgz, `d`.`jygdgwdlgz` AS `jygdgwdlgz`,
d.jygdgwdlhj, `d`.`jygdgwdlhj` AS `jygdgwdlhj`,
ABS (d.jygdgwdl - d.jygdgwdlyc) AS jygdgwdlzc, abs(
d.jygddcf, (
d.jygddcfqd, `d`.`jygdgwdl` - `d`.`jygdgwdlyc`
d.jygddcfgz, )
d.jygddcfpb, ) AS `jygdgwdlzc`,
ABS (d.jygddcf - d.jygddcfqd) AS jygddcfzc, `d`.`jygddcf` AS `jygddcf`,
d.jygdqdp, `d`.`jygddcfqd` AS `jygddcfqd`,
d.jygdqdpqd, `d`.`jygddcfgz` AS `jygddcfgz`,
d.jygdqdpgz, `d`.`jygddcfpb` AS `jygddcfpb`,
d.jygdqdppb, abs(
ABS (d.jygdqdp - d.jygdqdpqd) AS jygdqdpzc, (
d.jygddlq, `d`.`jygddcf` - `d`.`jygddcfqd`
d.jygddlqdl, )
d.jygddlqgz, ) AS `jygddcfzc`,
d.jygddlqpb, `d`.`jygdqdp` AS `jygdqdp`,
ABS (d.jygddlq - d.jygddlqdl) AS jygddlqzc, `d`.`jygdqdpqd` AS `jygdqdpqd`,
d.jyddgwdl, `d`.`jygdqdpgz` AS `jygdqdpgz`,
d.jyddgwdlpb, `d`.`jygdqdppb` AS `jygdqdppb`,
d.jyddgwdlgz, abs(
d.jyddgwdlhj, (
ABS (d.jyddgwdl - d.jyddgwdlyc) AS jyddgwdlzc, `d`.`jygdqdp` - `d`.`jygdqdpqd`
d.jydddcf, )
d.jydddcfqd, ) AS `jygdqdpzc`,
d.jydddcfgz, `d`.`jygddlq` AS `jygddlq`,
d.jydddcfpb, `d`.`jygddlqdl` AS `jygddlqdl`,
ABS (d.jydddcf - d.jydddcfqd) AS jydddcfzc, `d`.`jygddlqgz` AS `jygddlqgz`,
d.jyddqdp, `d`.`jygddlqpb` AS `jygddlqpb`,
d.jyddqdpqd, abs(
d.jyddqdpgz, (
d.jyddqdppb, `d`.`jygddlq` - `d`.`jygddlqdl`
ABS (d.jyddqdp - d.jyddqdpqd) AS jyddqdpzc, )
d.jydddlq, ) AS `jygddlqzc`,
d.jydddlqdl, `d`.`jyddgwdl` AS `jyddgwdl`,
d.jydddlqgz, `d`.`jyddgwdlpb` AS `jyddgwdlpb`,
d.jydddlqpb, `d`.`jyddgwdlgz` AS `jyddgwdlgz`,
ABS (d.jydddlq - d.jydddlqdl) AS jydddlqzc, `d`.`jyddgwdlhj` AS `jyddgwdlhj`,
d.jegdgwdl, abs(
d.jegdgwdlpb, (
d.jegdgwdlgz, `d`.`jyddgwdl` - `d`.`jyddgwdlyc`
d.jegdgwdlhj, )
ABS (d.jegdgwdl - d.jegdgwdlyc) AS jegdgwdlzc, ) AS `jyddgwdlzc`,
d.jegddcf, `d`.`jydddcf` AS `jydddcf`,
d.jegddcfqd, `d`.`jydddcfqd` AS `jydddcfqd`,
d.jegddcfgz, `d`.`jydddcfgz` AS `jydddcfgz`,
d.jegddcfpb, `d`.`jydddcfpb` AS `jydddcfpb`,
ABS (d.jegddcf - d.jegddcfqd) AS jegddcfzc, abs(
d.jegdqdp, (
d.jegdqdpqd, `d`.`jydddcf` - `d`.`jydddcfqd`
d.jegdqdpgz, )
d.jegdqdppb, ) AS `jydddcfzc`,
ABS (d.jegdqdp - d.jegdqdpqd) AS jegdqdpzc, `d`.`jyddqdp` AS `jyddqdp`,
d.jegddlq, `d`.`jyddqdpqd` AS `jyddqdpqd`,
d.jegddlqdl, `d`.`jyddqdpgz` AS `jyddqdpgz`,
d.jegddlqgz, `d`.`jyddqdppb` AS `jyddqdppb`,
d.jegddlqpb, abs(
ABS (d.jegddlq - d.jegddlqdl) AS jegddlqzc, (
d.jeddgwdl, `d`.`jyddqdp` - `d`.`jyddqdpqd`
d.jeddgwdlpb, )
d.jeddgwdlgz, ) AS `jyddqdpzc`,
d.jeddgwdlhj, `d`.`jydddlq` AS `jydddlq`,
ABS (d.jeddgwdl - d.jeddgwdlyc) AS jeddgwdlzc, `d`.`jydddlqdl` AS `jydddlqdl`,
d.jedddcf, `d`.`jydddlqgz` AS `jydddlqgz`,
d.jedddcfqd, `d`.`jydddlqpb` AS `jydddlqpb`,
d.jedddcfgz, abs(
d.jedddcfpb, (
ABS (d.jedddcf - d.jedddcfqd) AS jedddcfzc, `d`.`jydddlq` - `d`.`jydddlqdl`
d.jeddqdp, )
d.jeddqdpqd, ) AS `jydddlqzc`,
d.jeddqdpgz, `d`.`jegdgwdl` AS `jegdgwdl`,
d.jeddqdppb, `d`.`jegdgwdlpb` AS `jegdgwdlpb`,
ABS (d.jeddqdp - d.jeddqdpqd) AS jeddqdpzc, `d`.`jegdgwdlgz` AS `jegdgwdlgz`,
d.jedddlq, `d`.`jegdgwdlhj` AS `jegdgwdlhj`,
d.jedddlqdl, abs(
d.jedddlqgz, (
d.jedddlqpb, `d`.`jegdgwdl` - `d`.`jegdgwdlyc`
ABS (d.jedddlq - d.jedddlqdl) AS jedddlqzc, )
(d.jygddcf + d.jydddcf + d.jegddcf + d.jedddcf) AS dcfzs, ) AS `jegdgwdlzc`,
(d.jygddcfqd + d.jydddcfqd + d.jegddcfqd + d.jedddcfqd) AS dcfqd, `d`.`jegddcf` AS `jegddcf`,
(d.jygddcfgz + d.jydddcfgz + d.jegddcfgz + d.jedddcfgz) AS dcfgz, `d`.`jegddcfqd` AS `jegddcfqd`,
(d.jygddcfpb + d.jydddcfpb + d.jegddcfpb + d.jedddcfpb) AS dcfpb, `d`.`jegddcfgz` AS `jegddcfgz`,
(d.jygdqdp + d.jyddqdp + d.jegdqdp + d.jeddqdp) AS qdpzs, `d`.`jegddcfpb` AS `jegddcfpb`,
(d.jygdqdpqd + d.jyddqdpqd + d.jegdqdpqd + d.jeddqdpqd) AS qdpqd, abs(
(d.jygdqdpgz + d.jyddqdpgz + d.jegdqdpgz + d.jeddqdpgz) AS qdpgz, (
(d.jygdqdppb + d.jyddqdppb + d.jegdqdppb + d.jeddqdppb) AS qdppb, `d`.`jegddcf` - `d`.`jegddcfqd`
(d.jygddlq + d.jydddlq + d.jegddlq + d.jedddlq) AS dlqzs, )
(d.jygddlqdl + d.jydddlqdl + d.jegddlqdl + d.jedddlqdl) AS dlqqd, ) AS `jegddcfzc`,
(d.jygddlqgz + d.jydddlqgz + d.jegddlqgz + d.jedddlqgz) AS dlqgz, `d`.`jegdqdp` AS `jegdqdp`,
(d.jygddlqpb + d.jydddlqpb + d.jegddlqpb + d.jedddlqpb) AS dlqpb, `d`.`jegdqdpqd` AS `jegdqdpqd`,
ABS (d.jygddlq - d.jygddlqdl + d.jydddlq - d.jydddlqdl + d.jegddlq - d.jegddlqdl + d.jedddlq - d.jedddlqdl) AS dlqjt `d`.`jegdqdpgz` AS `jegdqdpgz`,
`d`.`jegdqdppb` AS `jegdqdppb`,
abs(
(
`d`.`jegdqdp` - `d`.`jegdqdpqd`
)
) AS `jegdqdpzc`,
`d`.`jegddlq` AS `jegddlq`,
`d`.`jegddlqdl` AS `jegddlqdl`,
`d`.`jegddlqgz` AS `jegddlqgz`,
`d`.`jegddlqpb` AS `jegddlqpb`,
abs(
(
`d`.`jegddlq` - `d`.`jegddlqdl`
)
) AS `jegddlqzc`,
`d`.`jeddgwdl` AS `jeddgwdl`,
`d`.`jeddgwdlpb` AS `jeddgwdlpb`,
`d`.`jeddgwdlgz` AS `jeddgwdlgz`,
`d`.`jeddgwdlhj` AS `jeddgwdlhj`,
abs(
(
`d`.`jeddgwdl` - `d`.`jeddgwdlyc`
)
) AS `jeddgwdlzc`,
`d`.`jedddcf` AS `jedddcf`,
`d`.`jedddcfqd` AS `jedddcfqd`,
`d`.`jedddcfgz` AS `jedddcfgz`,
`d`.`jedddcfpb` AS `jedddcfpb`,
abs(
(
`d`.`jedddcf` - `d`.`jedddcfqd`
)
) AS `jedddcfzc`,
`d`.`jeddqdp` AS `jeddqdp`,
`d`.`jeddqdpqd` AS `jeddqdpqd`,
`d`.`jeddqdpgz` AS `jeddqdpgz`,
`d`.`jeddqdppb` AS `jeddqdppb`,
abs(
(
`d`.`jeddqdp` - `d`.`jeddqdpqd`
)
) AS `jeddqdpzc`,
`d`.`jedddlq` AS `jedddlq`,
`d`.`jedddlqdl` AS `jedddlqdl`,
`d`.`jedddlqgz` AS `jedddlqgz`,
`d`.`jedddlqpb` AS `jedddlqpb`,
abs(
(
`d`.`jedddlq` - `d`.`jedddlqdl`
)
) AS `jedddlqzc`,
(
(
(
`d`.`jygddcf` + `d`.`jydddcf`
) + `d`.`jegddcf`
) + `d`.`jedddcf`
) AS `dcfzs`,
(
(
(
`d`.`jygddcfqd` + `d`.`jydddcfqd`
) + `d`.`jegddcfqd`
) + `d`.`jedddcfqd`
) AS `dcfqd`,
(
(
(
`d`.`jygddcfgz` + `d`.`jydddcfgz`
) + `d`.`jegddcfgz`
) + `d`.`jedddcfgz`
) AS `dcfgz`,
(
(
(
`d`.`jygddcfpb` + `d`.`jydddcfpb`
) + `d`.`jegddcfpb`
) + `d`.`jedddcfpb`
) AS `dcfpb`,
(
(
(
`d`.`jygdqdp` + `d`.`jyddqdp`
) + `d`.`jegdqdp`
) + `d`.`jeddqdp`
) AS `qdpzs`,
(
(
(
`d`.`jygdqdpqd` + `d`.`jyddqdpqd`
) + `d`.`jegdqdpqd`
) + `d`.`jeddqdpqd`
) AS `qdpqd`,
(
(
(
`d`.`jygdqdpgz` + `d`.`jyddqdpgz`
) + `d`.`jegdqdpgz`
) + `d`.`jeddqdpgz`
) AS `qdpgz`,
(
(
(
`d`.`jygdqdppb` + `d`.`jyddqdppb`
) + `d`.`jegdqdppb`
) + `d`.`jeddqdppb`
) AS `qdppb`,
(
(
(
`d`.`jygddlq` + `d`.`jydddlq`
) + `d`.`jegddlq`
) + `d`.`jedddlq`
) AS `dlqzs`,
(
(
(
`d`.`jygddlqdl` + `d`.`jydddlqdl`
) + `d`.`jegddlqdl`
) + `d`.`jedddlqdl`
) AS `dlqqd`,
(
(
(
`d`.`jygddlqgz` + `d`.`jydddlqgz`
) + `d`.`jegddlqgz`
) + `d`.`jedddlqgz`
) AS `dlqgz`,
(
(
(
`d`.`jygddlqpb` + `d`.`jydddlqpb`
) + `d`.`jegddlqpb`
) + `d`.`jedddlqpb`
) AS `dlqpb`,
abs(
(
(
(
(
(
(
(
`d`.`jygddlq` - `d`.`jygddlqdl`
) + `d`.`jydddlq`
) - `d`.`jydddlqdl`
) + `d`.`jegddlq`
) - `d`.`jegddlqdl`
) + `d`.`jedddlq`
) - `d`.`jedddlqdl`
)
) AS `dlqjt`
FROM FROM
( (
SELECT SELECT
...@@ -5200,735 +5352,1495 @@ FROM ...@@ -5200,735 +5352,1495 @@ FROM
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ高端%' (
AND es.equipment_code = '92110100QY544' (
) AS jygdgwdl, `es`.`position` LIKE '%极Ⅰ高端%'
)
AND (
`es`.`equipment_code` = '92110100QY544'
)
)
) AS `jygdgwdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygdgwdlpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygdgwdlpb`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygdgwdlgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygdgwdlgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygdgwdlhj, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygdgwdlhj`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND ( (
wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' `wes`.`position` LIKE '%极Ⅰ高端%'
OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' )
OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' AND (
) (
AND wesi.`value`= 'true' `wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
) AS jygdgwdlyc, )
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
)
AND (`wesi`.`value` = 'true')
)
) AS `jygdgwdlyc`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ高端%' (
AND es.equipment_code = '92110200UIU44' (
) AS jygddcf, `es`.`position` LIKE '%极Ⅰ高端%'
)
AND (
`es`.`equipment_code` = '92110200UIU44'
)
)
) AS `jygddcf`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygddcfqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygddcfqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygddcfgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleFault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygddcfgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygddcfpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygddcfpb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ高端%' (
AND es.equipment_code = '92110300SS744' (
) AS jygdqdp, `es`.`position` LIKE '%极Ⅰ高端%'
)
AND (
`es`.`equipment_code` = '92110300SS744'
)
)
) AS `jygdqdp`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygdqdpqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygdqdpqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygdqdpgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygdqdpgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygdqdppb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygdqdppb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ高端%' (
AND es.equipment_code = '92110400CRQ44' (
) AS jygddlq, `es`.`position` LIKE '%极Ⅰ高端%'
)
AND (
`es`.`equipment_code` = '92110400CRQ44'
)
)
) AS `jygddlq`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_State' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygddlqdl, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygddlqdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygddlqgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygddlqgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ高端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ高端%'
) AS jygddlqpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jygddlqpb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ低端%' (
AND es.equipment_code = '92110100QY544' (
) AS jyddgwdl, `es`.`position` LIKE '%极Ⅰ低端%'
)
AND (
`es`.`equipment_code` = '92110100QY544'
)
)
) AS `jyddgwdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jyddgwdlpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jyddgwdlpb`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jyddgwdlgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jyddgwdlgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jyddgwdlhj, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
AND (`wesi`.`value` = 'true')
)
) AS `jyddgwdlhj`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND ( (
wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' `wes`.`position` LIKE '%极Ⅰ低端%'
OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' )
OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' AND (
) (
AND wesi.`value`= 'true' `wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
) AS jyddgwdlyc, )
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
)
AND (`wesi`.`value` = 'true')
)
) AS `jyddgwdlyc`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ低端%' (
AND es.equipment_code = '92110200UIU44' (
) AS jydddcf, `es`.`position` LIKE '%极Ⅰ低端%'
)
AND (
`es`.`equipment_code` = '92110200UIU44'
)
)
) AS `jydddcf`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jydddcfqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jydddcfqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jydddcfgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleFault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jydddcfgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jydddcfpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jydddcfpb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ低端%' (
AND es.equipment_code = '92110300SS744' (
) AS jyddqdp, `es`.`position` LIKE '%极Ⅰ低端%'
)
AND (
`es`.`equipment_code` = '92110300SS744'
)
)
) AS `jyddqdp`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jyddqdpqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jyddqdpqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jyddqdpgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jyddqdpgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jyddqdppb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jyddqdppb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅰ低端%' (
AND es.equipment_code = '92110400CRQ44' (
) AS jydddlq, `es`.`position` LIKE '%极Ⅰ低端%'
)
AND (
`es`.`equipment_code` = '92110400CRQ44'
)
)
) AS `jydddlq`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_State' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jydddlqdl, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
)
AND (`wesi`.`value` = 'true')
)
) AS `jydddlqdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jydddlqgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jydddlqgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅰ低端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅰ低端%'
) AS jydddlqpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jydddlqpb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ高端%' (
AND es.equipment_code = '92110100QY544' (
) AS jegdgwdl, `es`.`position` LIKE '%极Ⅱ高端%'
)
AND (
`es`.`equipment_code` = '92110100QY544'
)
)
) AS `jegdgwdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegdgwdlpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegdgwdlpb`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegdgwdlgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegdgwdlgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegdgwdlhj, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegdgwdlhj`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND ( (
wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' `wes`.`position` LIKE '%极Ⅱ高端%'
OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' )
OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' AND (
) (
AND wesi.`value`= 'true' `wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
) AS jegdgwdlyc, )
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
)
AND (`wesi`.`value` = 'true')
)
) AS `jegdgwdlyc`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ高端%' (
AND es.equipment_code = '92110200UIU44' (
) AS jegddcf, `es`.`position` LIKE '%极Ⅱ高端%'
)
AND (
`es`.`equipment_code` = '92110200UIU44'
)
)
) AS `jegddcf`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegddcfqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegddcfqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegddcfgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleFault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegddcfgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegddcfpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegddcfpb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ高端%' (
AND es.equipment_code = '92110300SS744' (
) AS jegdqdp, `es`.`position` LIKE '%极Ⅱ高端%'
)
AND (
`es`.`equipment_code` = '92110300SS744'
)
)
) AS `jegdqdp`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegdqdpqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegdqdpqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegdqdpgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegdqdpgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegdqdppb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegdqdppb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ高端%' (
AND es.equipment_code = '92110400CRQ44' (
) AS jegddlq, `es`.`position` LIKE '%极Ⅱ高端%'
)
AND (
`es`.`equipment_code` = '92110400CRQ44'
)
)
) AS `jegddlq`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_State' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegddlqdl, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegddlqdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegddlqgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegddlqgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ高端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ高端%'
) AS jegddlqpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jegddlqpb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ低端%' (
AND es.equipment_code = '92110100QY544' (
) AS jeddgwdl, `es`.`position` LIKE '%极Ⅱ低端%'
)
AND (
`es`.`equipment_code` = '92110100QY544'
)
)
) AS `jeddgwdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jeddgwdlpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jeddgwdlpb`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jeddgwdlgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jeddgwdlgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jeddgwdlhj, )
AND (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
AND (`wesi`.`value` = 'true')
)
) AS `jeddgwdlhj`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND ( (
wesi.equipment_index_key = 'FFS_TemperatureCable_Shield' `wes`.`position` LIKE '%极Ⅱ低端%'
OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault' )
OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm' AND (
) (
AND wesi.`value`= 'true' `wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
) AS jeddgwdlyc, )
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
)
OR (
`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
)
)
AND (`wesi`.`value` = 'true')
)
) AS `jeddgwdlyc`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ低端%' (
AND es.equipment_code = '92110200UIU44' (
) AS jedddcf, `es`.`position` LIKE '%极Ⅱ低端%'
)
AND (
`es`.`equipment_code` = '92110200UIU44'
)
)
) AS `jedddcf`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jedddcfqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jedddcfqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jedddcfgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jedddcfgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jedddcfpb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jedddcfpb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ低端%' (
AND es.equipment_code = '92110300SS744' (
) AS jeddqdp, `es`.`position` LIKE '%极Ⅱ低端%'
)
AND (
`es`.`equipment_code` = '92110300SS744'
)
)
) AS `jeddqdp`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_Start' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jeddqdpqd, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
)
AND (`wesi`.`value` = 'true')
)
) AS `jeddqdpqd`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jeddqdpgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jeddqdpgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jeddqdppb, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jeddqdppb`,
( (
SELECT SELECT
count(1) count(1)
FROM FROM
wl_equipment_specific es `wl_equipment_specific` `es`
WHERE WHERE
es.position LIKE '%极Ⅱ低端%' (
AND es.equipment_code = '92110400CRQ44' (
) AS jedddlq, `es`.`position` LIKE '%极Ⅱ低端%'
)
AND (
`es`.`equipment_code` = '92110400CRQ44'
)
)
) AS `jedddlq`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_State' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jedddlqdl, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
)
AND (`wesi`.`value` = 'true')
)
) AS `jedddlqdl`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Fault' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jedddlqgz, )
AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
)
AND (`wesi`.`value` = 'true')
)
) AS `jedddlqgz`,
( (
SELECT SELECT
COUNT(DISTINCT(wes.id)) count(DISTINCT `wes`.`id`)
FROM FROM
wl_equipment_specific_index wesi (
LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id `wl_equipment_specific_index` `wesi`
LEFT JOIN `wl_equipment_specific` `wes` ON (
(
`wes`.`id` = `wesi`.`equipment_specific_id`
)
)
)
WHERE WHERE
wes.position LIKE '%极Ⅱ低端%' (
AND wesi.equipment_index_key = 'FFS_Breaker_Shield' (
AND wesi.`value`= 'true' `wes`.`position` LIKE '%极Ⅱ低端%'
) AS jedddlqpb )
) d; AND (
`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
)
AND (`wesi`.`value` = 'true')
)
) AS `jedddlqpb`
) `d`;
-- 今日告警统计，概览4小shiy -- 今日告警统计，概览4小shiy
DROP VIEW IF EXISTS `v_equip_alarm_today_statistics`; DROP VIEW IF EXISTS `v_equip_alarm_today_statistics`;
CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_equip_alarm_today_statistics` AS select count(`wl_equipment_specific_alarm_log`.`confirm_type`) AS `confirmed`,(count(1) - count(`wl_equipment_specific_alarm_log`.`confirm_type`)) AS `pending` from `wl_equipment_specific_alarm_log` where ((to_days(now()) - to_days(`wl_equipment_specific_alarm_log`.`create_date`)) = 0); CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_equip_alarm_today_statistics` AS select count(`wl_equipment_specific_alarm_log`.`confirm_type`) AS `confirmed`,(count(1) - count(`wl_equipment_specific_alarm_log`.`confirm_type`)) AS `pending` from `wl_equipment_specific_alarm_log` where ((to_days(now()) - to_days(`wl_equipment_specific_alarm_log`.`create_date`)) = 0);
...@@ -6152,4 +7064,62 @@ FROM ...@@ -6152,4 +7064,62 @@ FROM
WHERE WHERE
DATEDIFF(begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(end_time,CURRENT_DATE) >= 0 DATEDIFF(begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(end_time,CURRENT_DATE) >= 0
GROUP BY GROUP BY
au.USER_ID; au.USER_ID;
\ No newline at end of file
-- 今日巡查统计日常管理组态屏查询脚本
DROP VIEW IF EXISTS `v_check_point_num`;
CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_check_point_num` AS
SELECT
(
SELECT
ifnull(
sum(`p_plan_task`.`point_num`),
0
)
FROM
`p_plan_task`
WHERE
(
to_days(`p_plan_task`.`begin_time`) - to_days(curdate())
) <= 0
AND (
to_days(`p_plan_task`.`end_time`) - to_days(curdate())
) >= 0
) AS `pointNum`,
(
SELECT
ifnull(
sum(`p_plan_task`.`point_num`),
0
)
FROM
`p_plan_task`
WHERE
`p_plan_task`.`finish_status` = 2
AND (
to_days(`p_plan_task`.`begin_time`) - to_days(curdate())
) <= 0
AND (
to_days(`p_plan_task`.`end_time`) - to_days(curdate())
) >= 0
) AS `finishNum`,
(
SELECT
ifnull(
sum(`p_plan_task`.`point_num`),
0
)
FROM
`p_plan_task`
WHERE
(
`p_plan_task`.`finish_status` = 0
OR `p_plan_task`.`finish_status` = 1
)
AND (
to_days(`p_plan_task`.`begin_time`) - to_days(curdate())
) <= 0
AND (
to_days(`p_plan_task`.`end_time`) - to_days(curdate())
) >= 0
) AS `unFinishNum`;
\ No newline at end of file
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @ 3f16f65c
...@@ -2396,7 +2396,7 @@ ...@@ -2396,7 +2396,7 @@
alter table `wl_video_source` add column `parent_source_ids` text COMMENT '本级及父级建筑ids，冗余树形搜索'; alter table `wl_video_source` add column `parent_source_ids` text COMMENT '本级及父级建筑ids，冗余树形搜索';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="shg" id="1644459872903-1" runAlways="true"> <changeSet author="shg" id="1644459872903-10" runAlways="true">
<comment>`getBuildingParentIds` 存在前后顺序依赖关系所以放在这里</comment> <comment>`getBuildingParentIds` 存在前后顺序依赖关系所以放在这里</comment>
<sql endDelimiter="#"> <sql endDelimiter="#">
DROP FUNCTION IF EXISTS `getBuildingParentIds`# DROP FUNCTION IF EXISTS `getBuildingParentIds`#
...@@ -2686,4 +2686,21 @@ ...@@ -2686,4 +2686,21 @@
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tw" id="2022-04-14">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group_column"/>
</preConditions>
<comment>插入动态表单数据 wl_form_group_column</comment>
<sql>
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000319, 'latitude', '纬度', 'String', 132828674815, 'eq', b'0', 'r_else', 2581805, '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000320, 'longitude', '经度', 'String', 132828674813, 'eq', b'0', 'r_else', 2581805, '2022-03-01 12:04:47');
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 3f16f65c
...@@ -1296,61 +1296,117 @@ ...@@ -1296,61 +1296,117 @@
</select> </select>
<select id="fireWaterSysHydrant" resultType="java.util.Map"> <select id="fireWaterSysHydrant" resultType="java.util.Map">
SELECT SELECT
xhsanhj, xhsanhj,
xhsangz, xhsangz,
xhsanpb, xhsanpb,
ABS(xhsan - xhsanhj- xhsangz-xhsanpb) as xhszc, (xhszc - noZcTotal) AS xhszc,
xhsan xhsan
from FROM
(select (
(SELECT SELECT
count(1) (
FROM `wl_equipment_specific_index` s SELECT
where s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm' count(1)
and s.`value` = 'true') as xhsanhj, FROM
(SELECT `wl_equipment_specific_index` s
count(1) WHERE
FROM `wl_equipment_specific_index` s s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
where s.equipment_index_key = 'FAS_FireHydrantButton_Fault' AND s.`value` = 'true'
and s.`value` = 'true') as xhsangz, ) AS xhsanhj,
(SELECT (
count(1) SELECT
FROM `wl_equipment_specific_index` s count(1)
where s.equipment_index_key = 'FAS_FireHydrantButton_Shield' FROM
and s.`value` = 'true') as xhsanpb, `wl_equipment_specific_index` s
(SELECT WHERE
count(1) s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
from AND s.`value` = 'true'
`wl_equipment_specific_index` si ) AS xhsangz,
where (
si.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm') as xhsan SELECT
) as hydrant count(1)
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
AND s.`value` = 'true'
) AS xhsanpb,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` si
WHERE
si.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
) AS xhsan,
(
SELECT
count(
DISTINCT equipment_specific_id
)
FROM
`wl_equipment_specific_index` s
WHERE
(
s.`value` = 'false'
OR s.`value` IS NULL
)
AND (
s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
)
) AS xhszc,
(
SELECT
count(
DISTINCT equipment_specific_id
)
FROM
`wl_equipment_specific_index` s
WHERE
(
s.`value` = 'true'
)
AND (
s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
)
) AS noZcTotal
) AS hydrant
</select> </select>
<select id="fireWaterSysCollectingDevice" resultType="java.util.Map"> <select id="fireWaterSysCollectingDevice" resultType="java.util.Map">
SELECT SELECT
sbfcjzzyc, sbfcjzzyc,
sbfcjzzbs, sbfcjzzbs,
(sbfcjzz-sbfcjzzyc-sbfcjzzbs) as sbfcjzzzc, ( sbfcjzzzc - noZcTotal ) AS sbfcjzzzc,
sbfcjzz sbfcjzz
from FROM
(select (
(SELECT SELECT
count(1) ( SELECT count( 1 ) FROM `wl_equipment_specific_index` s WHERE s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' AND s.`value` = 'true' ) AS sbfcjzzyc,
FROM `wl_equipment_specific_index` s ( SELECT count( 1 ) FROM `wl_equipment_specific_index` s WHERE s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock' AND s.`value` = 'true' ) AS sbfcjzzbs,
where s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' (
and s.`value` = 'true') as sbfcjzzyc, SELECT
(SELECT count( DISTINCT equipment_specific_id )
count(1) FROM
FROM `wl_equipment_specific_index` s `wl_equipment_specific_index` s
where s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock' WHERE
and s.`value` = 'true') as sbfcjzzbs, ( s.`value` = 'false' OR s.`value` IS NULL )
(SELECT AND ( s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' )
count(1) ) AS sbfcjzz,
from (
`wl_equipment_specific_index` si SELECT
where count( DISTINCT equipment_specific_id )
si.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal') as sbfcjzz FROM
) as collectingDevice `wl_equipment_specific_index` s
WHERE
( s.`value` = 'false' OR s.`value` IS NULL )
AND s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
) AS sbfcjzzzc,
( SELECT count( DISTINCT equipment_specific_id ) FROM `wl_equipment_specific_index` s WHERE ( s.`value` = 'true' ) AND s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' ) AS noZcTotal
) AS collectingDevice
</select> </select>
<select id="fireWaterSysWaterPump" resultType="java.util.Map"> <select id="fireWaterSysWaterPump" resultType="java.util.Map">
select select
......
amos-boot-system-jcs/src/main/resources/application-dev.properties
View file @ 3f16f65c
...@@ -6,7 +6,7 @@ spring.datasource.password=root_123 ...@@ -6,7 +6,7 @@ spring.datasource.password=root_123
## eureka properties: ## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.3.97:10001/eureka/ eureka.client.serviceUrl.defaultZone=http://172.16.3.97:10001/eureka/
## redis properties: ## redis properties:danger/list
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.3.35 spring.redis.host=172.16.3.35
spring.redis.port=6379 spring.redis.port=6379
...@@ -14,7 +14,7 @@ spring.redis.password=yeejoin@2020 ...@@ -14,7 +14,7 @@ spring.redis.password=yeejoin@2020
## ES properties: ## ES properties:
biz.elasticsearch.address=172.16.3.135 biz.elasticsearch.address=172.16.6.60
spring.data.elasticsearch.cluster-name=elasticsearch spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300 spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
...@@ -33,7 +33,7 @@ rule.definition.default-agency=jcs ...@@ -33,7 +33,7 @@ rule.definition.default-agency=jcs
rule.definition.localIp=172.16.3.35 rule.definition.localIp=172.16.3.35
## mongodb properties: ## mongodb properties:
spring.data.mongodb.uri=mongodb://172.16.3.35:27017/command_db #spring.data.mongodb.uri=mongodb://172.16.6.60:27017/command_db
## file properties: ## file properties:
file.url=http://39.98.45.134:9000/ file.url=http://39.98.45.134:9000/
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 3f16f65c
...@@ -2873,6 +2873,44 @@ ...@@ -2873,6 +2873,44 @@
update cb_dynamic_form_column set field_name = '是否重点单位',field_type = 'radio',column_config = '{"url": "", "data": [], "dict": "SFZD", "type": "dict"}'where sequence_nbr=7; update cb_dynamic_form_column set field_name = '是否重点单位',field_type = 'radio',column_config = '{"url": "", "data": [], "dict": "SFZD", "type": "dict"}'where sequence_nbr=7;
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="chenzhao" id="2022-04-14-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group"/>
</preConditions>
<comment>add data wl_form_group</comment>
<sql>
INSERT INTO wl_form_group (`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674824, '储罐', 'r_tank', 'room', 'edit,delete,room_add', 258105, '2022-04-14 10:15:10');
</sql>
</changeSet>
<changeSet author="chenzhao" id="2022-04-14-2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group"/>
</preConditions>
<comment>add data wl_form_group</comment>
<sql>
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000329, 'company_code', '单位编码', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000330, 'tank_code', '储罐编号', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000321, 'tank_name', '储罐编号', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000322, 'storage_name', '储存物名称', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000323, 'storage_nature', '储存物性质', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000324, 'storage_form', '储存物形式', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000325, 'storage_capacity', '储存容量', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000326, 'storage_plan_name', '储罐区平面图名称', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000327, 'storage_plan', '储罐区平面图图纸', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000328, 'company_code', '消防设施情况', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
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