Skip to content

A
amos-boot-biz
Commit 7b23c939 authored by 任刚's avatar 任刚
Browse files
Options

修改detail数据保存时的code

parent f4d44d9e
Hide whitespace changes
Inline Side-by-side
Showing with 536 additions and 163 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java
View file @ 7b23c939
......@@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
......@@ -30,18 +31,22 @@ public class EquipmentDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@Excel(name = "部件名称",orderNum ="1")
@TableField("name")
@ApiModelProperty(value = "名称")
@ApiModelProperty(value = "部件名称")
private String name;
@TableField("code")
@ApiModelProperty(value = "编码")
private String code;
@Excel(name = "装备定义id",orderNum ="14")
@TableField("equipment_id")
@ApiModelProperty(value = "装备定义id")
private Long equipmentId;
@Excel(name = "装备定义名称",orderNum ="15")
@TableField("equipment_name")
@ApiModelProperty(value = "装备定义名称")
private String equipmentName;
......@@ -152,38 +157,44 @@ public class EquipmentDetail extends BaseEntity {
private String unitName;
@Excel(name = "部件编码",orderNum ="2")
@TableField("eq_code")
@ApiModelProperty(value = "部件编码")
private String eqcode;
@Excel(name = "部件型号",orderNum ="3")
@TableField("standard")
@ApiModelProperty(value = "部件型号")
private String standard;
@Excel(name = "存放位置",orderNum ="4")
@TableField("area")
@ApiModelProperty(value = "存放位置")
private String area;
@Excel(name = "生产厂家",orderNum ="5")
@TableField("brand")
@ApiModelProperty(value = "生产厂家")
private String brand;
@Excel(name = "出厂时间",orderNum ="6")
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("open_date")
@ApiModelProperty(value = "出厂时间")
private Date openDate;
@Excel(name = "工作时间",orderNum ="7")
@TableField("maintenance_cycle")
@ApiModelProperty(value = "工作时间")
private BigDecimal maintenanceCycle;
@Excel(name = "所属单位",orderNum ="8")
@TableField("remark")
@ApiModelProperty(value = "所属单位")
private String remark;
@Excel(name = "入库时间",orderNum ="9")
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("join_date")
@ApiModelProperty(value = "入库时间")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java
View file @ 7b23c939
......@@ -21,6 +21,8 @@ import lombok.Data;
@ApiModel(value = "EquipmentSpecific对象", description = "具体设备二维码等信息")
public class EquipmentSpecific extends BaseEntity {
@ApiModelProperty(value = "设备id")
@TableField("equipment_detail_id")
private Long equipmentDetailId;
......@@ -37,6 +39,7 @@ public class EquipmentSpecific extends BaseEntity {
@TableField("system_id")
private String systemId;
@Excel(name = "物联编码",orderNum ="10")
@ApiModelProperty(value = "物联编码")
@TableField("iot_code")
private String iotCode;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/DetailssDTO.java
View file @ 7b23c939
......@@ -5,16 +5,21 @@
*/
package com.yeejoin.equipmanage.common.entity.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
import com.yeejoin.equipmanage.common.entity.publics.BaseDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
public class DetailssDTO {
@Data
public class DetailssDTO extends BaseDTO<EquipmentDetail> {
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "名称")
private String name;
......@@ -54,4 +59,104 @@ public class DetailssDTO {
@ApiModelProperty(value = "处置措施")
private String measure;
@ApiModelProperty(value = "行业编码")
private String industryCode;
@ApiModelProperty(value = "分类编码")
private String equipmentClassificationCode;
@ApiModelProperty(value = "类型 car：车辆，equipment：设备")
private String type;
@ApiModelProperty(value = "物联编码")
private String iotCode;
@ApiModelProperty(value = "判断是否导出全部")
private Integer prop;
// @Excel(name = "id",orderNum ="0")
// @ApiModelProperty(value = "id")
// private Long id;
//
// @Excel(name = "部件名称",orderNum ="1")
// @TableField("name")
// @ApiModelProperty(value = "部件名称")
// private String name;
//
// @Excel(name = "部件编码",orderNum ="2")
// @TableField("eq_code")
// @ApiModelProperty(value = "部件编码")
// private String eqcode;
//
// @Excel(name = "部件型号",orderNum ="3")
// @TableField("standard")
// @ApiModelProperty(value = "部件型号")
// private String standard;
//
// @Excel(name = "存放位置",orderNum ="4")
// @TableField("area")
// @ApiModelProperty(value = "存放位置")
// private String area;
//
// @Excel(name = "生产厂家",orderNum ="5")
// @TableField("brand")
// @ApiModelProperty(value = "生产厂家")
// private String brand;
//
// @Excel(name = "出厂时间",orderNum ="6")
// @JsonFormat(pattern = "yyyy-MM-dd")
// @TableField("open_date")
// @ApiModelProperty(value = "出厂时间")
// private Date openDate;
//
// @Excel(name = "工作时间",orderNum ="7")
// @TableField("maintenance_cycle")
// @ApiModelProperty(value = "工作时间")
// private BigDecimal maintenanceCycle;
//
//
// @Excel(name = "所属单位",orderNum ="8")
// @TableField("remark")
// @ApiModelProperty(value = "所属单位")
// private String remark;
//
// @Excel(name = "入库时间",orderNum ="9")
// @JsonFormat(pattern = "yyyy-MM-dd")
// @TableField("join_date")
// @ApiModelProperty(value = "入库时间")
// private Date joinDate;
//
// @ApiModelProperty(value = "装备类型")
// private String type;
//
// @Excel(name = "物联编码",orderNum ="10")
// @ApiModelProperty(value = "物联编码")
// private String iotCode;
//
// @TableField("status")
// @ApiModelProperty(value="状态")
// @Excel(name = "状态",orderNum = "11")
// private String status;
//
// @TableField("reason")
// @ApiModelProperty(value = "原因分析")
// @Excel(name = "原因分析",orderNum = "12")
// private String reason;
//
// @TableField("measure")
// @ApiModelProperty(value = "处置措施")
// @Excel(name = "处置措施",orderNum = "13")
// private String measure;
//
// @Excel(name = "装备定义id",orderNum ="14")
// @TableField("equipment_id")
// @ApiModelProperty(value = "装备定义id")
// private Long equipmentId;
//
//
// @Excel(name = "装备定义名称",orderNum ="15")
// @TableField("equipment_name")
// @ApiModelProperty(value = "装备定义名称")
// private String equipmentName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/DetailssAmountVO.java
View file @ 7b23c939
......@@ -5,6 +5,8 @@
*/
package com.yeejoin.equipmanage.common.entity.vo;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -15,46 +17,89 @@ import java.util.Date;
@Data
public class DetailssAmountVO {
@Excel(name = "id",orderNum ="0")
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "名称")
@Excel(name = "部件名称",orderNum ="1")
@TableField("name")
@ApiModelProperty(value = "部件名称")
private String name;
@Excel(name = "部件编码",orderNum ="2")
@TableField("eq_code")
@ApiModelProperty(value = "部件编码")
private String eqcode;
@Excel(name = "部件型号",orderNum ="3")
@TableField("standard")
@ApiModelProperty(value = "部件型号")
private String standard;
@Excel(name = "存放位置",orderNum ="4")
@TableField("area")
@ApiModelProperty(value = "存放位置")
private String area;
@Excel(name = "生产厂家",orderNum ="5")
@TableField("brand")
@ApiModelProperty(value = "生产厂家")
private String brand;
@Excel(name = "出厂时间",orderNum ="6")
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("open_date")
@ApiModelProperty(value = "出厂时间")
private Date openDate;
@Excel(name = "工作时间",orderNum ="7")
@TableField("maintenance_cycle")
@ApiModelProperty(value = "工作时间")
private BigDecimal maintenanceCycle;
@Excel(name = "所属单位",orderNum ="8")
@TableField("remark")
@ApiModelProperty(value = "所属单位")
private String remark;
@Excel(name = "入库时间",orderNum ="9")
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("join_date")
@ApiModelProperty(value = "入库时间")
private Date joinDate;
@ApiModelProperty(value = "装备类型")
private String type;
@Excel(name = "物联编码",orderNum ="10")
@ApiModelProperty(value = "物联编码")
private String iotCode;
@TableField("status")
@ApiModelProperty(value="状态")
@Excel(name = "状态",orderNum = "11")
private String status;
@TableField("reason")
@ApiModelProperty(value = "原因分析")
@Excel(name = "原因分析",orderNum = "12")
private String reason;
@TableField("measure")
@ApiModelProperty(value = "处置措施")
@Excel(name = "处置措施",orderNum = "13")
private String measure;
@Excel(name = "装备定义id",orderNum ="14")
@TableField("equipment_id")
@ApiModelProperty(value = "装备定义id")
private Long equipmentId;
@Excel(name = "装备定义名称",orderNum ="15")
@TableField("equipment_name")
@ApiModelProperty(value = "装备定义名称")
private String equipmentName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentDate.java
View file @ 7b23c939
package com.yeejoin.equipmanage.common.vo;
import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
import com.yeejoin.equipmanage.common.entity.EquipmentParams;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
......@@ -7,15 +8,17 @@ import lombok.Data;
/**
* 消防设备
*
*
* **/
@Data
public class EquipmentDate {
@ExcelEntity
private EquipmentSpecific equipmentSpecific;
@ExcelEntity
private EquipmentDetail equipmentDetail;
@ExcelEntity
private EquipmentParams equipmentParams;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentController.java
View file @ 7b23c939
......@@ -708,18 +708,18 @@ public class EquipmentController extends AbstractBaseController {
* 导出隐患清单
*/
@ApiOperation(value = "导出装备清单", notes = "导出装备清单")
@PostMapping(value = "/export")
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
public void exportDangerList(@ApiParam(value = "导出装备的数据") @RequestBody(required = false) List<EquipmentPar> equipmentPars,
@ApiParam(value = "是否全部导出" ) @RequestParam boolean type,
HttpServletResponse response) {
String fileName = "装备清单" + new Date().getTime();
if(type==true){//全部导出
List<EquipmentPar> equpar = equipmentDetailMapper.equpar();
FileHelper.exportExcel(equpar, "装备清单", "装备清单", EquipmentPar.class, fileName + ".xls", response);
}else {//仅仅导出筛选结果的数据
FileHelper.exportExcel(equipmentPars, "装备清单", "装备清单", Equipment.class, fileName + ".xls", response);
}
}
// @ApiOperation(value = "导出装备清单", notes = "导出装备清单")
// @PostMapping(value = "/export")
// @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
// public void exportDangerList(@ApiParam(value = "导出装备的数据") @RequestBody(required = false) List<EquipmentPar> equipmentPars,
// @ApiParam(value = "是否全部导出" ) @RequestParam boolean type,
// HttpServletResponse response) {
// String fileName = "装备清单" + new Date().getTime();
// if(type==true){//全部导出
// List<EquipmentPar> equpar = equipmentDetailMapper.equpar();
// FileHelper.exportExcel(equpar, "装备清单", "装备清单", EquipmentPar.class, fileName + ".xls", response);
// }else {//仅仅导出筛选结果的数据
// FileHelper.exportExcel(equipmentPars, "装备清单", "装备清单", Equipment.class, fileName + ".xls", response);
// }
// }
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ 7b23c939
......@@ -4,21 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.page.PageParams;
import com.mchange.lang.LongUtils;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.dto.TopographyNodeDetailDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
import com.yeejoin.equipmanage.common.enums.ExcelEnums;
import com.yeejoin.equipmanage.common.utils.ExcelUtils;
import com.yeejoin.equipmanage.common.utils.NameUtils;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.utils.*;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import com.yeejoin.equipmanage.dto.ExcelDto;
import com.yeejoin.equipmanage.fegin.JcsFeign;
import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
import com.yeejoin.equipmanage.mapper.EquipmentParamsMapper;
import com.yeejoin.equipmanage.mapper.ManufacturerInfoMapper;
import com.yeejoin.equipmanage.mapper.StockDetailMapper;
import com.yeejoin.equipmanage.mapper.*;
import com.yeejoin.equipmanage.service.*;
import com.yeejoin.equipmanage.service.impl.TopographyNodeDetailService;
import com.yeejoin.equipmanage.utils.ExcelUtil;
......@@ -65,6 +64,12 @@ public class EquipmentDetailController extends AbstractBaseController {
IEquipmentParamsService equipmentParamsService;
@Autowired
IEquipmentCategoryService iEquipmentCategoryService;
@Autowired
IFireFightingSystemService fireFightingSystemService;
@Autowired
EquipmentDetailMapper equipmentDetailMapper;
@Autowired
......@@ -95,6 +100,9 @@ public class EquipmentDetailController extends AbstractBaseController {
@Autowired
private ISyncDataService syncDataService;
@Autowired
private EquipmentCategoryMapper equipmentCategoryMapper;
@Value("${systemctl.sync.switch}")
private Boolean syncSwitch;
......@@ -119,7 +127,7 @@ public class EquipmentDetailController extends AbstractBaseController {
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
// EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
// String sysCode = vo.getCode();
//
// if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
......@@ -138,13 +146,13 @@ public class EquipmentDetailController extends AbstractBaseController {
}
}
// String iot = vo.getIotCode();
// if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
// int iot_code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
// if (iot_code != 0 ) {
// throw new BadRequest("物联编码填写重复，请重新输入！");
// }
// }
String iot = vo.getIotCode();
if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
int iot_code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
if (iot_code != 0 ) {
throw new BadRequest("物联编码填写重复，请重新输入！");
}
}
EquipmentDate date = equipmentSpecificSerivce.equipmentSpecificCreate(equipmentDate, getSelectedOrgInfo(), getUserInfo());
equipmentDate.getEquipmentParams().setCode(equipmentDate.getEquipmentDetail().getEqcode());
iEquipmentParamsService.saveOne(equipmentDate.getEquipmentParams());
......@@ -215,9 +223,12 @@ public class EquipmentDetailController extends AbstractBaseController {
EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(id);
equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
EquipmentDetail equipmentDetail = iEquipmentDetailService.getOneById(equipmentSpecific.getEquipmentDetailId());
Map<String, Object> map = new HashMap<>();
map.put("code",equipmentDetail.getEqcode());
EquipmentParams equipmentParams = equipmentParamsMapper.selectByMap(map).get(0);
Map<String, Object> map1 = new HashMap<>();
map1.put("code",equipmentDetail.getEqcode());
EquipmentParams equipmentParams = equipmentParamsMapper.selectByMap(map1).get(0);
StockDetail stockDetail = null;
if(stockDetailId != null){
//解决灭火药剂，有多个货位状态问题
......@@ -255,26 +266,19 @@ public class EquipmentDetailController extends AbstractBaseController {
String eqcode = de.getEqcode();
if (StringUtils.isNotEmpty(eqcode) && StringUtils.isNotEmpty(eqcode.trim())){
int code = iEquipmentDetailService.count(new QueryWrapper<EquipmentDetail>().eq("eq_code", eqcode.trim()));
if (code != 0 ) {
int code = iEquipmentDetailService.count(new QueryWrapper<EquipmentDetail>().eq("eq_code", de.getEqcode()).ne("id",de.getId()));
if (code != 0) {
throw new BadRequest("部件编码填写重复，请重新输入！");
}
}
// EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
// String sysCode = vo.getCode();
// if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
// int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", vo.getCode()).ne("id",vo.getId()));
// if (code > 0){
// throw new BadRequest("设备编码重复");
// }
// }
// String iot = vo.getIotCode();
// if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
// int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()).ne("id",vo.getId()));
// if (iotCode > 0){
// throw new BadRequest("设备物联编码重复");
// }
// }
EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
String iot = vo.getIotCode();
if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()).ne("id",vo.getId()));
if (iotCode > 0){
throw new BadRequest("设备物联编码重复");
}
}
//1.更新装备实例Detail数据
EquipmentDetail equipmentDetail = equipmentDate.getEquipmentDetail();
EquipmentParams equipmentParams = equipmentDate.getEquipmentParams();
......@@ -627,12 +631,28 @@ public class EquipmentDetailController extends AbstractBaseController {
return iEquipmentDetailService.checkDelete(ids);
}
// @PostMapping(value = "/getEquipmentSpecificPage")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "POST", value = "传字段类型（car 或 equipment）装备列表带模板返回", notes = "根据id删除")
// public String getEquipmentSpecificAndDetailList() {
//
// return ;
// }
/**
* 导出隐患清单
*/
@ApiOperation(value = "导出装备清单", notes = "导出装备清单")
@PostMapping(value = "/export")
@TycloudOperation(ApiLevel = UserType.AGENCY)
public void exportDangerList(@RequestBody DetailssDTO detailssDTO, HttpServletResponse response) {
// DetailssDTO detailssDTO = new DetailssDTO();
// detailssDTO.setType("equipment");
String fileName = "装备清单" + new Date().getTime();
if(detailssDTO.getProp()==1){//全部导出
List<DetailssAmountVO> getall = iEquipmentDetailService.getall();
// IPage<DetailssAmountVO> detailsssAmountList = fireFightingSystemService.getDetailsssAmountList(0, null, detailssDTO);
// List<DetailssAmountVO> records = detailsssAmountList.getRecords();
FileHelper.exportExcel(getall, "装备清单", "装备清单", EquipmentDate.class, fileName + ".xls", response);
}
else {//仅仅导出筛选结果的数据
IPage<DetailssAmountVO> detailsssAmountList = fireFightingSystemService.getDetailsssAmountList(0, null, detailssDTO);
List<DetailssAmountVO> records = detailsssAmountList.getRecords();
FileHelper.exportExcel(records, "装备清单", "装备清单", EquipmentDate.class, fileName + ".xls", response);
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @ 7b23c939
package com.yeejoin.equipmanage.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.vo.*;
import com.yeejoin.equipmanage.common.utils.FileHelper;
import com.yeejoin.equipmanage.common.vo.*;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
......@@ -39,19 +40,8 @@ import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
import com.yeejoin.equipmanage.common.entity.ManufacturerInfo;
import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
import com.yeejoin.equipmanage.remote.RemoteSecurityService;
......@@ -69,6 +59,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletResponse;
/**
* @author zjw
* @date 2020-12-16
......@@ -255,19 +247,63 @@ public class FireFightingSystemController extends AbstractBaseController {
*
* @return
*/
// @PostMapping(value = "/getEquipTypeAmount")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "POST", value = "九大类下装备，通过code截取", notes = "九大类下装备信息列表")
// public IPage<EquipTypeImgAmountVO> getEquipTypeAmount(@RequestBody EquipTypeAmountPageDTO equipTypeAmountPage) {
// String[] result = hierarchy.split(",");
// Map<Integer, Integer> map = new HashMap<>();
// for (int i = 0; i < result.length; i++) {
// map.put(i, Integer.valueOf(result[i]));
// }
// if (StringUtil.isNotEmpty(equipTypeAmountPage.getEquipmentClassificationCode())) {
// QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
// equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
// equipmentCategoryQueryWrapper.eq("industry_code", equipTypeAmountPage.getIndustryCode());
// EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(equipmentCategoryQueryWrapper);
//
// if (equipmentCategory == null) {
// throw new RuntimeException("装备定义code有误");
// }
// int inhierarchy = 1;
// for (int i = 0; i < result.length + 1; i++) {
// //进来先判断是否默认就是空，如果为空第一层
// if (equipmentCategory.getParentId() == null) {
// //判断是否是最下面的子节点
// if (i >= 4) {
// inhierarchy = 8;
// } else {
// inhierarchy = map.get(i);
// }
// break;
// } else {
// //查找到循环几次为空
// equipmentCategory = equipmentCategoryService.getById(equipmentCategory.getParentId());
// }
// }
//
// IPage<EquipTypeImgAmountVO> colaCategoryAmountList1 = fireFightingSystemService.getColaCategoryAmountList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().substring(0, inhierarchy), equipTypeAmountPage);
// return colaCategoryAmountList1;
// } else {
// IPage<EquipTypeImgAmountVO> colaCategoryAmountList = fireFightingSystemService.getColaCategoryAmountList(0, null, equipTypeAmountPage);
// return colaCategoryAmountList;
// }
//
// }
@PostMapping(value = "/getEquipTypeAmount")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "九大类下装备，通过code截取", notes = "九大类下装备信息列表")
public IPage<EquipTypeImgAmountVO> getEquipTypeAmount(@RequestBody EquipTypeAmountPageDTO equipTypeAmountPage) {
public IPage<DetailssAmountVO> getEquipType(@RequestBody DetailssDTO detailssDTO) {
String[] result = hierarchy.split(",");
Map<Integer, Integer> map = new HashMap<>();
for (int i = 0; i < result.length; i++) {
map.put(i, Integer.valueOf(result[i]));
}
if (StringUtil.isNotEmpty(equipTypeAmountPage.getEquipmentClassificationCode())) {
if (StringUtil.isNotEmpty(detailssDTO.getEquipmentClassificationCode())) {
QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
equipmentCategoryQueryWrapper.eq("industry_code", equipTypeAmountPage.getIndustryCode());
equipmentCategoryQueryWrapper.eq("code", detailssDTO.getEquipmentClassificationCode());
equipmentCategoryQueryWrapper.eq("industry_code", detailssDTO.getIndustryCode());
EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(equipmentCategoryQueryWrapper);
if (equipmentCategory == null) {
throw new RuntimeException("装备定义code有误");
......@@ -289,16 +325,19 @@ public class FireFightingSystemController extends AbstractBaseController {
}
}
IPage<EquipTypeImgAmountVO> colaCategoryAmountList1 = fireFightingSystemService.getColaCategoryAmountList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().substring(0, inhierarchy), equipTypeAmountPage);
IPage<DetailssAmountVO> colaCategoryAmountList1 = fireFightingSystemService.getDetailsssAmountList(inhierarchy, detailssDTO.getEquipmentClassificationCode().substring(0, inhierarchy), detailssDTO);
return colaCategoryAmountList1;
} else {
IPage<EquipTypeImgAmountVO> colaCategoryAmountList = fireFightingSystemService.getColaCategoryAmountList(0, null, equipTypeAmountPage);
IPage<DetailssAmountVO> colaCategoryAmountList = fireFightingSystemService.getDetailsssAmountList(0, null, detailssDTO);
return colaCategoryAmountList;
}
}
/**
* 添加系统
*
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentDetailMapper.java
View file @ 7b23c939
......@@ -3,6 +3,9 @@ package com.yeejoin.equipmanage.mapper;
import java.util.List;
import com.yeejoin.equipmanage.common.entity.EquProperty;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -31,7 +34,7 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
int countCategory(@Param("offset") long offset, @Param("size") long size,
@Param("list") List<EquipmentCategory> list);
List<EquipmentPar> equpar();
List<EquipmentDate> equpar();
int quotaUpdate(EquProperty e);
......@@ -40,4 +43,6 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
String checkDelete(Long id);
List<Long> getWareId(@Param("id") Long id);
List<DetailssAmountVO> getall();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @ 7b23c939
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
import com.yeejoin.equipmanage.common.entity.vo.*;
import com.yeejoin.equipmanage.common.vo.*;
......@@ -106,11 +107,16 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
, @Param("createDate")String createDate
, @Param("type")String type);
IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(@Param("page")IPage page,
IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(@Param("page")IPage page,
@Param("hierarchy")int hierarchy,
@Param("codeHead")String codeHead,
@Param("codeHead")String codeHead,
@Param("equipTypeAmountPage")EquipTypeAmountPageDTO equipTypeAmountPage);
IPage<DetailssAmountVO> getDetailAmountList(@Param("page")IPage page,
@Param("hierarchy")int hierarchy,
@Param("codeHead")String codeHead,
@Param("detailssDTO") DetailssDTO detailssDTO);
List<FireFightingSystem> getFireFightingSystemDetail(@Param("fireFightingSystemVo")FireFightingSystemVo fireFightingSystemVo);
List<FireFightingSystemEntity> getFightingSysByCodes(@Param("ids") String[] idsArr);
......@@ -120,13 +126,13 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
List<FireFightingSystem3dVo> get3dFightingSystemList(@Param("list") List<String> collect);
List<SpeIndexVo> getSpeIndexIn(@Param("list") List<Long> idList);
Map<String, Object> getFireSystemState();
Map<String, Object> getFireOnlSystem();
Map<String, Object> getFireOnlSystemThreeSmall();
Map<String, Object> getFireCafsSystem();
......@@ -138,11 +144,11 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
Map<String, Object> getFireAcsSystem();
Map<String, Object> getFireFhsSystem();
Map<String, Object> getTodayConfirmAlarmInfo();
Map<String, Object> getPoolInfo();
FireFightingSystemVo getFightingSysInfo(@Param("code") String code, @Param("id") Long id);
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentDetailService.java
View file @ 7b23c939
......@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.equipmanage.common.entity.EquProperty;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import java.util.List;
......@@ -35,4 +38,5 @@ public interface IEquipmentDetailService extends IService<EquipmentDetail> {
String checkDelete( List<Long> ids);
List<DetailssAmountVO> getall();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java
View file @ 7b23c939
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
import com.yeejoin.equipmanage.common.entity.vo.*;
import com.yeejoin.equipmanage.common.vo.*;
......@@ -115,6 +116,8 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(int hierarchy, String codeHead, EquipTypeAmountPageDTO equipTypeAmountPage);
IPage<DetailssAmountVO> getDetailsssAmountList(int hierarchy, String codeHead, DetailssDTO detailssDTO);
/**
* 获取消防系统在装备分类的定义
* @return List<EquipmentManageVo>
......@@ -143,7 +146,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
* @return FireFightingSystemEntity
*/
FireFightingSystemEntity getDetailByCode(String systemCode);
/**
* 集成页面系统数据
* @param systemCode 系统code
......@@ -151,7 +154,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
* @return Map<String,Object>
*/
Map<String,Object> integrationPageSysData(String systemCode, Boolean isUpdate);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ 7b23c939
......@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.enums.BillContentEnum;
import com.yeejoin.equipmanage.common.enums.FileTypeEnum;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import com.yeejoin.equipmanage.mapper.*;
import com.yeejoin.equipmanage.service.*;
......@@ -63,6 +66,10 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Autowired
private IUploadFileService iUploadFileService;
@Autowired
private IEquipmentCategoryService equipmentCategoryService;
@Autowired
private EquipmentOnCarMapper equipmentOnCarMapper;
@Autowired
......@@ -73,8 +80,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Override
public EquipmentDetail saveOne(EquipmentDetail equipmentDetail) {
Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
equipmentDetail.setCode(equipment.getCode());
// EquipmentCategory byId = equipmentCategoryService.getById(equipmentDetail.getCode());
// equipmentDetail.setCode(byId.getCode());
equipmentDetail.setEquipmentId(equipmentDetail.getEquipmentId());
this.save(equipmentDetail);
saveFile(equipmentDetail);
......@@ -110,7 +117,11 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
return null;
}
Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectById(equipment.getCategoryId());
Map<String, Object> map2 = new HashMap<>();
map2.put("code",equipmentDetail.getCode());
EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectByMap(map2).get(0);
// equipmentDetail.setCountry(equipmentCategory.getId());
// EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectById(equipment.getCategoryId());
equipment.setEquipmentCategory(equipmentCategory);
Unit unit = iUnitService.getById(equipment.getUnitId());
equipment.setUnit(unit);
......@@ -150,7 +161,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
if (!dbEquip.getEquipmentId().equals(equipmentDetail.getEquipmentId())) {
//编辑逻辑
Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
equipmentDetail.setCode(equipment.getCode());
equipmentDetail.setEquipmentName(equipment.getName());
equipmentSpecificIndexSerivce.remove(new LambdaQueryWrapper<EquipmentSpecificIndex>().eq(EquipmentSpecificIndex::getEquipmentSpecificId, equipmentSpecificId));
List<EquProperty> equPropertyList = equipmentDetail.getEquPropertyList();
......@@ -180,6 +191,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
}
}
//2.更新Detail表
EquipmentCategory byId = equipmentCategoryService.getById(equipmentDetail.getCode());
equipmentDetail.setCode(byId.getCode());
equipmentDetailMapper.updateById(equipmentDetail);
//3.保存图片
iUploadFileService.remove(new QueryWrapper<UploadFile>().eq("object_type", BillContentEnum.ZB.getKey())
......@@ -277,4 +290,10 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
}
return res;
}
@Override
public List<DetailssAmountVO> getall() {
return equipmentDetailMapper.getall();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentParamsServiceImpl.java
View file @ 7b23c939
......@@ -24,6 +24,7 @@ public class EquipmentParamsServiceImpl extends ServiceImpl<EquipmentParamsMapp
@Override
public EquipmentParams saveOne(EquipmentParams equipmentParams) {
equipmentParamsMapper.insert(equipmentParams);
return equipmentParams;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ 7b23c939
......@@ -1183,9 +1183,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
equipmentSpecific.setStock(new Stock().setWarehouseId(0L));
EquipmentDetail equipmentDetail = equipmentData.getEquipmentDetail();
Equipment equipment = equipmentService.getById(equipmentDetail.getEquipmentId());
EquipmentCategory byId = equipmentCategoryService.getById(equipmentDetail.getCode());
if (equipment != null) {
String equipmentCode = equipment.getCode();
equipmentDetail.setCode(equipmentCode);
equipmentDetail.setCode(byId.getCode());
equipmentDetail.setEquipmentName(equipment.getName());
equipmentSpecific.setEquipmentCode(equipmentCode);
equipmentSpecific.setName(equipmentDetail.getName());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ 7b23c939
......@@ -19,6 +19,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
import com.yeejoin.equipmanage.common.entity.vo.*;
import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
......@@ -705,6 +706,20 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
});
return list;
}
@Override
public IPage<DetailssAmountVO> getDetailsssAmountList(int hierarchy, String codeHead, DetailssDTO detailssDTO) {
String type = detailssDTO.getType();
if (!"".equals(type) && "car".equals(type)) {
detailssDTO.setStatus(0);
}
IPage<DetailssAmountVO> list = fireFightingSystemMapper.getDetailAmountList(detailssDTO.getPage(), hierarchy, codeHead, detailssDTO);
// list.getRecords().forEach(x -> {
// if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
// x.setAmount(x.getAmount().split("\\.")[0]);
// }
// });
return list;
}
@Override
public List<EquipmentManageVo> getSystemCategory() {
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml
View file @ 7b23c939
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.equipmanage.mapper.EquipmentDetailMapper">
<resultMap id="EquipmentDetailMap" type="com.yeejoin.equipmanage.common.vo.EquipmentPar">
<resultMap id="EquipmentDateMap" type="com.yeejoin.equipmanage.common.vo.EquipmentDate">
<association property="equipmentDetail" javaType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
<result column="name" property="name" />
<result column="code" property="code" />
<result column="eq_code" property="eqcode" />
<result column="remark" property="remark" />
<result column="manufacturer_id" property="manufacturerId" />
<result column="supplier_id" property="supplierId" />
<result column="manufacturer_cycle" property="manufacturerCycle"/>
<result column="standard" property="standard" />
<result column="brand" property="brand" />
<result column="production_date" property="productionDate" />
<result column="update_date" property="updateDate" />
<result column="create_date" property="createDate" />
<result column="join_date" property="joinDate" />
<result column="open_date" property="openDate" />
<result column="area" property="area" />
<result column="equipment_id" property="equipmentId" />
<result column="equipment_name" property="equipmentName" />
</association>
<association property="equipmentParams" javaType="com.yeejoin.equipmanage.common.entity.EquipmentParams">
<result column="status" property="status"/>
<result column="reason" property="reason"/>
<result column="measure" property="measure"/>
</association>
<association property="equipmentSpecific" javaType="com.yeejoin.equipmanage.common.entity.EquipmentSpecific">
<result column="iot_code" property="iotCode"/>
</association>
</resultMap>
<select id="page"
......@@ -134,6 +137,43 @@
LIMIT #{offset},#{size}
</select>
<select id="getall" resultMap="EquipmentDateMap">
SELECT
wles.id,
wled.standard,
wled.NAME name,
'equipment' AS type,
CASE
wlp.`status`
WHEN '0' THEN
'正常'
WHEN '1' THEN
'故障' ELSE '错误'
END AS STATUS,
wled.remark,
wled.brand,
wled.area,
wled.maintenance_cycle,
wled.eq_code,
wled.join_date,
wled.open_date,
wlp.reason,
wlp.measure,
wles.iot_code,
wled.equipment_id,
wled.equipment_name
FROM
wl_equipment_detail wled
LEFT JOIN ( SELECT id, qr_code, CODE, iot_code, create_date, equipment_detail_id, system_id FROM wl_equipment_specific ) wles ON wles.equipment_detail_id = wled.id
LEFT JOIN ( SELECT id, amount, STATUS, equipment_specific_id, warehouse_structure_id FROM wl_stock_detail ) wlsd ON wlsd.equipment_specific_id = wles.id
LEFT JOIN wl_warehouse_structure wlws ON wlsd.warehouse_structure_id = wlws.id
LEFT JOIN wl_equipment_params wlp ON wlp.code = wled.eq_code
LEFT JOIN wl_equipment wle ON wle.id = wled.equipment_id
LEFT JOIN wl_unit wlun ON wle.unit_id = wlun.id
LEFT JOIN wl_manufacturer_info wlai ON wled.manufacturer_id = wlai.id
LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id
</select>
<select id="countCategory" resultType="Integer">
SELECT
COUNT(1)
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 7b23c939
......@@ -33,18 +33,23 @@
<result property="iotCode" column="iotCode"></result>
<result property="eqtype" column="eqtype"></result>
</resultMap>
<!-- <resultMap id="DetailssAmountList" type="com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO">-->
<!-- <result column="id" property="id"></result>-->
<!-- <result column="standard" property="standard"></result>-->
<!-- <result column="name" property="name"></result>-->
<!-- <result column="remark" property="remark"></result>-->
<!-- <result column="eq_code" property="eqcode"></result>-->
<!-- <result column="join_date" property="joinDate"></result>-->
<!-- <result column="open_date" property="openDate"></result>-->
<!-- <result column="reason" property="reason"></result>-->
<!-- <result column="STATUS" property="status"></result>-->
<!-- <result column="measure" property="measure"></result>-->
<!-- </resultMap>-->
<resultMap id="DetailssAmountList" type="com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO">
<result column="id" property="id"></result>
<result column="standard" property="standard"></result>
<result column="brand" property="brand"></result>
<result column="name" property="name"></result>
<result column="area" property="area"></result>
<result property="type" column="type"></result>
<result column="remark" property="remark"></result>
<result column="eq_code" property="eqcode"></result>
<result column="maintenance_cycle" property="maintenanceCycle"></result>
<result column="join_date" property="joinDate"></result>
<result column="open_date" property="openDate"></result>
<result column="reason" property="reason"></result>
<result column="STATUS" property="status"></result>
<result column="measure" property="measure"></result>
<result property="iotCode" column="iotCode"></result>
</resultMap>
<select id="getEquiplistBySystemId" resultMap="EquiplistBySystemId">
SELECT
spe.id,
......@@ -595,45 +600,93 @@
</where>
ORDER BY d.createDate DESC
</select>
<!-- <select id="getColaCategoryAmountList" resultMap="DetailssAmountList">-->
<!-- <if test="equipTypeAmountPage.type == 'equipment' or codeHead==null or codeHead=='' or codeHead==' '">-->
<!-- SELECT-->
<!-- *-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- wles.id,-->
<!-- wled.standard,-->
<!-- wled.NAME name,-->
<!-- 'equipment' AS type,-->
<!-- CASE-->
<!-- wlp.`status`-->
<!-- WHEN '0' THEN-->
<!-- '正常'-->
<!-- WHEN '1' THEN-->
<!-- '故障' ELSE '错误'-->
<!-- END AS STATUS,-->
<!-- wled.remark,-->
<!-- wled.brand,-->
<!-- wled.eq_code,-->
<!-- wled.join_date,-->
<!-- wled.open_date,-->
<!-- wlp.reason,-->
<!-- wlp.measure-->
<!-- FROM-->
<!-- ( SELECT id, qr_code, CODE, iot_code, create_date, equipment_detail_id, system_id FROM wl_equipment_specific ) wles-->
<!-- LEFT JOIN ( SELECT id, amount, STATUS, equipment_specific_id, warehouse_structure_id FROM wl_stock_detail ) wlsd ON wlsd.equipment_specific_id = wles.id-->
<!-- LEFT JOIN wl_warehouse_structure wlws ON wlsd.warehouse_structure_id = wlws.id-->
<!-- LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id-->
<!-- LEFT JOIN wl_equipment_params wlp ON wlp.code = wled.eq_code-->
<!-- LEFT JOIN wl_equipment wle ON wle.id = wled.equipment_id-->
<!-- LEFT JOIN wl_unit wlun ON wle.unit_id = wlun.id-->
<!-- LEFT JOIN wl_manufacturer_info wlai ON wled.manufacturer_id = wlai.id-->
<!-- LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id-->
<!-- WHERE 1=1-->
<!-- )s1-->
<!-- </if>-->
<!-- </select>-->
<select id="getDetailAmountList" resultMap="DetailssAmountList">
<if test="detailssDTO.type == 'equipment'or codeHead==null or codeHead=='' or codeHead==' '">
SELECT
wles.id,
wled.standard,
wled.NAME name,
'equipment' AS type,
CASE
wlp.`status`
WHEN '0' THEN
'正常'
WHEN '1' THEN
'故障' ELSE '错误'
END AS STATUS,
wled.remark,
wled.brand,
wled.area,
wled.maintenance_cycle,
wled.eq_code,
wled.join_date,
wled.open_date,
wlp.reason,
wlp.measure,
wles.iot_code,
wled.equipment_id,
wled.equipment_name
FROM
wl_equipment_detail wled
LEFT JOIN ( SELECT id, qr_code, CODE, iot_code, create_date, equipment_detail_id, system_id FROM wl_equipment_specific ) wles ON wles.equipment_detail_id = wled.id
LEFT JOIN ( SELECT id, amount, STATUS, equipment_specific_id, warehouse_structure_id FROM wl_stock_detail ) wlsd ON wlsd.equipment_specific_id = wles.id
LEFT JOIN wl_warehouse_structure wlws ON wlsd.warehouse_structure_id = wlws.id
LEFT JOIN wl_equipment_params wlp ON wlp.code = wled.eq_code
LEFT JOIN wl_equipment wle ON wle.id = wled.equipment_id
LEFT JOIN wl_unit wlun ON wle.unit_id = wlun.id
LEFT JOIN wl_manufacturer_info wlai ON wled.manufacturer_id = wlai.id
LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id
WHERE 1=1
<if test="codeHead!=null and codeHead!='' and codeHead!=' '">
and LEFT (wled.code, #{hierarchy}) = #{codeHead}
</if>
<if test="detailssDTO.industryCode!=null">
and wec.industry_code = #{detailssDTO.industryCode}
</if>
<if test="detailssDTO.standard!=null">
and wled.standard = #{detailssDTO.standard}
</if>
<if test="detailssDTO.area!=null">
and wled.area = #{detailssDTO.area}
</if>
<if test="detailssDTO.brand!=null">
and wled.brand = #{detailssDTO.brand}
</if>
<if test="detailssDTO.openDate!=null">
and wled.open_date = #{detailssDTO.openDate}
</if>
<if test="detailssDTO.maintenanceCycle!=null">
and wled.maintenance_cycle = #{detailssDTO.maintenanceCycle}
</if>
<if test="detailssDTO.remark!=null">
and wled.remark = #{detailssDTO.remark}
</if>
<if test="detailssDTO.joinDate!=null">
and wled.join_date = #{detailssDTO.joinDate}
</if>
<if test="detailssDTO.status!=null">
and wlp.status = #{detailssDTO.status}
</if>
<if test="detailssDTO.reason!=null">
and wlp.reason = #{detailssDTO.reason}
</if>
<if test="detailssDTO.measure!=null">
and wled.measure = #{detailssDTO.measure}
</if>
<if test="detailssDTO.name!=null and detailssDTO.name!=''">
AND wled.name LIKE CONCAT('%',#{detailssDTO.name},'%')
</if>
<if test="detailssDTO.eqcode!=null and detailssDTO.eqcode!=''">
AND wled.eq_code LIKE CONCAT('%',#{detailssDTO.eqcode},'%')
</if>
<if test="detailssDTO.iotCode!=null and detailssDTO.iotCode!=''">
AND wles.iot_code LIKE CONCAT('%',#{detailssDTO.iotCode},'%')
</if>
</if>
order by wled.create_date DESC
</select>
<select id="getColaCategoryAmountList" resultMap="CategoryAmountList">
<if test="equipTypeAmountPage.type == 'equipment' or codeHead==null or codeHead=='' or codeHead==' '">
......
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