Skip to content

A
amos-boot-biz
Commit f7186567 authored by KeYong's avatar KeYong
Browse files
Options

拓补图功能

parent 7d756585
Hide whitespace changes
Inline Side-by-side
Showing with 788 additions and 269 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java
View file @ f7186567
...@@ -135,4 +135,12 @@ public class EquipmentSpecific extends BaseEntity { ...@@ -135,4 +135,12 @@ public class EquipmentSpecific extends BaseEntity {
* 存放位置冗余字段 * 存放位置冗余字段
*/ */
private Long warehouseStructureId; private Long warehouseStructureId;
@ApiModelProperty(value = "告警状态")
@TableField(exist = false)
private Integer status;
@ApiModelProperty(value = "系统名称")
@TableField(exist = false)
private String systemName;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java
View file @ f7186567
...@@ -125,6 +125,10 @@ public class EquipmentSpecificAlarmLog extends BaseEntity { ...@@ -125,6 +125,10 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
@TableField("equipment_index_id") @TableField("equipment_index_id")
private Long equipmentIndexId; private Long equipmentIndexId;
@ApiModelProperty(value = "报警状态1报警0恢复")
@TableField("status")
private Integer status;
@ApiModelProperty(value = "画布id") @ApiModelProperty(value = "画布id")
@TableField(exist = false) @TableField(exist = false)
private Long sceneId; private Long sceneId;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java
View file @ f7186567
...@@ -109,6 +109,16 @@ public class CommonPageInfoParam extends CommonPageable { ...@@ -109,6 +109,16 @@ public class CommonPageInfoParam extends CommonPageable {
*/ */
private List<String> buildIds; private List<String> buildIds;
private String status;
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setWarehouseStructureName(String warehouseStructureName) { public void setWarehouseStructureName(String warehouseStructureName) {
this.warehouseStructureName = warehouseStructureName; this.warehouseStructureName = warehouseStructureName;
} }
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java
View file @ f7186567
...@@ -55,6 +55,8 @@ public class CommonPageParamUtil { ...@@ -55,6 +55,8 @@ public class CommonPageParamUtil {
param.setBuildId(toString(queryRequests.get(i).getValue())); param.setBuildId(toString(queryRequests.get(i).getValue()));
} else if("buildIds".equals(name)){ } else if("buildIds".equals(name)){
param.setBuildIds((List<String>)queryRequests.get(i).getValue()); param.setBuildIds((List<String>)queryRequests.get(i).getValue());
} else if("status".equals(name)){
param.setStatus(toString(queryRequests.get(i).getValue()));
} }
} }
if(commonPageable !=null){ if(commonPageable !=null){
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/TopographyAlarmVo.java 0 → 100644
View file @ f7186567
package com.yeejoin.equipmanage.common.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author keyong
* @title: TopographyAlarmVo
* <pre>
* @description: TODO
* </pre>
* @date 2021/12/29 18:57
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class TopographyAlarmVo {
private Date createDate;
private String fireEquipmentSpecificIndexName;
private String fireEquipmentName;
private String warehouseStructureName;
private String equipmentName;
private String handleStatus;
private String handleType;
private String alarmType;
private String alarmContent;
private String status;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/TopographyIotDataVO.java 0 → 100644
View file @ f7186567
package com.yeejoin.equipmanage.common.vo;
import lombok.Data;
/**
* @author keyong
* @title: IotDataVO
* <pre>
* @description: 物联系统发送的增量数据封装VO
* </pre>
* @date 2021/1/7 17:44
*/
@Data
public class TopographyIotDataVO {
private String name;
private Object value;
private String unit;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/TopographyIotVo.java 0 → 100644
View file @ f7186567
package com.yeejoin.equipmanage.common.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author keyong
* @title: TopographyAlarmVo
* <pre>
* @description: TODO
* </pre>
* @date 2021/12/29 18:57
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class TopographyIotVo {
private Date time;
private List<TopographyIotDataVO> list;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ f7186567
package com.yeejoin.equipmanage.controller; package com.yeejoin.equipmanage.controller;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.MediaType;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.equipmanage.common.entity.EquProperty; import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail; import com.yeejoin.equipmanage.common.entity.dto.TopographyNodeDetailDTO;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
import com.yeejoin.equipmanage.common.entity.StockDetail;
import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO; import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
import com.yeejoin.equipmanage.common.enums.ExcelEnums; import com.yeejoin.equipmanage.common.enums.ExcelEnums;
import com.yeejoin.equipmanage.common.utils.ExcelUtils; import com.yeejoin.equipmanage.common.utils.ExcelUtils;
...@@ -51,18 +17,30 @@ import com.yeejoin.equipmanage.fegin.JcsFeign; ...@@ -51,18 +17,30 @@ import com.yeejoin.equipmanage.fegin.JcsFeign;
import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper; import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
import com.yeejoin.equipmanage.mapper.ManufacturerInfoMapper; import com.yeejoin.equipmanage.mapper.ManufacturerInfoMapper;
import com.yeejoin.equipmanage.mapper.StockDetailMapper; import com.yeejoin.equipmanage.mapper.StockDetailMapper;
import com.yeejoin.equipmanage.service.IEquipmentDetailService; import com.yeejoin.equipmanage.service.*;
import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce; import com.yeejoin.equipmanage.service.impl.TopographyNodeDetailService;
import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
import com.yeejoin.equipmanage.service.IExcelService;
import com.yeejoin.equipmanage.service.IStockService;
import com.yeejoin.equipmanage.service.ISyncDataService;
import com.yeejoin.equipmanage.service.IWarehouseStructureService;
import com.yeejoin.equipmanage.utils.ExcelUtil; import com.yeejoin.equipmanage.utils.ExcelUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.MediaType;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*;
/** /**
* @author wujiang * @author wujiang
...@@ -219,11 +197,11 @@ public class EquipmentDetailController extends AbstractBaseController { ...@@ -219,11 +197,11 @@ public class EquipmentDetailController extends AbstractBaseController {
} }
/*** /***
* *
* 修改 * 修改
* **/ * **/
@RequestMapping(value = "equipment/updateById", method = RequestMethod.PUT) @RequestMapping(value = "equipment/updateById", method = RequestMethod.PUT)
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改") @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ f7186567
package com.yeejoin.equipmanage.controller; package com.yeejoin.equipmanage.controller;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.TopographyLineDTO; import com.yeejoin.equipmanage.common.entity.dto.TopographyLineDTO;
import com.yeejoin.equipmanage.common.entity.dto.TopographyNodeDTO; import com.yeejoin.equipmanage.common.entity.dto.TopographyNodeDTO;
import com.yeejoin.equipmanage.common.entity.dto.TopographyNodeDetailDTO;
import com.yeejoin.equipmanage.common.entity.dto.TopographyTreeDTO; import com.yeejoin.equipmanage.common.entity.dto.TopographyTreeDTO;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
import com.yeejoin.equipmanage.common.enums.TopoNodeTypeEnum; import com.yeejoin.equipmanage.common.enums.TopoNodeTypeEnum;
import com.yeejoin.equipmanage.common.utils.*;
import com.yeejoin.equipmanage.common.vo.*;
import com.yeejoin.equipmanage.mapper.*;
import com.yeejoin.equipmanage.service.*;
import com.yeejoin.equipmanage.service.impl.TopographyNodeDetailService;
import com.yeejoin.equipmanage.service.impl.TopographyService; import com.yeejoin.equipmanage.service.impl.TopographyService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.http.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* <p> * <p>
...@@ -43,13 +51,47 @@ import io.swagger.annotations.ApiParam; ...@@ -43,13 +51,47 @@ import io.swagger.annotations.ApiParam;
@RestController @RestController
@Api(tags = "网络拓扑Api") @Api(tags = "网络拓扑Api")
@RequestMapping(value = "/topography") @RequestMapping(value = "/topography")
public class TopographyController public class TopographyController extends AbstractBaseController {
{
private final Logger logger = LogManager.getLogger(TopographyController.class);
@Autowired
private TopographyService topographyService;
@Autowired
private TopographyNodeDetailService topographyNodeDetailService;
private final Logger logger = LogManager.getLogger(TopographyController.class); @Autowired
IEquipmentSpecificAlarmService equipmentSpecificAlarmService;
@Autowired
private TopographyService topographyService; @Autowired
IEquipmentDetailService iEquipmentDetailService;
@Autowired
EquipmentDetailMapper equipmentDetailMapper;
@Autowired
private StockDetailMapper stockDetailMapper;
@Autowired
IStockService iStockService;
@Autowired
IEquipmentSpecificSerivce equipmentSpecificService;
@Autowired
IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService;
@Autowired
EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
@Autowired
private RestTemplate restTemplate;
@Autowired
FireFightingSystemMapper fireFightingSystemMapper;
@Autowired
IEquipmentSpecificAlarmService iEquipmentSpecificAlarmService;
@Autowired
IEquipmentIndexService equipmentIndexService;
@Autowired
EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
@Autowired
IEquipmentService iEquipmentService;
@Value("${iot.vehicle.track}")
private String iotServerName;
// /** // /**
// * 拓扑图-树 // * 拓扑图-树
...@@ -187,42 +229,42 @@ public class TopographyController ...@@ -187,42 +229,42 @@ public class TopographyController
// topographyService.testAbnormal(param); // topographyService.testAbnormal(param);
// return ResponseHelper.buildResponse(); // return ResponseHelper.buildResponse();
// } // }
/** /**
* 网络拓扑图-树 * 网络拓扑图-树
* *
* @param type 节点类型 * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "网络拓扑图-树", notes = "网络拓扑图-树") @ApiOperation(value = "网络拓扑图-树", notes = "网络拓扑图-树")
@RequestMapping(value = "/webTree", method = RequestMethod.GET) @RequestMapping(value = "/webTree", method = RequestMethod.GET)
public ResponseModel<Collection<TopographyTreeDTO>> webTree() { public ResponseModel<Collection<TopographyTreeDTO>> webTree() {
//获取当前登录人的公司code //获取当前登录人的公司code
Collection<TopographyTreeDTO> list = topographyService.getTree(TopoNodeTypeEnum.网络拓扑图.getType()); Collection<TopographyTreeDTO> list = topographyService.getTree(TopoNodeTypeEnum.网络拓扑图.getType());
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
/** /**
* 网络拓扑图 * 网络拓扑图
* *
* @param type 节点类型 * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "网络拓扑图", notes = "拓扑图") @ApiOperation(value = "网络拓扑图", notes = "拓扑图")
@RequestMapping(value = "/webNodes/{treeid}", method = RequestMethod.GET) @RequestMapping(value = "/webNodes/{treeid}", method = RequestMethod.GET)
public ResponseModel<Map<String,Object>> webNodes(@ApiParam(value = "树id", required = false) @PathVariable String treeid) { public ResponseModel<Map<String, Object>> webNodes(@ApiParam(value = "树id", required = false) @PathVariable String treeid) {
//获取当前登录人的公司code //获取当前登录人的公司code
List<TopographyNodeDTO> nodes = topographyService.getNodes(treeid, TopoNodeTypeEnum.网络拓扑图.getType()); List<TopographyNodeDTO> nodes = topographyService.getNodes(treeid, TopoNodeTypeEnum.网络拓扑图.getType());
List<TopographyLineDTO> links = topographyService.getLinks(treeid, TopoNodeTypeEnum.网络拓扑图.getType()); List<TopographyLineDTO> links = topographyService.getLinks(treeid, TopoNodeTypeEnum.网络拓扑图.getType());
Map<String,Object> results = new HashMap<>(); Map<String, Object> results = new HashMap<>();
results.put("nodeData", nodes); results.put("nodeData", nodes);
results.put("linkData", links); results.put("linkData", links);
return ResponseHelper.buildResponse(results); return ResponseHelper.buildResponse(results);
} }
// @DeleteMapping("/webTree/{treeid}") // @DeleteMapping("/webTree/{treeid}")
// @TycloudOperation(ApiLevel = UserType.AGENCY) // @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(value = "删除树数据", notes = "删除树数据") // @ApiOperation(value = "删除树数据", notes = "删除树数据")
...@@ -249,38 +291,38 @@ public class TopographyController ...@@ -249,38 +291,38 @@ public class TopographyController
// //
// return ResponseHelper.buildResponse(topographyService.getTree(reginParams.getCompany().getOrgCode(),TopoNodeTypeEnum.网络拓扑图.getType())); // return ResponseHelper.buildResponse(topographyService.getTree(reginParams.getCompany().getOrgCode(),TopoNodeTypeEnum.网络拓扑图.getType()));
// } // }
/** /**
* 保存网络拓扑图 * 保存网络拓扑图
* *
* @param type 节点类型 * @param
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "保存网络拓扑图", notes = "保存网络拓扑图") @ApiOperation(value = "保存网络拓扑图", notes = "保存网络拓扑图")
@RequestMapping(value = "/webNodes", method = RequestMethod.POST) @RequestMapping(value = "/webNodes", method = RequestMethod.POST)
public ResponseModel<Boolean> saveWebNodes(@ApiParam(value = "", required = false) @RequestBody JSONObject topography) { public ResponseModel<Boolean> saveWebNodes(@ApiParam(value = "", required = false) @RequestBody JSONObject topography) {
JSONArray nodes = topography.getJSONArray("nodeData"); JSONArray nodes = topography.getJSONArray("nodeData");
List<TopographyNodeDTO> nodeData = JSON.parseArray(JSON.toJSONString(nodes), TopographyNodeDTO.class); List<TopographyNodeDTO> nodeData = JSON.parseArray(JSON.toJSONString(nodes), TopographyNodeDTO.class);
topographyService.saveNodes(nodeData); topographyService.saveNodes(nodeData);
return ResponseHelper.buildResponse(true); return ResponseHelper.buildResponse(true);
} }
/** /**
* 节点详情 * 节点详情
* *
* @param type 节点类型 * @param
* @return * @return
*/ */
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "节点详情", notes = "节点详情") @ApiOperation(value = "节点详情", notes = "节点详情")
@RequestMapping(value = "/nodeDetail/{nodeid}", method = RequestMethod.GET) @RequestMapping(value = "/nodeDetail/{nodeid}", method = RequestMethod.GET)
public ResponseModel<List<Map>> nodeDetail(@ApiParam(value = "nodeid", required = false) @PathVariable String nodeid) { public ResponseModel<List<Map>> nodeDetail(@ApiParam(value = "nodeid", required = false) @PathVariable String nodeid) {
List<Map> nodeDetail = topographyService.getNodeDetail(nodeid); List<Map> nodeDetail = topographyService.getNodeDetail(nodeid);
return ResponseHelper.buildResponse(nodeDetail); return ResponseHelper.buildResponse(nodeDetail);
} }
// /** // /**
// * 动环拓扑图-树 // * 动环拓扑图-树
// * // *
...@@ -447,5 +489,292 @@ public class TopographyController ...@@ -447,5 +489,292 @@ public class TopographyController
// } // }
// return CommonResponseUtil.success(); // return CommonResponseUtil.success();
// } // }
/***
*
* 根拓补节点id查询详情
*
* **/
@RequestMapping(value = "/equipment/detail", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据节点id查询详情", notes = "根据节点id查询详情")
public EquipmentDate selectEquipmentDateById(@RequestParam(required = false) String id) {
TopographyNodeDetailDTO detailDTO = topographyNodeDetailService.queryByNodeid(id);
if (null == id || null == detailDTO || !StringUtil.isNotEmpty(detailDTO.getEqpId())) {
throw new RuntimeException("节点信息错误或此节点下未绑定装备！");
}
String eqpId = detailDTO.getEqpId();
EquipmentDate equipmentDate = new EquipmentDate();
EquipmentSpecific equipmentSpecific = equipmentSpecificService.getById(eqpId);
QueryWrapper<EquipmentSpecificAlarm> wrapper = new QueryWrapper<>();
wrapper.eq("equipment_specific_id", eqpId);
wrapper.orderByDesc("create_date");
List<EquipmentSpecificAlarm> list = equipmentSpecificAlarmService.getBaseMapper().selectList(wrapper);
EquipmentSpecificAlarm alarm;
if (0 > list.size()) {
alarm = list.get(0);
equipmentSpecific.setStatus(alarm.getStatus());
} else {
equipmentSpecific.setStatus(0);
}
equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
String sysName = this.getSystemNameBySpeId(equipmentSpecific);
equipmentSpecific.setSystemName(sysName);
EquipmentDetail equipmentDetail = iEquipmentDetailService.getOneById(equipmentSpecific.getEquipmentDetailId());
StockDetail stockDetail = null;
//消防装备默认分支
List<StockDetail> stockDetails = stockDetailMapper.selectList(new LambdaQueryWrapper<StockDetail>().eq(StockDetail::getEquipmentSpecificId, eqpId));
if (!stockDetails.isEmpty()) {
stockDetail = stockDetails.get(0);
equipmentSpecific.setStockDetail(stockDetail);
}
if (stockDetail != null) {
equipmentSpecific.setStock(iStockService.getById(stockDetail.getStockId()));
}
equipmentDate.setEquipmentDetail(equipmentDetail);
equipmentDate.setEquipmentSpecific(equipmentSpecific);
return equipmentDate;
}
public String getSystemNameBySpeId(EquipmentSpecific equipmentSpecific) {
List<FireFightingSystemEntity> sys = new ArrayList<>();
String[] ids;
String sysIds = equipmentSpecific.getSystemId();
if (StringUtil.isNotEmpty(sysIds)) {
if (-1 != sysIds.indexOf(",")) {
ids = sysIds.split(",");
sys = fireFightingSystemMapper.getFightingSysByIds(ids);
} else {
FireFightingSystemEntity entity = fireFightingSystemMapper.selectById(Long.valueOf(sysIds));
sys.add(entity);
}
}
StringBuilder sb = new StringBuilder();
sys.forEach(x -> {
if (0 < sb.length()) {
sb.append(",");
}
sb.append(x.getName());
});
return sb.toString();
}
/***
*
* 根拓补节点id查询告警信息（未恢复或者所有）
*
* **/
@RequestMapping(value = "/equipment/alarm", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据节点id查询告警信息", notes = "根据节点id查询告警信息")
public ResponseModel getAlarmInfo(@RequestParam(required = false) String id, @RequestParam(required = false) int status,
@RequestParam(required = false) String beginDate, @RequestParam(required = false) String endDate,
CommonPageable commonPageable) {
TopographyNodeDetailDTO detailDTO = topographyNodeDetailService.queryByNodeid(id);
if (null == id || null == detailDTO || !StringUtil.isNotEmpty(detailDTO.getEqpId())) {
throw new RuntimeException("节点信息错误或此节点下未绑定装备！");
}
EquipmentSpecific equipmentSpecific = equipmentSpecificService.getById(detailDTO.getEqpId());
List<CommonRequest> queryRequests = new ArrayList<>();
CommonRequest request = new CommonRequest();
request.setName("beginDate");
request.setValue(StringUtil.isNotEmpty(beginDate) ? StringUtils.trimToNull(beginDate).substring(0, 10) + " 00:00:00" : null);
queryRequests.add(request);
CommonRequest request1 = new CommonRequest();
request1.setName("endDate");
request1.setValue(StringUtil.isNotEmpty(endDate) ? StringUtils.trimToNull(endDate).substring(0, 10) + " 23:59:59" : null);
queryRequests.add(request1);
CommonRequest request2 = new CommonRequest();
request2.setName("id");
request2.setValue(StringUtil.isNotEmpty(String.valueOf(equipmentSpecific.getId())) ? StringUtils.trimToNull(String.valueOf(equipmentSpecific.getId())) : null);
queryRequests.add(request2);
CommonRequest request3 = new CommonRequest();
request3.setName("status");
request3.setValue(StringUtil.isNotEmpty(status) ? StringUtils.trimToNull(String.valueOf(status)) : null);
queryRequests.add(request3);
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
Page<TopographyAlarmVo> list = iEquipmentSpecificAlarmService.listAlarmsPageForTopography(param);
return CommonResponseUtil.success(list);
}
/**
* 根拓补节点id查询当前节点最新物联信息
**/
@RequestMapping(value = "/equipment/iot/info", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据节点id查询当前物联信息", notes = "根据节点id查询当前物联信息")
public Map<String, Object> getEquipmentIotInfo(@RequestParam(required = false) String id) {
TopographyNodeDetailDTO detailDTO = topographyNodeDetailService.queryByNodeid(id);
if (null == id || null == detailDTO || !StringUtil.isNotEmpty(detailDTO.getEqpId())) {
throw new RuntimeException("节点信息错误或此节点下未绑定装备！");
}
String eqpId = detailDTO.getEqpId();
EquipmentSpecific equipmentSpecific = equipmentSpecificService.getById(eqpId);
EquipmentDetail equipmentDetail = iEquipmentDetailService.getById(equipmentSpecific.getEquipmentDetailId());
Long equipmentId = equipmentDetail.getEquipmentId();
HashMap<String, List> map = new HashMap<>();
ConcurrentHashMap map1 = new ConcurrentHashMap();
List<String> list = equipmentIndexService.getGruopName(equipmentId);
list.forEach(x -> {
QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
wrapper.eq("equipment_id", equipmentId);
wrapper.eq("group_name", x);
wrapper.orderByAsc("sort_num");
List<EquProperty> properList = new ArrayList<>();
equipmentIndexService.list(wrapper).forEach(y -> {
EquProperty equProperty = new EquProperty();
equProperty.setEquipmentIndexId(y.getId());
equProperty.setIsIot(y.getIsIot());
equProperty.setPerfQuotaName(y.getPerfQuotaName());
equProperty.setEquipmentIndexName(y.getPerfQuotaName());
equProperty.setGroupName(y.getGroupName());
equProperty.setValue(y.getPerfValue());
equProperty.setUnitName(y.getUnitName());
equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
properList.add(equProperty);
});
map.put(x, properList);
});
QueryWrapper<EquipmentIndex> wrappernull = new QueryWrapper<>();
wrappernull.isNull("group_name").or().eq("group_name", " ");
wrappernull.eq("equipment_id", equipmentId);
wrappernull.orderByAsc("sort_num");
List<EquProperty> properList = new ArrayList<>();
equipmentIndexService.list(wrappernull).forEach(y -> {
EquProperty equProperty = new EquProperty();
equProperty.setEquipmentIndexId(y.getId());
equProperty.setPerfQuotaName(y.getPerfQuotaName());
equProperty.setEquipmentIndexName(y.getPerfQuotaName());
equProperty.setIsIot(y.getIsIot());
equProperty.setGroupName(y.getGroupName());
equProperty.setValue(y.getPerfValue());
equProperty.setUnitName(y.getUnitName());
equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
properList.add(equProperty);
});
properList.forEach(e -> {
List<EquipmentIndexVO> equipmentIndexList = equipmentSpecificIndexMapper.getEquipIndexByIndexId(e.getEquipmentIndexId(), equipmentSpecific.getId());
if (equipmentIndexList.size() > 0) {
if (StringUtil.isNotEmpty(equipmentIndexList.get(0).getValue())) {
e.setValue(equipmentIndexList.get(0).getValue());
} else {
e.setValue("");
}
} else {
e.setValue("");
}
});
//判断map中是否有key为’其他‘的数据，提取单独处理
List<EquProperty> otherProperList = map.get("其他");
if (otherProperList != null && otherProperList.size() > 0) {
otherProperList.addAll(properList);
map.put("其他", otherProperList);
} else {
map.put("其他", properList);
}
Equipment byId = iEquipmentService.getById(equipmentId);
Map<String, Object> re = new HashMap<>();
re.put("res", map);
// re.put("pre", byId.getPrefQuota()); // 非核心参数此处不需要
return re;
}
/***
*
* 根拓补节点id查询当前节点物联数据记录
*
* **/
@RequestMapping(value = "/equipment/info", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据节点id查询当前节点物联数据记录", notes = "根据节点id查询当前节点物联数据记录")
public ResponseModel getEquipmentIotInfo(@RequestParam(required = false) String id, @RequestParam(required = false) String beginDate,
@RequestParam(required = false) String endDate) {
TopographyNodeDetailDTO detailDTO = topographyNodeDetailService.queryByNodeid(id);
if (null == id || null == detailDTO || !StringUtil.isNotEmpty(detailDTO.getEqpId())) {
throw new RuntimeException("节点信息错误或此节点下未绑定装备！");
}
String eqpId = detailDTO.getEqpId();
EquipmentSpecific equipmentSpecific = equipmentSpecificService.getById(eqpId);
String iotCode = equipmentSpecific.getIotCode();
String prefix = null;
String suffix = null;
if (iotCode.length() > 8) {
prefix = iotCode.substring(0, 8);
suffix = iotCode.substring(8);
} else {
return CommonResponseUtil.failure("装备物联编码错误，请确认！");
}
LonAndLatEntityVo lonAndLatEntityVo = new LonAndLatEntityVo();
String url = iotServerName;
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
headers.set("Content-Type", "application/json");
headers.set("product", getProduct());
headers.set("token", getToken());
headers.set("appKey", getAppKey());
HttpEntity httpEntity = new HttpEntity<>(lonAndLatEntityVo, headers);
ResponseEntity<FeignClientResult> feignClientResult = null;
try {
feignClientResult = restTemplate.exchange("http://" + url
+ "/iot/v1/livedata/list?timeStart=" + beginDate + "&timeEnd=" + endDate + "&productKey=" + prefix + "&deviceName=" + suffix,
HttpMethod.GET, httpEntity, FeignClientResult.class);
} catch (Exception e) {
e.printStackTrace();
}
if (null != feignClientResult && feignClientResult.getBody().getStatus() == 200) {
List<TopographyIotVo> list = new ArrayList<>();
if (null != feignClientResult.getBody().getResult()) {
String json = JSON.toJSONString(feignClientResult.getBody().getResult());
JSONObject jsonObject = JSONObject.parseObject(json);
Iterator it = jsonObject.entrySet().iterator();
List<IotDataVO> iotDatalist = new ArrayList<IotDataVO>();
while (it.hasNext()) {
IotDataVO iotDataVO = new IotDataVO();
Map.Entry<String, Object> entry = (Map.Entry<String, Object>) it.next();
if (!"name".equals(entry.getKey()) || !"deviceName".equals(entry.getKey()) || !"time".equals(entry.getKey())) {
iotDataVO.setKey(entry.getKey());
iotDataVO.setValue(entry.getValue());
}
iotDatalist.add(iotDataVO);
}
List<EquipmentSpecificIndex> indexes = equipmentSpecificIndexMapper.getEquipmentSpeIndexByIotCode(iotCode);
if (0 <indexes.size()) {
iotDatalist.forEach(iotDataVO -> {
TopographyIotVo iotVo = new TopographyIotVo();
List<TopographyIotDataVO> lists = new ArrayList<TopographyIotDataVO>();
indexes.forEach(x -> {
iotVo.setTime(x.getUpdateDate());
if (x.getNameKey().equals(iotDataVO.getKey())) {
TopographyIotDataVO dataVO = new TopographyIotDataVO();
dataVO.setName(x.getIndexName());
dataVO.setValue(x.getValue());
dataVO.setUnit(x.getIndexUnitName());
lists.add(dataVO);
}
});
iotVo.setList(lists);
list.add(iotVo);
});
}
}
return CommonResponseUtil.success(list);
} else {
logger.error("注：iotCode为 (" + iotCode + ") 的装备不存在于物联系统中！");
return CommonResponseUtil.success();
}
}
public static Map<String, String> mapStringToMap(String str) {
str = str.substring(1, str.length() - 1);
String[] strs = str.split(",");
Map<String, String> map = new HashMap<String, String>();
for (String string : strs) {
String key = string.split("=")[0];
String value = string.split("=")[1];
map.put(key, value);
}
return map;
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificAlarmMapper.java
View file @ f7186567
...@@ -185,4 +185,5 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif ...@@ -185,4 +185,5 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
* @return * @return
*/ */
List<EquipmentSpecificAlarm> getEquipListBySpecific(@Param("status") Boolean status, @Param("equipmentSpecificId") Long equipmentSpecificId); List<EquipmentSpecificAlarm> getEquipListBySpecific(@Param("status") Boolean status, @Param("equipmentSpecificId") Long equipmentSpecificId);
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificIndexMapper.java
View file @ f7186567
...@@ -46,6 +46,8 @@ public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecif ...@@ -46,6 +46,8 @@ public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecif
*/ */
List<EquipmentSpecificIndex> getEquipmentSpeIndexByIotCode(String iotCode); List<EquipmentSpecificIndex> getEquipmentSpeIndexByIotCode(String iotCode);
List<EquipmentSpecificIndex> getEquipmentSpeIndexDataByIotCode(String iotCode);
/** /**
* 通过设备id查询 * 通过设备id查询
* *
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificAlarmService.java
View file @ f7186567
...@@ -10,6 +10,7 @@ import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam; ...@@ -10,6 +10,7 @@ import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam;
import com.yeejoin.equipmanage.common.vo.AlarmDataVO; import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
import com.yeejoin.equipmanage.common.vo.AlarmEquipMockDataVO; import com.yeejoin.equipmanage.common.vo.AlarmEquipMockDataVO;
import com.yeejoin.equipmanage.common.vo.AlarmListDataVO; import com.yeejoin.equipmanage.common.vo.AlarmListDataVO;
import com.yeejoin.equipmanage.common.vo.TopographyAlarmVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap; import java.util.HashMap;
...@@ -42,6 +43,9 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif ...@@ -42,6 +43,9 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
org.springframework.data.domain.Page<AlarmListDataVO> listAlarmsPage(CommonPageInfoParam param); org.springframework.data.domain.Page<AlarmListDataVO> listAlarmsPage(CommonPageInfoParam param);
org.springframework.data.domain.Page<TopographyAlarmVo> listAlarmsPageForTopography(CommonPageInfoParam param);
Map<String, Object> getSpecificInfoById(Long id); Map<String, Object> getSpecificInfoById(Long id);
Map<String, Object> getSpecificInfoByCode(String code); Map<String, Object> getSpecificInfoByCode(String code);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java
View file @ f7186567
...@@ -12,9 +12,11 @@ import java.util.Enumeration; ...@@ -12,9 +12,11 @@ import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.yeejoin.equipmanage.common.vo.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -43,10 +45,6 @@ import com.yeejoin.equipmanage.common.enums.EquipmentDataEnum; ...@@ -43,10 +45,6 @@ import com.yeejoin.equipmanage.common.enums.EquipmentDataEnum;
import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam; import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam;
import com.yeejoin.equipmanage.common.utils.DateUtils; import com.yeejoin.equipmanage.common.utils.DateUtils;
import com.yeejoin.equipmanage.common.utils.StringUtil; import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
import com.yeejoin.equipmanage.common.vo.AlarmEquipMockDataVO;
import com.yeejoin.equipmanage.common.vo.AlarmListDataVO;
import com.yeejoin.equipmanage.common.vo.EquipmentAlarmDownloadVO;
import com.yeejoin.equipmanage.mapper.ConfirmAlarmMapper; import com.yeejoin.equipmanage.mapper.ConfirmAlarmMapper;
import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper; import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper; import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
...@@ -223,6 +221,39 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec ...@@ -223,6 +221,39 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
} }
@Override @Override
public org.springframework.data.domain.Page<TopographyAlarmVo> listAlarmsPageForTopography(CommonPageInfoParam param) {
Page page = new Page(param.getPageNumber(), param.getPageSize());
Page<Map<String, Object>> mybatisResult = this.baseMapper.pageAlarmsInfo(page, param);
List<TopographyAlarmVo> res = new ArrayList<>();
if (mybatisResult.getSize() > 0) {
mybatisResult.getRecords().forEach(x -> {
TopographyAlarmVo dataVO = new TopographyAlarmVo();
try {
dataVO.setCreateDate(DateUtils.dateParse(String.valueOf(x.get("createDate")),DateUtils.DATE_TIME_T_PATTERN));
} catch (ParseException e) {
e.printStackTrace();
}
dataVO.setFireEquipmentSpecificIndexName(String.valueOf(x.get("fireEquipmentSpecificIndexName")));
dataVO.setFireEquipmentName(String.valueOf(x.get("fireEquipmentName")));
dataVO.setWarehouseStructureName(String.valueOf(x.get("warehouseStructureName")));
dataVO.setEquipmentName(null == x.get("equipmentName") ? null : String.valueOf(x.get("equipmentName")));
dataVO.setHandleStatus(String.valueOf(x.get("handleStatus")));
dataVO.setStatus(String.valueOf(x.get("status")));
Object type = x.get("type");
if (AlarmTypeEnum.HZGJ.getCode().equals(type) || AlarmTypeEnum.GZGJ.getCode().equals(type)
|| AlarmTypeEnum.PB.getCode().equals(type)) {
dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
}
dataVO.setAlarmContent(x.get("fireEquipmentName") + dataVO.getAlarmType());
dataVO.setHandleType(null == x.get("handleType") ? null : String.valueOf(x.get("handleType")));
res.add(dataVO);
});
}
param.setPageNumber(param.getPageNumber() - 1);
return new PageImpl<>(res, param, mybatisResult.getTotal());
}
@Override
public Map<String, Object> getSpecificInfoById(Long id) { public Map<String, Object> getSpecificInfoById(Long id) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
EquipmentSpecificAlarmLog alarm = equipmentSpecificAlarmLogMapper.selectById(id); EquipmentSpecificAlarmLog alarm = equipmentSpecificAlarmLogMapper.selectById(id);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ f7186567
...@@ -875,6 +875,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -875,6 +875,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
equipmentSpecificAlarmLog.setAlarmReason(equipmentSpecificAlarm.getAlamReason()); equipmentSpecificAlarmLog.setAlarmReason(equipmentSpecificAlarm.getAlamReason());
equipmentSpecificAlarmLog.setEquipmentSpecificCode(equipmentSpecificAlarm.getCode()); equipmentSpecificAlarmLog.setEquipmentSpecificCode(equipmentSpecificAlarm.getCode());
equipmentSpecificAlarmLog.setBuildId(equipmentSpecificAlarm.getBuildId()); equipmentSpecificAlarmLog.setBuildId(equipmentSpecificAlarm.getBuildId());
equipmentSpecificAlarmLog.setStatus(equipmentSpecificAlarm.getStatus());
equipmentSpecificAlarmLogService.save(equipmentSpecificAlarmLog); equipmentSpecificAlarmLogService.save(equipmentSpecificAlarmLog);
// 同步告警消息给平台 // 同步告警消息给平台
if (amosSwitch) { if (amosSwitch) {
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @ f7186567
...@@ -2037,4 +2037,16 @@ ...@@ -2037,4 +2037,16 @@
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="keyong" id="1640205688-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="wl_equipment_specific_alarm_log" columnName="status"/>
</not>
</preConditions>
<comment>wl_equipment_specific_alarm_log add column status</comment>
<sql>
alter table `wl_equipment_specific_alarm_log` add column `status` bit(1) COLLATE utf8mb4_general_ci NOT NULL DEFAULT b'1' COMMENT '报警状态：1报警0恢复';
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ f7186567
...@@ -108,19 +108,21 @@ ...@@ -108,19 +108,21 @@
WHERE WHERE
wesa.equipment_index_id = #{indexId} wesa.equipment_index_id = #{indexId}
</select> </select>
<select id="getEquipListBySpecific" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm"> <select id="getEquipListBySpecific" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm">
<![CDATA[ <![CDATA[
SELECT
* SELECT
FROM *
wl_equipment_specific_alarm FROM
WHERE wl_equipment_specific_alarm
status = #{status} WHERE
AND equipment_specific_id = #{equipmentSpecificId} status = #{status}
ORDER BY AND equipment_specific_id = #{equipmentSpecificId}
create_date DESC ORDER BY
]]> create_date DESC
]]>
</select> </select>
<select id="findEquipmentSpecificAlarmByEquipmentSpecificIdAndEquipmentIndexIdAndStatusIstrue" <select id="findEquipmentSpecificAlarmByEquipmentSpecificIdAndEquipmentIndexIdAndStatusIstrue"
...@@ -206,35 +208,40 @@ ...@@ -206,35 +208,40 @@
LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
LEFT JOIN wl_equipment we ON wled.equipment_id = we.id LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
) d ) d
<where> <where>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and d.warehouseStructureName like <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
concat(concat("%",#{param.warehouseStructureName}),"%") d.warehouseStructureName like
</if> concat(concat("%",#{param.warehouseStructureName}),"%")
<if test="param.equipCode != null and param.equipCode != ''">AND d.fireEquipmentCode like </if>
concat(concat("%",#{param.equipCode}),"%") <if test="param.equipCode != null and param.equipCode != ''">AND d.fireEquipmentCode like
</if> concat(concat("%",#{param.equipCode}),"%")
<if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if> </if>
<if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if> <if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if>
<if test="param.alarmType == 'BREAKDOWN'">AND d.type = #{param.alarmType}</if> <if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if>
<if test="param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if> <if test="param.alarmType == 'BREAKDOWN'">AND d.type = #{param.alarmType}</if>
<if test="param.orgCode != null and param.orgCode != ''">AND d.org_code = #{param.orgCode}</if> <if test="param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if>
<if test="param.type != null and param.type != ''">AND d.type = #{param.type}</if> <if test="param.orgCode != null and param.orgCode != ''">AND d.org_code = #{param.orgCode}</if>
<if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 1">AND d.handleStatus = '已处理' </if> <if test="param.type != null and param.type != ''">AND d.type = #{param.type}</if>
<if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 2">AND d.handleStatus = '未处理' </if> <if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 1">AND
<if test="param.system != null and param.system != ''"> d.handleStatus = '已处理'
AND find_in_set(#{param.system},d.systemId) </if>
</if> <if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 2">AND
<if test="param.buildIds!=null"> d.handleStatus = '未处理'
AND d.buildId IN </if>
<foreach item="item" collection="param.buildIds" separator="," <if test="param.system != null and param.system != ''">
open="(" close=")" index=""> #{item} AND find_in_set(#{param.system},d.systemId)
</foreach> </if>
</if> <if test="param.buildIds!=null">
</where> AND d.buildId IN
<foreach item="item" collection="param.buildIds" separator=","
open="(" close=")" index="">#{item}
</foreach>
</if>
</where>
ORDER BY d.createDate DESC ORDER BY d.createDate DESC
</select> </select>
<select id="count" resultType="java.lang.Integer"> <select id="count" resultType="java.lang.Integer">
SELECT SELECT
count(1) AS total_num count(1) AS total_num
FROM FROM
( (
...@@ -253,20 +260,20 @@ ...@@ -253,20 +260,20 @@
left join wl_stock_detail wlsd ON wlsd.equipment_specific_id=wles.id left join wl_stock_detail wlsd ON wlsd.equipment_specific_id=wles.id
left join wl_warehouse_structure wws ON wlsd.warehouse_structure_id = wws.id left join wl_warehouse_structure wws ON wlsd.warehouse_structure_id = wws.id
) d ) d
<where> <where>
<if test="warehouseStructureName != null and warehouseStructureName != ''">and d.warehouseStructureName like <if test="warehouseStructureName != null and warehouseStructureName != ''">and d.warehouseStructureName like
concat(concat("%",#{warehouseStructureName}),"%") concat(concat("%",#{warehouseStructureName}),"%")
</if> </if>
<if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like <if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
concat(concat("%",#{equipCode}),"%") concat(concat("%",#{equipCode}),"%")
</if> </if>
<if test="beginDate!=null">AND d.createDate >= #{beginDate}</if> <if test="beginDate!=null">AND d.createDate >= #{beginDate}</if>
<if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if> <if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
<if test="alarmType == 'BREAKDOWN'">AND d.type = #{alarmType}</if> <if test="alarmType == 'BREAKDOWN'">AND d.type = #{alarmType}</if>
<if test="alarmType == 'FIREALARM'">AND d.type = #{alarmType}</if> <if test="alarmType == 'FIREALARM'">AND d.type = #{alarmType}</if>
</where> </where>
</select> </select>
<select id="pageAlarmsInfo" resultType="java.util.HashMap"> <select id="pageAlarmsInfo" resultType="Map">
SELECT SELECT
d.* d.*
FROM FROM
...@@ -302,7 +309,7 @@ ...@@ -302,7 +309,7 @@
wlesal.equipment_specific_index_value wlesal.equipment_specific_index_value
END AS fireEquipmentPointValue, END AS fireEquipmentPointValue,
wlesa.frequency AS frequency, wlesa.frequency AS frequency,
wlesa.status AS status, wlesal.status AS status,
wlesal.type AS type, wlesal.type AS type,
wlesal.create_date AS createDate, wlesal.create_date AS createDate,
wlesal.build_id AS buildId, wlesal.build_id AS buildId,
...@@ -323,7 +330,8 @@ ...@@ -323,7 +330,8 @@
LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id) d LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id) d
WHERE 1=1 WHERE 1=1
AND d.fireEquipmentName IS NOT NULL AND d.fireEquipmentName IS NOT NULL
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and d.warehouseStructureName like <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
d.warehouseStructureName like
concat(concat("%",#{param.warehouseStructureName}),"%") concat(concat("%",#{param.warehouseStructureName}),"%")
</if> </if>
<if test="param.equipCode != null and param.equipCode != ''">AND d.fireEquipmentCode like <if test="param.equipCode != null and param.equipCode != ''">AND d.fireEquipmentCode like
...@@ -345,85 +353,88 @@ ...@@ -345,85 +353,88 @@
</if> </if>
<if test="param.buildId != null and param.buildId != ''"> <if test="param.buildId != null and param.buildId != ''">
and (d.buildId=#{param.buildId} and (d.buildId=#{param.buildId}
or find_in_set(d.fireEquipmentId,(SELECT s.point_in_scene FROM `wl_source_scene` s where s.source_id = #{param.buildId}))) or find_in_set(d.fireEquipmentId,(SELECT s.point_in_scene FROM `wl_source_scene` s where s.source_id =
#{param.buildId})))
</if> </if>
<if test="param.id!=null and param.id!=''">AND d.fireEquipmentId = #{param.id}</if>
<if test="param.status!=null and param.status!=3">AND d.status = #{param.status}</if>
ORDER BY d.createDate DESC ORDER BY d.createDate DESC
</select> </select>
<select id="getAlarmList" resultType="java.util.HashMap"> <select id="getAlarmList" resultType="java.util.HashMap">
SELECT SELECT
d.* d.*
FROM FROM
( (
SELECT SELECT
wlesal.id AS id, wlesal.id AS id,
wlesal.equipment_specific_id AS fireEquipmentId, wlesal.equipment_specific_id AS fireEquipmentId,
wles.equipment_detail_id AS equipDetailId, wles.equipment_detail_id AS equipDetailId,
wles.`code` AS fireEquipmentCode, wles.`code` AS fireEquipmentCode,
IF ( IF (
wles.`code` IS NULL, wles.`code` IS NULL,
wlesal.equipment_specific_name, wlesal.equipment_specific_name,
concat( concat(
wlesal.equipment_specific_name, wlesal.equipment_specific_name,
'(', '(',
wles.`code`, wles.`code`,
')' ')'
) )
) AS fireEquipmentName, ) AS fireEquipmentName,
concat( concat(
wlesal.equipment_specific_name, wlesal.equipment_specific_name,
wlesal.equipment_specific_index_name wlesal.equipment_specific_index_name
) AS alarmContent, ) AS alarmContent,
IF ( IF (
wlesal.confirm_type IS NULL, wlesal.confirm_type IS NULL,
'未处理', '未处理',
'已处理' '已处理'
) handleStatus, ) handleStatus,
wlesal.confirm_type AS handleType, wlesal.confirm_type AS handleType,
wlesal.equipment_index_id AS fireEquipmentIndexId, wlesal.equipment_index_id AS fireEquipmentIndexId,
wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey, wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName, wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
wlesal.resolve_result as resolveResult, wlesal.resolve_result as resolveResult,
wlesal.confirm_date as confirmDate, wlesal.confirm_date as confirmDate,
wlesal.alarm_reason as alarmReason, wlesal.alarm_reason as alarmReason,
CASE wlesal.equipment_specific_index_value CASE wlesal.equipment_specific_index_value
WHEN 'true' THEN WHEN 'true' THEN
'是' '是'
WHEN 'false' THEN WHEN 'false' THEN
'否' '否'
ELSE ELSE
wlesal.equipment_specific_index_value wlesal.equipment_specific_index_value
END AS fireEquipmentPointValue, END AS fireEquipmentPointValue,
wlesal.type AS type, wlesal.type AS type,
wlesal.create_date AS createDate, wlesal.create_date AS createDate,
wlesal.location AS warehouseStructureName, wlesal.location AS warehouseStructureName,
( (
SELECT SELECT
group_concat(fet.`name`) group_concat(fet.`name`)
FROM FROM
f_equipment_fire_equipment AS fefe f_equipment_fire_equipment AS fefe
LEFT JOIN f_equipment AS fet ON fet.id = fefe.equipment_id LEFT JOIN f_equipment AS fet ON fet.id = fefe.equipment_id
WHERE WHERE
fefe.fire_equipment_id = wlesal.equipment_specific_id fefe.fire_equipment_id = wlesal.equipment_specific_id
) AS equipmentName ) AS equipmentName
FROM FROM
wl_equipment_specific_alarm_log wlesal wl_equipment_specific_alarm_log wlesal
LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
) d ) d
<where> <where>
<if test="warehouseStructureName != null and warehouseStructureName != ''"> <if test="warehouseStructureName != null and warehouseStructureName != ''">
and d.warehouseStructureName like and d.warehouseStructureName like
concat(concat("%",#{warehouseStructureName}),"%") concat(concat("%",#{warehouseStructureName}),"%")
</if> </if>
<if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like <if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
concat(concat("%",#{equipCode}),"%") concat(concat("%",#{equipCode}),"%")
</if> </if>
<if test="beginDate!=null">AND d.createDate >= #{beginDate}</if> <if test="beginDate!=null">AND d.createDate >= #{beginDate}</if>
<if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if> <if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
<if test="alarmType != null and alarmType != ''">AND d.type = #{alarmType}</if> <if test="alarmType != null and alarmType != ''">AND d.type = #{alarmType}</if>
<if test="id != null and id != ''">AND d.id = #{id}</if> <if test="id != null and id != ''">AND d.id = #{id}</if>
</where> </where>
ORDER BY d.createDate DESC ORDER BY d.createDate DESC
</select> </select>
<select id="getAlarmDetail" resultType="java.util.HashMap"> <select id="getAlarmDetail" resultType="java.util.HashMap">
...@@ -713,7 +724,7 @@ ...@@ -713,7 +724,7 @@
wlesa.`status`, wlesa.`status`,
wlesal.type AS type, wlesal.type AS type,
wlesal.create_date AS createDate, wlesal.create_date AS createDate,
CONCAT_WS(' ',wws.full_name,wlsd.description) AS warehouseStructureName, CONCAT_WS(' ',wws.full_name,wlsd.description) AS warehouseStructureName,
(select (select
group_concat(fet.`name`) group_concat(fet.`name`)
from f_equipment_fire_equipment as fefe from f_equipment_fire_equipment as fefe
...@@ -735,11 +746,13 @@ ...@@ -735,11 +746,13 @@
AND wlesal.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' ) AND wlesal.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' )
</if> </if>
<if test='dto.createDate != null and dto.createDate == "7"'> <if test='dto.createDate != null and dto.createDate == "7"'>
AND wlesal.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 7 DAY ), '00:00:00' ) AND wlesal.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 7 DAY ),
'00:00:00' )
AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' ) AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' )
</if> </if>
<if test='dto.createDate != null and dto.createDate == "30"'> <if test='dto.createDate != null and dto.createDate == "30"'>
AND wlesal.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 30 DAY ), '00:00:00' ) AND wlesal.create_date BETWEEN CONCAT( DATE_ADD( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), INTERVAL - 30 DAY
), '00:00:00' )
AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' ) AND CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d ' ), '%', '23:59:59' )
</if> </if>
<if test="dto.createDate != null and dto.createDate.length() > 7"> <if test="dto.createDate != null and dto.createDate.length() > 7">
...@@ -749,7 +762,7 @@ ...@@ -749,7 +762,7 @@
and wlesal.confirm_type is not null and wlesal.confirm_type is not null
</if> </if>
<if test="dto.isFirm == 'no' "> <if test="dto.isFirm == 'no' ">
and wlesal.confirm_type is null and wlesal.confirm_type is null
</if> </if>
</where> </where>
) d ) d
...@@ -811,10 +824,10 @@ ...@@ -811,10 +824,10 @@
d.fireEquipmentSpecificIndexName, d.fireEquipmentSpecificIndexName,
d.createDate, d.createDate,
d.`status`, d.`status`,
(CASE WHEN d.type='FIREALARM' THEN '火警' (CASE WHEN d.type='FIREALARM' THEN '火警'
WHEN d.type ='BREAKDOWN' THEN '故障' WHEN d.type ='BREAKDOWN' THEN '故障'
WHEN d.type='SHIELD' THEN '屏蔽' WHEN d.type='SHIELD' THEN '屏蔽'
WHEN d.type='NOTICE' THEN '预警' WHEN d.type='NOTICE' THEN '预警'
ELSE '' END) AS type, ELSE '' END) AS type,
d.confirmUserName, d.confirmUserName,
d.systemIds, d.systemIds,
...@@ -853,7 +866,7 @@ ...@@ -853,7 +866,7 @@
wlesa.`status`, wlesa.`status`,
wlesal.type AS type, wlesal.type AS type,
wlesal.create_date AS createDate, wlesal.create_date AS createDate,
CONCAT_WS(' ',wws.full_name,wlsd.description) AS warehouseStructureName, CONCAT_WS(' ',wws.full_name,wlsd.description) AS warehouseStructureName,
wlesal.confirm_user_name confirmUserName, wlesal.confirm_user_name confirmUserName,
wlesal.system_ids systemIds, wlesal.system_ids systemIds,
(select (select
...@@ -885,29 +898,33 @@ ...@@ -885,29 +898,33 @@
</if> </if>
<if test='dto.createDate != null and dto.createDate == "3"'> <if test='dto.createDate != null and dto.createDate == "3"'>
AND wlesal.create_date &gt;= subdate(curdate(),date_format(curdate(),'%w')-1) and wlesal.create_date &lt;= subdate(curdate(),date_format(curdate(),'%w')-7) <!--本周--> AND wlesal.create_date &gt;= subdate(curdate(),date_format(curdate(),'%w')-1) and wlesal.create_date
&lt;= subdate(curdate(),date_format(curdate(),'%w')-7) <!--本周-->
</if> </if>
<if test='dto.createDate != null and dto.createDate == "4"'> <if test='dto.createDate != null and dto.createDate == "4"'>
AND wlesal.create_date &gt;= subdate(curdate(),date_format(curdate(),'%w')+6) and wlesal.create_date &lt;= subdate(curdate(),date_format(curdate(),'%w')-0)<!--上周--> AND wlesal.create_date &gt;= subdate(curdate(),date_format(curdate(),'%w')+6) and wlesal.create_date
&lt;= subdate(curdate(),date_format(curdate(),'%w')-0)<!--上周-->
</if> </if>
<if test='dto.createDate != null and dto.createDate == "5"'> <if test='dto.createDate != null and dto.createDate == "5"'>
AND date_format(wlesa.create_date,'%y-%m')=date_format(curdate(),'%y-%m')<!--本月--> AND date_format(wlesa.create_date,'%y-%m')=date_format(curdate(),'%y-%m')<!--本月-->
</if> </if>
<if test='dto.createDate != null and dto.createDate == "6"'> <if test='dto.createDate != null and dto.createDate == "6"'>
AND date_format(wlesa.create_date,'%y-%m')=date_format(date_sub(curdate(), interval 1 month),'%y-%m') <!--上月--> AND date_format(wlesa.create_date,'%y-%m')=date_format(date_sub(curdate(), interval 1
month),'%y-%m') <!--上月-->
</if> </if>
<if test='dto.startDate != null and dto.endDate != null '> <if test='dto.startDate != null and dto.endDate != null '>
AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d ' ) between DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d ' ) and DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d ' ) AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d ' ) between DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d ' ) and
DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d ' )
</if> </if>
<if test="dto.isFirm == 'yes'"> <if test="dto.isFirm == 'yes'">
and wlesal.confirm_type <![CDATA[<>]]> '' and wlesal.confirm_type <![CDATA[<>]]> ''
</if> </if>
<if test="dto.isFirm == 'no'"> <if test="dto.isFirm == 'no'">
and wlesal.confirm_type is null and wlesal.confirm_type is null
</if> </if>
</where> </where>
) d ) d
...@@ -922,13 +939,13 @@ ...@@ -922,13 +939,13 @@
</otherwise> </otherwise>
</choose> </choose>
<if test='dto.fireEquipmentName != null '> <if test='dto.fireEquipmentName != null '>
AND d.fireEquipmentName LIKE CONCAT('%', #{dto.fireEquipmentName}, '%' ) AND d.fireEquipmentName LIKE CONCAT('%', #{dto.fireEquipmentName}, '%' )
</if> </if>
<if test='dto.systemIds != null '> <if test='dto.systemIds != null '>
AND d.systemIds in (#{dto.systemIds}) AND d.systemIds in (#{dto.systemIds})
</if> </if>
<if test='dto.confirmUserName != null '> <if test='dto.confirmUserName != null '>
AND d.confirmUserName LIKE CONCAT('%', #{dto.confirmUserName}, '%' ) AND d.confirmUserName LIKE CONCAT('%', #{dto.confirmUserName}, '%' )
</if> </if>
<if test="dto.code != null"> <if test="dto.code != null">
and d.code like CONCAT('%', #{dto.code}, '%' ) and d.code like CONCAT('%', #{dto.code}, '%' )
...@@ -945,7 +962,8 @@ ...@@ -945,7 +962,8 @@
b.eqname fireEquipmentName, b.eqname fireEquipmentName,
b.qrcode fireEquipmentCode, b.qrcode fireEquipmentCode,
b.eqimg eqimg, b.eqimg eqimg,
IFNULL(( select DISTINCT wl_equipment_specific_alarm.`status` from wl_equipment_specific_alarm where wl_equipment_specific_alarm.`status`=1 and wl_equipment_specific_alarm.equipment_detail_id=b.eqid ), 0) `status` IFNULL(( select DISTINCT wl_equipment_specific_alarm.`status` from wl_equipment_specific_alarm where
wl_equipment_specific_alarm.`status`=1 and wl_equipment_specific_alarm.equipment_detail_id=b.eqid ), 0) `status`
from from
(select (select
wl_warehouse_structure.full_name address, wl_warehouse_structure.full_name address,
...@@ -954,19 +972,20 @@ ...@@ -954,19 +972,20 @@
wl_equipment_detail.img eqimg, wl_equipment_detail.img eqimg,
wl_equipment_detail.id eqid, wl_equipment_detail.id eqid,
wl_equipment_specific.system_id wl_equipment_specific.system_id
from wl_equipment_detail from wl_equipment_detail
LEFT JOIN wl_equipment_specific ON wl_equipment_specific.equipment_detail_id = wl_equipment_detail.id LEFT JOIN wl_equipment_specific ON wl_equipment_specific.equipment_detail_id = wl_equipment_detail.id
LEFT JOIN (select DISTINCT wl_equipment_index.equipment_id from wl_equipment_index where wl_equipment_index.is_iot=1) b on b.equipment_id=wl_equipment_detail.equipment_id LEFT JOIN (select DISTINCT wl_equipment_index.equipment_id from wl_equipment_index where
wl_equipment_index.is_iot=1) b on b.equipment_id=wl_equipment_detail.equipment_id
LEFT JOIN wl_stock_detail on wl_equipment_detail.id =wl_stock_detail.equipment_detail_id LEFT JOIN wl_stock_detail on wl_equipment_detail.id =wl_stock_detail.equipment_detail_id
LEFT JOIN wl_warehouse_structure on wl_stock_detail.warehouse_structure_id = wl_warehouse_structure.id LEFT JOIN wl_warehouse_structure on wl_stock_detail.warehouse_structure_id = wl_warehouse_structure.id
)b )b
)m )m
<where> <where>
<if test="dto.status != null and dto.status != ''"> <if test="dto.status != null and dto.status != ''">
AND `status`= #{dto.status} AND `status`= #{dto.status}
</if> </if>
<if test="dto.warehouseStructureName != null and dto.warehouseStructureName != ''"> <if test="dto.warehouseStructureName != null and dto.warehouseStructureName != ''">
AND warehouseStructureName LIKE CONCAT('%', #{dto.warehouseStructureName}, '%' ) AND warehouseStructureName LIKE CONCAT('%', #{dto.warehouseStructureName}, '%' )
</if> </if>
<if test="dto.fireEquipmentCode != null and dto.fireEquipmentCode!= ''"> <if test="dto.fireEquipmentCode != null and dto.fireEquipmentCode!= ''">
AND fireEquipmentCode LIKE CONCAT('%', #{dto.fireEquipmentCode}, '%' ) AND fireEquipmentCode LIKE CONCAT('%', #{dto.fireEquipmentCode}, '%' )
...@@ -975,7 +994,7 @@ ...@@ -975,7 +994,7 @@
AND fireEquipmentName LIKE CONCAT('%', #{dto.fireEquipmentName}, '%' ) AND fireEquipmentName LIKE CONCAT('%', #{dto.fireEquipmentName}, '%' )
</if> </if>
<if test="dto.systemIds != null and dto.systemIds!= ''"> <if test="dto.systemIds != null and dto.systemIds!= ''">
AND systemIds in (#{dto.systemIds}) AND systemIds in (#{dto.systemIds})
</if> </if>
</where> </where>
ORDER BY status DESC ORDER BY status DESC
...@@ -1008,25 +1027,26 @@ ...@@ -1008,25 +1027,26 @@
<select id="getcountAlarmtype" resultType="int"> <select id="getcountAlarmtype" resultType="int">
select select
count(wl_equipment_specific_alarm.id) num count(wl_equipment_specific_alarm.id) num
from wl_equipment_specific_alarm where wl_equipment_specific_alarm.`status`=1 from wl_equipment_specific_alarm where wl_equipment_specific_alarm.`status`=1
<if test="tyep != null and tyep!= ''"> <if test="tyep != null and tyep!= ''">
AND wl_equipment_specific_alarm.type = #{tyep} AND wl_equipment_specific_alarm.type = #{tyep}
</if> </if>
</select> </select>
<select id="getcountAlarmHandle" resultType="int"> <select id="getcountAlarmHandle" resultType="int">
select select
count(wl_equipment_specific_alarm.id) num count(wl_equipment_specific_alarm.id) num
from wl_equipment_specific_alarm where wl_equipment_specific_alarm.`status`=1 from wl_equipment_specific_alarm where wl_equipment_specific_alarm.`status`=1
<if test="tyep == 'yes'"> <if test="tyep == 'yes'">
and wl_equipment_specific_alarm.confirm_type <![CDATA[<>]]> '' AND wl_equipment_specific_alarm.confirm_type IS NOT NULL and wl_equipment_specific_alarm.confirm_type <![CDATA[<>]]> '' AND wl_equipment_specific_alarm.confirm_type
IS NOT NULL
</if> </if>
<if test="tyep == 'no'"> <if test="tyep == 'no'">
and wl_equipment_specific_alarm.confirm_type is null and wl_equipment_specific_alarm.confirm_type is null
</if> </if>
</select> </select>
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
View file @ f7186567
...@@ -78,7 +78,8 @@ ...@@ -78,7 +78,8 @@
wes.org_code AS orgCode, wes.org_code AS orgCode,
wei.type_code AS typeCode, wei.type_code AS typeCode,
wei.name AS indexName, wei.name AS indexName,
wei.unit AS indexUnitName wei.unit AS indexUnitName,
wesi.update_date AS updateDate
FROM FROM
wl_equipment_specific_index AS wesi wl_equipment_specific_index AS wesi
LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id
...@@ -86,6 +87,30 @@ ...@@ -86,6 +87,30 @@
WHERE WHERE
wes.iot_code = #{iotCode} wes.iot_code = #{iotCode}
</select> </select>
<select id="getEquipmentSpeIndexDataByIotCode"
resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
SELECT
wesi.id AS id,
wei.name_key AS nameKey,
IFNULL(si.value_label, si.`value`) AS 'value',
wesi.equipment_specific_id AS equipmentSpecificId,
wesi.equipment_index_id AS equipmentIndexId,
wes.org_code AS code,
wes.iot_code AS iotCode,
wes.org_code AS orgCode,
wei.type_code AS typeCode,
wei.name AS indexName,
wei.unit AS indexUnitName,
wei.value_enum AS valueEnum
FROM
wl_equipment_specific_index AS wesi
LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id
LEFT JOIN wl_equipment_index AS wei ON wei.id = wesi.equipment_index_id
WHERE
wes.iot_code = #{iotCode}
</select>
<select id="getEquipmentSpeIndexByEquipmentSecificId" <select id="getEquipmentSpeIndexByEquipmentSecificId"
resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex"> resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
SELECT SELECT
......
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