Merge remote-tracking branch 'origin/master'

master
mengjiao 2 years ago
commit 352fba7ee2

@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
/**
* sap
*
@ -22,6 +24,10 @@ public interface RemoteSapService {
@PostMapping("/sap/shopOrderSync")
public R<List<SapProOrder>> shopOrderSync(@RequestBody SapShopOrderQuery sapProOrder);
/**传递母订单号和母订单数量**/
@PostMapping("/sap/shopUpdateSync")
public R shopUpdateSync(@RequestBody SapShopOrderQuery sapProOrder);
@PostMapping("/sap/sapRouterSync")
public R<Boolean> sapRouterSync(@RequestBody SapRouterQuery sapRouterQuery);
@ -30,11 +36,11 @@ public interface RemoteSapService {
/**回传sap母工单**/
@PostMapping("/sap/sapCreateOrder")
public R<List<String>> SapCreateOrder(@RequestBody List<SapCreateOrder> sapCreateOrderList);
public R<List<Map<String, String>>> SapCreateOrder(@RequestBody List<SapCreateOrder> sapCreateOrderList);
/**关闭订单**/
@PostMapping("/sap/sapCloseOrder")
public R sapCloseOrder(@RequestParam("shopOrder") String shopOrder);
public R sapCloseOrder(@RequestBody SapCloseOrderQuery sapCloseOrderQuery);
/**报工**/
@PostMapping("/sap/sapRFWOrder")

@ -1,15 +1,14 @@
package com.op.system.api.domain.dto;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* mes_prepare
* mes_prepareDTO
*
* @author Open Platform
* @date 2023-08-03
@ -23,6 +22,7 @@ public class MesPrepareDTO extends BaseEntity {
/** 工单编码 */
@Excel(name = "工单编码")
private String workorderCode;
private String workorderCodeSap;
/** 工单名称 */
@Excel(name = "工单名称")
@ -120,6 +120,25 @@ public class MesPrepareDTO extends BaseEntity {
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
private String dayStr;
public String getWorkorderCodeSap() {
return workorderCodeSap;
}
public void setWorkorderCodeSap(String workorderCodeSap) {
this.workorderCodeSap = workorderCodeSap;
}
public String getDayStr() {
return dayStr;
}
public void setDayStr(String dayStr) {
this.dayStr = dayStr;
}
public String getMaterialCode() {
return materialCode;
}
@ -305,37 +324,37 @@ public class MesPrepareDTO extends BaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("prepareId", getPrepareId())
.append("workorderCode", getWorkorderCode())
.append("workorderName", getWorkorderName())
.append("parentOrder", getParentOrder())
.append("orderId", getOrderId())
.append("orderCode", getOrderCode())
.append("productId", getProductId())
.append("productCode", getProductCode())
.append("prodType", getProdType())
.append("productName", getProductName())
.append("productSpc", getProductSpc())
.append("wetDetailPlanId", getWetDetailPlanId())
.append("productDate", getProductDate())
.append("shiftId", getShiftId())
.append("ancestors", getAncestors())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("materialSpc", getMaterialSpc())
.append("quantity", getQuantity())
.append("unit", getUnit())
.toString();
.append("prepareId", getPrepareId())
.append("workorderCode", getWorkorderCode())
.append("workorderName", getWorkorderName())
.append("parentOrder", getParentOrder())
.append("orderId", getOrderId())
.append("orderCode", getOrderCode())
.append("productId", getProductId())
.append("productCode", getProductCode())
.append("prodType", getProdType())
.append("productName", getProductName())
.append("productSpc", getProductSpc())
.append("wetDetailPlanId", getWetDetailPlanId())
.append("productDate", getProductDate())
.append("shiftId", getShiftId())
.append("ancestors", getAncestors())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("materialSpc", getMaterialSpc())
.append("quantity", getQuantity())
.append("unit", getUnit())
.toString();
}
}

@ -1,12 +1,11 @@
package com.op.system.api.domain.dto;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* mes mes_prepare_detail
@ -42,7 +41,9 @@ public class MesPrepareDetailDTO extends BaseEntity {
/** 生产数量 */
@Excel(name = "生产数量")
private Long quantity;
private String quantity;
private String fundQuanlity;
/** 工单生产日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@ -76,11 +77,66 @@ public class MesPrepareDetailDTO extends BaseEntity {
/** 产品类型 */
@Excel(name = "产品类型")
private String prodType;
/** 库位 */
private String locator;
private String needDate;
private String recoil;
private String buyFlag;
private String parentWorkOrder;
public String getParentWorkOrder() {
return parentWorkOrder;
}
public void setParentWorkOrder(String parentWorkOrder) {
this.parentWorkOrder = parentWorkOrder;
}
public String getBuyFlag() {
return buyFlag;
}
public void setBuyFlag(String buyFlag) {
this.buyFlag = buyFlag;
}
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String factoryCode;
public String getRecoil() {
return recoil;
}
public void setRecoil(String recoil) {
this.recoil = recoil;
}
public String getFundQuanlity() {
return fundQuanlity;
}
public void setFundQuanlity(String fundQuanlity) {
this.fundQuanlity = fundQuanlity;
}
public String getNeedDate() {
return needDate;
}
public void setNeedDate(String needDate) {
this.needDate = needDate;
}
public String getLocator() {
return locator;
}
public void setLocator(String locator) {
this.locator = locator;
}
public void setRecordId(String recordId) {
this.recordId = recordId;
}
@ -123,11 +179,11 @@ public class MesPrepareDetailDTO extends BaseEntity {
public String getUnit() {
return unit;
}
public void setQuantity(Long quantity) {
public void setQuantity(String quantity) {
this.quantity = quantity;
}
public Long getQuantity() {
public String getQuantity() {
return quantity;
}
public void setProductDate(Date productDate) {
@ -197,27 +253,27 @@ public class MesPrepareDetailDTO extends BaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("prepareId", getPrepareId())
.append("materialCode", getMaterialCode())
.append("materailName", getMaterailName())
.append("materailSpc", getMaterailSpc())
.append("unit", getUnit())
.append("quantity", getQuantity())
.append("productDate", getProductDate())
.append("shiftId", getShiftId())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("prodType", getProdType())
.append("factoryCode", getFactoryCode())
.toString();
.append("recordId", getRecordId())
.append("prepareId", getPrepareId())
.append("materialCode", getMaterialCode())
.append("materailName", getMaterailName())
.append("materailSpc", getMaterailSpc())
.append("unit", getUnit())
.append("quantity", getQuantity())
.append("productDate", getProductDate())
.append("shiftId", getShiftId())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("prodType", getProdType())
.append("factoryCode", getFactoryCode())
.toString();
}
}

@ -0,0 +1,197 @@
package com.op.system.api.domain.mes;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* mes_report_work_consume
*
* @author Open Platform
* @date 2023-08-24
*/
public class MesReportWorkConsumeDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
/** id */
private String recordId;
/** 工单编码 */
@Excel(name = "工单编码")
private String workorderCode;
/** 物料编号 */
@Excel(name = "物料编号")
private String materialCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 物料规格型号 */
@Excel(name = "物料规格型号")
private String materialSpc;
/** 数量 */
@Excel(name = "数量")
private Long quantity;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private String attr4;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
/** 工厂编码 */
@Excel(name = "报工编码")
private String reportCode;
//虚拟字段
private String id;
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public String getRecordId() {
return recordId;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setReportCode(String reportCode) {
this.reportCode = reportCode;
}
public String getReportCode() {
return reportCode;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialName() {
return materialName;
}
public void setMaterialSpc(String materialSpc) {
this.materialSpc = materialSpc;
}
public String getMaterialSpc() {
return materialSpc;
}
public void setQuantity(Long quantity) {
this.quantity = quantity;
}
public Long getQuantity() {
return quantity;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
//虚拟字段
public void setId(String factoryCode) {
this.id = id;
}
public String getId() {
return id;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("id", getId())
.append("reportCode", getReportCode())
.append("workorderCode", getWorkorderCode())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("materialSpc", getMaterialSpc())
.append("quantity", getQuantity())
.append("unit", getUnit())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.toString();
}
}

@ -0,0 +1,45 @@
package com.op.system.api.domain.quality;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.List;
/**
*
*echart
* @author zxl
* @date 2023-07-18
*/
public class ChartDTO {
private String name;
private String type;
private List<Double> data;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public List<Double> getData() {
return data;
}
public void setData(List<Double> data) {
this.data = data;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

@ -0,0 +1,126 @@
package com.op.system.api.domain.quality;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.TreeEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* sys_factory
*
* @author Open Platform
* @date 2023-07-03
*/
public class FactoryDto extends TreeEntity {
private static final long serialVersionUID = 1L;
/** 工厂id */
private Long factoryId;
/** 部门名称 */
@Excel(name = "工厂名称")
private String factoryName;
/** 负责人 */
@Excel(name = "负责人")
private String leader;
/** 联系电话 */
@Excel(name = "联系电话")
private String phone;
/** 邮箱 */
@Excel(name = "邮箱")
private String email;
/** 部门状态0正常 */
@Excel(name = "工厂状态")
private String status;
/** 删除标志0代表存在 */
private String delFlag;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
public void setFactoryId(Long factoryId) {
this.factoryId = factoryId;
}
public Long getFactoryId() {
return factoryId;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
public String getFactoryName() {
return factoryName;
}
public void setLeader(String leader) {
this.leader = leader;
}
public String getLeader() {
return leader;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getPhone() {
return phone;
}
public void setEmail(String email) {
this.email = email;
}
public String getEmail() {
return email;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("factoryId", getFactoryId())
.append("parentId", getParentId())
.append("ancestors", getAncestors())
.append("factoryName", getFactoryName())
.append("orderNum", getOrderNum())
.append("leader", getLeader())
.append("phone", getPhone())
.append("email", getEmail())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.toString();
}
}

@ -0,0 +1,23 @@
package com.op.system.api.domain.sap;
public class SapCloseOrderQuery {
private String leadOrder;
private String order;
public String getLeadOrder() {
return leadOrder;
}
public void setLeadOrder(String leadOrder) {
this.leadOrder = leadOrder;
}
public String getOrder() {
return order;
}
public void setOrder(String order) {
this.order = order;
}
}

@ -1,5 +1,7 @@
package com.op.system.api.domain.sap;
import java.util.List;
/**
*
*/
@ -7,14 +9,14 @@ public class SapRFW {
private String aufnr;
private String gamng;
private lt_gs lt_gs;
private lt_hw lt_hw;
private List<lt_hw> lt_hwList;
public SapRFW.lt_hw getLt_hw() {
return lt_hw;
public List<lt_hw> getLt_hwList() {
return lt_hwList;
}
public void setLt_hw(SapRFW.lt_hw lt_hw) {
this.lt_hw = lt_hw;
public void setLt_hwList(List<lt_hw> lt_hwList) {
this.lt_hwList = lt_hwList;
}
public SapRFW.lt_gs getLt_gs() {
@ -42,7 +44,7 @@ public class SapRFW {
}
public class lt_gs
public static class lt_gs
{
String conf_activity1;
String conf_activity2;
@ -112,7 +114,7 @@ public class SapRFW {
}
}
public class lt_hw{
public class lt_hw{
String material;
String entry_qnt;
@ -140,13 +142,5 @@ public class SapRFW {
'}';
}
}
@Override
public String toString() {
return "{" +
"aufnr:"+aufnr+","+
"gamng:"+gamng+","+
"lt_gs:"+lt_gs.toString()+","+
"lt_hw:"+lt_hw.toString()+","+
"}";
}
}

@ -10,6 +10,16 @@ public class SapShopOrderQuery {
private String matnr;
private String erdat;
private String werk;
private String quantity;
public String getQuantity() {
return quantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
}
public String getWerk() {
return werk;

@ -7,9 +7,11 @@ import com.op.system.api.model.SapProOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
public class RemoteSapFallbackFactory implements FallbackFactory<RemoteSapService> {
private static final Logger log = LoggerFactory.getLogger(RemoteSapFallbackFactory.class);
@ -33,12 +35,12 @@ public class RemoteSapFallbackFactory implements FallbackFactory<RemoteSapServic
}
@Override
public R<List<String>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList) {
public R<List<Map<String, String>>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList) {
return R.fail("回传sap工单失败:" + throwable.getMessage());
}
@Override
public R sapCloseOrder(String shopOrder) {
public R sapCloseOrder(SapCloseOrderQuery sapCloseOrderQuery) {
return R.fail("关闭订单失败:" + throwable.getMessage());
}
@ -72,6 +74,11 @@ public class RemoteSapFallbackFactory implements FallbackFactory<RemoteSapServic
return R.fail("sap bom同步失败" + throwable.getMessage());
}
@Override
public R shopUpdateSync(SapShopOrderQuery sapProOrder) {
return R.fail("sap shopUpdateSync失败" + throwable.getMessage());
}
};
}

@ -137,4 +137,14 @@ public class Constants {
public static final String LOW="LOW";
public static final String HIGH="HIGH";
/**
* SAP
*/
//退料
public static final Integer TL=262;
//领料
public static final Integer LL=261;
}

@ -1,5 +1,10 @@
package com.op.device.controller;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOperationRecord;
import com.op.device.service.IDeviceInterfaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -13,4 +18,67 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/deviceInterface")
public class DeviceInterfaceController {
@Autowired
private IDeviceInterfaceService deviceInterfaceService;
/**
*
* @return
*/
@GetMapping("/getRepairWorkOrder")
public AjaxResult getRepairWorkOrder() {
return deviceInterfaceService.getRepairWorkOrder();
}
/**
*
* @return
*/
@GetMapping("/getEquipmentInfo")
public AjaxResult getEquipmentInfo() {
return deviceInterfaceService.getEquipmentInfo();
}
/**
* TOP10
* /
* @return
*/
@GetMapping("/getRepairQuantity")
public AjaxResult getRepairQuantity() {
return deviceInterfaceService.getRepairQuantity();
}
/**
* -MTBF top10
* /
* @param equOperationRecord
* @return
*/
@GetMapping("/equipmentStability")
public AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord) {
return deviceInterfaceService.getEquipmentStabilityList(equOperationRecord);
}
/**
*
* /
* @param equOperationRecord
* @return
*/
@GetMapping("/equipmentIntactRate")
public AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord) {
return deviceInterfaceService.getEquipmentIntactRate(equOperationRecord);
}
/**
*
*
*/
@GetMapping("/getDeviceRefreshTime")
public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) {
return deviceInterfaceService.getDeviceRefreshTime(equOperationRecord);
}
}

@ -1,6 +1,8 @@
package com.op.device.controller;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.web.page.TableDataInfo;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.device.domain.*;
import com.op.device.domain.dto.PDADTO;
@ -9,6 +11,8 @@ import com.op.device.service.IEquRepairOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* PDAController
*
@ -17,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
*/
@RestController
@RequestMapping("/devicePDA")
public class DevicePDAController {
public class DevicePDAController extends BaseController {
@Autowired
private IDevicePDAService devicePDAService;
@ -27,6 +31,7 @@ public class DevicePDAController {
/**
* list
*
* @param pdadto
* @return
*/
@ -37,6 +42,7 @@ public class DevicePDAController {
/**
*
*
* @param pdadto
* @return
*/
@ -47,6 +53,7 @@ public class DevicePDAController {
/**
*
*
* @param equOrder
* @return
*/
@ -56,7 +63,8 @@ public class DevicePDAController {
}
/**
*
*
*
* @param equOrder
* @return
*/
@ -66,8 +74,10 @@ public class DevicePDAController {
}
//报修
/**
*
*
* @param equRepairOrder
* @return
*/
@ -77,6 +87,7 @@ public class DevicePDAController {
}
//维修
/**
*
*
@ -119,6 +130,16 @@ public class DevicePDAController {
return devicePDAService.selectEquEquipmentByEquEquipmentId(equipmentId);
}
/**
*
*/
@GetMapping("/getEquipmentList")
public TableDataInfo getEquipmentList(EquEquipment equEquipment) {
startPage();
List<EquEquipment> list = devicePDAService.selectEquEquipmentList(equEquipment);
return getDataTable(list);
}
/**
*
*/
@ -129,6 +150,7 @@ public class DevicePDAController {
/**
*
*
* @param equRepairWorkOrder
* @return
*/
@ -137,8 +159,15 @@ public class DevicePDAController {
return devicePDAService.updateMaintenanceRecords(equRepairWorkOrder);
}
//传故障类型
// @GetMapping(value = "/queryEquFaultTypeTree")
// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
// return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder);
// }
/**
*
*
* @param pdadto
* @return
*/

@ -93,6 +93,6 @@ public class EquOrderController extends BaseController {
@Log(title = "计划工单", businessType = BusinessType.DELETE)
@DeleteMapping("/{orderIds}")
public AjaxResult remove(@PathVariable String[] orderIds) {
return toAjax(equOrderService.deleteEquOrderByOrderIds(orderIds));
return equOrderService.deleteEquOrderByOrderIds(orderIds);
}
}

@ -4,6 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquTeamUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -130,9 +131,9 @@ public class EquRepairOrderController extends BaseController {
*
*/
@GetMapping("/getRepairPersonList")
public TableDataInfo getRepairPersonList(EquEquipment equEquipment) {
public TableDataInfo getRepairPersonList(EquTeamUser equTeamUser) {
startPage();
List<EquEquipment> list = equRepairOrderService.getRepairPersonList(equEquipment);
List<EquTeamUser> list = equRepairOrderService.getRepairPersonList(equTeamUser);
return getDataTable(list);
}

@ -94,7 +94,7 @@ public class EquSpareApplyController extends BaseController {
@Log(title = "申领记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{applyIds}")
public AjaxResult remove(@PathVariable String[] applyIds) {
return toAjax(equSpareApplyService.deleteEquSpareApplyByApplyIds(applyIds));
return equSpareApplyService.deleteEquSpareApplyByApplyIds(applyIds);
}
/**

@ -95,6 +95,39 @@ public class EquCheckItem extends BaseEntity {
// 更新日期结束
private String updateTimeEnd;
// 检查项工具
private String itemTools;
// 循环周期类型
private String itemLoopType;
// 循环周期
private int itemLoop;
public int getItemLoop() {
return itemLoop;
}
public void setItemLoop(int itemLoop) {
this.itemLoop = itemLoop;
}
public String getItemLoopType() {
return itemLoopType;
}
public void setItemLoopType(String itemLoopType) {
this.itemLoopType = itemLoopType;
}
public String getItemTools() {
return itemTools;
}
public void setItemTools(String itemTools) {
this.itemTools = itemTools;
}
private List<EquCheckItemDetail> equCheckItemDetailList;
public List<EquCheckItemDetail> getEquCheckItemDetailList() {

@ -74,6 +74,14 @@ public class EquFaultType extends BaseEntity {
// 创建日期结束
private String createTimeEnd;
//故障大类
// 字典名
private String dictLabel;
// 字典值
private String dictValue;
public List<Date> getCreateTimeArray() {
return createTimeArray;
}
@ -193,6 +201,22 @@ public class EquFaultType extends BaseEntity {
return delFlag;
}
public void setDictValue(String dictValue) {
this.dictValue = dictValue;
}
public String getDictValue() {
return dictValue;
}
public void setDictLabel(String dictLabel) {
this.dictLabel = dictLabel;
}
public String getDictLabel() {
return dictLabel;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -0,0 +1,257 @@
package com.op.device.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* equ_operation_record
*
* @author Open Platform
* @date 2023-11-27
*/
public class EquOperationRecord extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键 */
private String id;
/** 设备编码 */
@Excel(name = "设备编码")
private String equipmentCode;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
/** 类型(on开机、off关机) */
@Excel(name = "类型(on开机、off关机)")
private String type;
/** 维护类型upkeep保养、repair维修 */
@Excel(name = "维护类型", readConverterExp = "u=pkeep保养、repair维修")
private String maintenanceType;
/** 关联记录id */
@Excel(name = "关联记录id")
private String parentId;
/** 工厂 */
@Excel(name = "工厂")
private String factoryCode;
/** 备用字段1 */
@Excel(name = "备用字段1")
private String attr1;
/** 备用字段2 */
@Excel(name = "备用字段2")
private String attr2;
/** 备用字段3 */
@Excel(name = "备用字段3")
private String attr3;
/** 删除标识 */
private String delFlag;
//MTBF接口字段
//序号
private String serialNumber;
//开机时间
private String onTime;
//故障次数
private String shutDownNumber;
//mtbf
private String mtbf;
//IntactRate 完好设备占比字段
//运行设备
private String operationEquipment;
//故障设备
private String faultEquipment;
//总设备
private String totalEquipment;
//百分比
private String intactRate;
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getStartTime() {
return startTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Date getEndTime() {
return endTime;
}
public void setType(String type) {
this.type = type;
}
public String getType() {
return type;
}
public void setMaintenanceType(String maintenanceType) {
this.maintenanceType = maintenanceType;
}
public String getMaintenanceType() {
return maintenanceType;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getParentId() {
return parentId;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
//虚拟字段 序号
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
}
public String getSerialNumber() {
return serialNumber;
}
//开机时间
public void setOnTime(String onTime) {
this.onTime = onTime;
}
public String getOnTime() {
return onTime;
}
//故障次数
public void setShutDownNumber(String shutDownNumber) {
this.shutDownNumber = shutDownNumber;
}
public String getShutDownNumber() {
return shutDownNumber;
}
//mtbf
public void setMtbf(String mtbf) {
this.mtbf = mtbf;
}
public String getMtbf() {
return mtbf;
}
//运行设备
public void setOperationEquipment(String operationEquipment) {
this.operationEquipment = operationEquipment;
}
public String getOperationEquipment() {
return operationEquipment;
}
//故障设备
public void setFaultEquipment(String faultEquipment) {
this.faultEquipment = faultEquipment;
}
public String getFaultEquipment() {
return faultEquipment;
}
//总设备
public void setTotalEquipment(String totalEquipment) {
this.totalEquipment = totalEquipment;
}
public String getTotalEquipment() {
return totalEquipment;
}
//完好率
public void setIntactRate(String intactRate) {
this.intactRate = intactRate;
}
public String getIntactRate() {
return intactRate;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("equipmentCode", getEquipmentCode())
.append("startTime", getStartTime())
.append("endTime", getEndTime())
.append("type", getType())
.append("maintenanceType", getMaintenanceType())
.append("parentId", getParentId())
.append("factoryCode", getFactoryCode())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

@ -165,6 +165,15 @@ public class EquOrder extends BaseEntity {
/** 维护类型名称 */
private String itemTypeName;
/** 主键 */
private String id;
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
//标准列表
public List<EquOrderStandard> getStandardList() {
return standardList;
@ -194,6 +203,26 @@ public class EquOrder extends BaseEntity {
private Date orderEndArrayStart;
private Date orderEndArrayEnd;
private List<String> upkeepPictures;
private String picturePath;
public String getPicturePath() {
return picturePath;
}
public void setPicturePath(String picturePath) {
this.picturePath = picturePath;
}
public List<String> getUpkeepPictures() {
return upkeepPictures;
}
public void setUpkeepPictures(List<String> upkeepPictures) {
this.upkeepPictures = upkeepPictures;
}
public List<Date> getOrderStartArray() {
return orderStartArray;
}
@ -300,13 +329,13 @@ public class EquOrder extends BaseEntity {
private List<EquOrderDetail> detailList;
private List<EquOrderEquSpare> spareList;
private List<EquSpareApply> spareList;
public List<EquOrderEquSpare> getSpareList() {
public List<EquSpareApply> getSpareList() {
return spareList;
}
public void setSpareList(List<EquOrderEquSpare> spareList) {
public void setSpareList(List<EquSpareApply> spareList) {
this.spareList = spareList;
}
@ -605,6 +634,35 @@ public class EquOrder extends BaseEntity {
return delFlag;
}
//检查项详情
public void setItemName(String itemName) {
this.itemName = itemName;
}
public String getItemName() {
return itemName;
}
public void setItemMethod(String itemMethod) {
this.itemMethod = itemMethod;
}
public String getItemMethod() {
return itemMethod;
}
public void setItemType(String itemType) {
this.itemType = itemType;
}
public String getItemType() {
return itemType;
}
public void setItemTypeName(String itemTypeName) {
this.itemTypeName = itemTypeName;
}
public String getItemTypeName() {
return itemTypeName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -72,6 +72,16 @@ public class EquOrderDetail extends BaseEntity {
private List<EquOrderStandard> standardList;
private String itemTools;
public String getItemTools() {
return itemTools;
}
public void setItemTools(String itemTools) {
this.itemTools = itemTools;
}
public List<EquOrderStandard> getStandardList() {
return standardList;
}

@ -100,6 +100,26 @@ public class EquOrderStandard extends BaseEntity {
private String repairPicture;
private String itemName;
public String getItemName() {
return itemName;
}
public void setItemName(String itemName) {
this.itemName = itemName;
}
private List<String> checkPictrueList;
public List<String> getCheckPictrueList() {
return checkPictrueList;
}
public void setCheckPictrueList(List<String> checkPictrueList) {
this.checkPictrueList = checkPictrueList;
}
public List<BaseFileData> getPicturePaths() {
return picturePaths;
}

@ -61,6 +61,10 @@ public class EquOutsourceWork extends BaseEntity {
@Excel(name = "委外用时")
private String workCostTime;
/** 委外状态 */
@Excel(name = "委外状态")
private String workStatus;
/** 备用字段1 */
@Excel(name = "备用字段1")
private String attr1;
@ -185,6 +189,13 @@ public class EquOutsourceWork extends BaseEntity {
return workCostTime;
}
public void setWorkStatus(String workStatus) {
this.workStatus = workStatus;
}
public String getWorkStatus() {
return workStatus;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}

@ -80,6 +80,36 @@ public class EquPlanDetail extends BaseEntity {
// 主计划code
private String planCode;
private String itemTools;
private String itemLoopType;
private int itemLoop;
public String getItemLoopType() {
return itemLoopType;
}
public void setItemLoopType(String itemLoopType) {
this.itemLoopType = itemLoopType;
}
public int getItemLoop() {
return itemLoop;
}
public void setItemLoop(int itemLoop) {
this.itemLoop = itemLoop;
}
public String getItemTools() {
return itemTools;
}
public void setItemTools(String itemTools) {
this.itemTools = itemTools;
}
public String getPlanCode() {
return planCode;
}

@ -66,6 +66,26 @@ public class EquPlanEqu extends BaseEntity {
private String spareOnList;
private int itemLoop;
private String itemLoopType;
public int getItemLoop() {
return itemLoop;
}
public void setItemLoop(int itemLoop) {
this.itemLoop = itemLoop;
}
public String getItemLoopType() {
return itemLoopType;
}
public void setItemLoopType(String itemLoopType) {
this.itemLoopType = itemLoopType;
}
public String getSpareOnList() {
return spareOnList;
}

@ -78,6 +78,46 @@ public class EquPlanStandard extends BaseEntity {
private Boolean showFlag;
private String itemMethod;
private String itemTools;
private int itemLoop;
private String itemLoopType;
public int getItemLoop() {
return itemLoop;
}
public void setItemLoop(int itemLoop) {
this.itemLoop = itemLoop;
}
public String getItemLoopType() {
return itemLoopType;
}
public void setItemLoopType(String itemLoopType) {
this.itemLoopType = itemLoopType;
}
public String getItemMethod() {
return itemMethod;
}
public void setItemMethod(String itemMethod) {
this.itemMethod = itemMethod;
}
public String getItemTools() {
return itemTools;
}
public void setItemTools(String itemTools) {
this.itemTools = itemTools;
}
public Boolean getShowFlag() {
return showFlag;
}

@ -178,6 +178,16 @@ public class EquRepairOrder extends BaseEntity {
//检查项列表
private List<EquOrder> checkList;
//时间列表 虚拟字段
private List<Date> orderBreakdownTimeArray;
private List<Date> orderTimeArray;
//故障开始时间、故障结束时间
private String orderBreakdownTimeStart;
private String orderBreakdownTimeEnd;
//报修开始时间、结束时间
private String orderTimeStart;
private String orderTimeEnd;
//图片文件
public String getFileList() {
return fileList;
@ -463,6 +473,49 @@ public class EquRepairOrder extends BaseEntity {
this.checkList = checkList;
}
//时间列表
public List<Date> getOrderBreakdownTimeArray() {
return orderBreakdownTimeArray;
}
public void setOrderBreakdownTimeArray(List<Date> orderBreakdownTimeArray) {
this.orderBreakdownTimeArray = orderBreakdownTimeArray;
}
public List<Date> getOrderTimeArray() {
return orderTimeArray;
}
public void setOrderTimeArray(List<Date> orderTimeArray) {
this.orderTimeArray = orderTimeArray;
}
//故障开始时间、结束时间
public String getOrderBreakdownTimeStart() {
return orderBreakdownTimeStart;
}
public void setOrderBreakdownTimeStart(String orderBreakdownTimeStart) {
this.orderBreakdownTimeStart = orderBreakdownTimeStart;
}
public String getOrderBreakdownTimeEnd() {
return orderBreakdownTimeEnd;
}
public void setOrderBreakdownTimeEnd(String orderBreakdownTimeEnd) {
this.orderBreakdownTimeEnd = orderBreakdownTimeEnd;
}
//报修开始时间、结束时间
public String getOrderTimeStart() {
return orderTimeStart;
}
public void setOrderTimeStart(String orderTimeStart) {
this.orderTimeStart = orderTimeStart;
}
public String getOrdeTimeEnd() {
return orderTimeEnd;
}
public void setOrderTimeEnd(String orderTimeEnd) {
this.orderTimeEnd = orderTimeEnd;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -1,5 +1,6 @@
package com.op.device.domain;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -122,18 +123,21 @@ public class EquRepairWorkOrder extends BaseEntity {
/** 维修开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "维修开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private String workStartTime;
private Date workStartTime;
/** 维修结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "维修结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private String workEndTime;
private Date workEndTime;
//维修停机真正开始时间
private String actualDownStartTime;
private Date actualDownStartTime;
//维修停机真正结束时间
private String actualDownEndTime;
private Date actualDownEndTime;
/** 联系方式 */
private String workConnection;
// 设备
/** 设备名称 */
@ -186,7 +190,7 @@ public class EquRepairWorkOrder extends BaseEntity {
/** 报修人 */
private String orderRepairmanCode;
/** 联系方式 */
/** 报修人联系方式 */
private String orderConnection;
//班组
@ -214,7 +218,7 @@ public class EquRepairWorkOrder extends BaseEntity {
/** 委外单位 */
private String workOutsourcingUnit;
/** 联系方式 */
private String workConnection;
private String outSourceConnection;
//手持
//用户id
@ -234,6 +238,9 @@ public class EquRepairWorkOrder extends BaseEntity {
//申领单列表
private List<EquSpareApply> applyList;
//检查项列表
private List<EquOrderStandard> standardList;
//维修前 维修后
public String getAfterRepairFile() {
return afterRepairFile;
@ -542,20 +549,27 @@ public class EquRepairWorkOrder extends BaseEntity {
}
//维修工单 新增字段 维修开始结束时间
public void setWorkStartTime(String workStartTime) {
public void setWorkStartTime(Date workStartTime) {
this.workStartTime = workStartTime;
}
public String getWorkStartTime() {
public Date getWorkStartTime() {
return workStartTime;
}
public void setWorkEndTime(String workEndTime) {
public void setWorkEndTime(Date workEndTime) {
this.workEndTime = workEndTime;
}
public String getWorkEndTime() {
public Date getWorkEndTime() {
return workEndTime;
}
public void setWorkConnection(String workConnection) {
this.workConnection = workConnection;
}
public String getWorkConnection() {
return workConnection;
}
//班组
public void setTeamName(String teamName) {
this.teamName = teamName;
@ -601,16 +615,16 @@ public class EquRepairWorkOrder extends BaseEntity {
}
//计划停机开始时间、结束时间
public String getActualDownStartTime() {
public Date getActualDownStartTime() {
return actualDownStartTime;
}
public void setActualDownStartTime(String actualDownStartTime) {
public void setActualDownStartTime(Date actualDownStartTime) {
this.actualDownStartTime = actualDownStartTime;
}
public String getActualDownEndTime() {
public Date getActualDownEndTime() {
return actualDownEndTime;
}
public void setActualDownEndTime(String actualDownEndTime) {
public void setActualDownEndTime(Date actualDownEndTime) {
this.actualDownEndTime = actualDownEndTime;
}
@ -636,11 +650,11 @@ public class EquRepairWorkOrder extends BaseEntity {
return workOutsourcingUnit;
}
public void setWorkConnection(String workConnection) {
this.workConnection = workConnection;
public void setOutSourceConnection(String outSourceConnection) {
this.outSourceConnection = outSourceConnection;
}
public String getWorkConnection() {
return workConnection;
public String getOutSourceConnection() {
return outSourceConnection;
}
//手持 用户userId
@ -690,6 +704,14 @@ public class EquRepairWorkOrder extends BaseEntity {
this.files = files;
}
//标准列表
public List<EquOrderStandard> getStandardList() {
return standardList;
}
public void setStandardList(List<EquOrderStandard> standardList) {
this.standardList = standardList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -23,7 +23,7 @@ public class EquSpareApply extends BaseEntity {
private String applyId;
/** 出库单号 */
@Excel(name = "出库单号")
@Excel(name = "单号")
private String applyCode;
/** 备品备件编码 */
@ -40,7 +40,7 @@ public class EquSpareApply extends BaseEntity {
/** 数量 */
@Excel(name = "数量")
private Long spareQuantity;
private BigDecimal spareQuantity;
/** 使用组线 */
@Excel(name = "使用组线")
@ -106,6 +106,28 @@ public class EquSpareApply extends BaseEntity {
/** 总数量 */
private BigDecimal amount;
/** 物料号 */
@Excel(name = "物料号")
private String materialCode;
/** 物料描述 */
@Excel(name = "物料描述")
private String materialDesc;
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialDesc(String materialDesc) {
this.materialDesc = materialDesc;
}
public String getMaterialDesc() {
return materialDesc;
}
public List<Date> getApplyTimeArray() {
return applyTimeArray;
}
@ -137,13 +159,14 @@ public class EquSpareApply extends BaseEntity {
public String getApplyId() {
return applyId;
}
public void setApplyCode(String applyCode) {
this.applyCode = applyCode;
}
public String getApplyCode() {
return applyCode;
}
public void setSpareCode(String spareCode) {
this.spareCode = spareCode;
}
@ -165,11 +188,11 @@ public class EquSpareApply extends BaseEntity {
public String getSpareModel() {
return spareModel;
}
public void setSpareQuantity(Long spareQuantity) {
public void setSpareQuantity(BigDecimal spareQuantity) {
this.spareQuantity = spareQuantity;
}
public Long getSpareQuantity() {
public BigDecimal getSpareQuantity() {
return spareQuantity;
}
public void setSpareGroupLine(String spareGroupLine) {

@ -41,6 +41,10 @@ public class EquTeamUser extends BaseEntity {
@Excel(name = "人员拼接名字")
private String teamUserName;
/** 手机号 */
@Excel(name = "手机号")
private String phonenumber;
public void setId(String id) {
this.id = id;
}
@ -90,6 +94,14 @@ public class EquTeamUser extends BaseEntity {
this.teamUserName = teamUserName;
}
public void setPhonenumber(String phonenumber) {
this.phonenumber = phonenumber;
}
public String getPhonenumber() {
return phonenumber;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -0,0 +1,647 @@
package com.op.device.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
/**
* mes_report_work
*
* @author Open Platform
* @date 2023-08-24
*/
public class MesReportWork extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 记录id */
private String id;
/** 报工单编号 */
@Excel(name = "报工单编号")
private String reportCode;
/** 报工类型报工类型SELF自行报工、UNI统一报工 */
@Excel(name = "报工类型报工类型SELF上位机报工、UNI系统报工")
private String reportType;
/** 生产工单编码 */
@Excel(name = "生产工单编码")
private String workorderCode;
/** 产品编码 */
@Excel(name = "产品编码")
private String productCode;
/** 产品名称 */
@Excel(name = "产品名称")
private String productName;
/** 规格型号 */
@Excel(name = "规格型号")
private String spec;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 排产数量 */
@Excel(name = "排产数量")
private BigDecimal quantity;
private BigDecimal quantitySplit;
/** 本次报工数量 */
@Excel(name = "本次报工数量")
private BigDecimal quantityFeedback;
/** 合格数量 */
//@Excel(name = "合格数量")
private BigDecimal quantityQualified;
/** 不合格数量 */
//@Excel(name = "不合格数量")
private BigDecimal quantityUnqualified;
/** 报工人员 */
@Excel(name = "报工人员")
private String userName;
/** 人员名称 */
@Excel(name = "人员名称")
private String nickName;
/** 报工途径PAD、MOBILE、PC */
//@Excel(name = "报工途径PAD、MOBILE、PC")
private String feedbackChannel;
/** 报工时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报工时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date feedbackTime;
/** 录入人员 */
@Excel(name = "录入人员")
private String recordUser;
/** 状态 */
@Excel(name = "状态")
private String status;
/** 工时 */
@Excel(name = "工时")
private Long workTime;
@Excel(name = "用人")
private Long useMan;
/** 线体编码 */
@Excel(name = "线体编码")
private String machineCode;
/** 线体名称 */
@Excel(name = "线体名称")
private String machineName;
/** 班组编码 */
@Excel(name = "班组编码")
private String teamCode;
/** 班次编码 */
@Excel(name = "班次编码")
private String shiftCode;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "SAP报工时间")
private Date uploadTime;
@Excel(name = "SAP报工状态0待报工1成功2失败")
private String uploadStatus;
@Excel(name = "SAP报工信息")
private String uploadMsg;
/** 预留字段1 */
//@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
//@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
//@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
//@Excel(name = "预留字段4")
private String attr4;
@Excel(name = "计划生产日期")
private String productDate;
private String productDateStart;
private String productDateEnd;
@Excel(name = "订单编号")
private String orderCode;
@Excel(name = "规格型号")
private String productSpc;
@Excel(name = "工序名称")
private String processName;
@Excel(name = "工序编码")
private String processCode;
private String factoryCode;
private String factoryName;
private String carCode;
private String carName;
private String workorderCodeSap;
private String routeCode;
private String sac1;
private String sac2;
private String sac3;
private String sac4;
private String sac5;
private String sac6;
private String prodType;
private String createTimeStart;
private String createTimeEnd;
private String feedbackTimeStart;
private String feedbackTimeEnd;
private String batch;
private String endReport;
public String getEndReport() {
return endReport;
}
public void setEndReport(String endReport) {
this.endReport = endReport;
}
public String getBatch() {
return batch;
}
public void setBatch(String batch) {
this.batch = batch;
}
public Long getUseMan() {
return useMan;
}
public void setUseMan(Long useMan) {
this.useMan = useMan;
}
public BigDecimal getQuantitySplit() {
return quantitySplit;
}
public void setQuantitySplit(BigDecimal quantitySplit) {
this.quantitySplit = quantitySplit;
}
public String getFeedbackTimeStart() {
return feedbackTimeStart;
}
public void setFeedbackTimeStart(String feedbackTimeStart) {
this.feedbackTimeStart = feedbackTimeStart;
}
public String getFeedbackTimeEnd() {
return feedbackTimeEnd;
}
public void setFeedbackTimeEnd(String feedbackTimeEnd) {
this.feedbackTimeEnd = feedbackTimeEnd;
}
public String getCreateTimeStart() {
return createTimeStart;
}
public void setCreateTimeStart(String createTimeStart) {
this.createTimeStart = createTimeStart;
}
public String getCreateTimeEnd() {
return createTimeEnd;
}
public void setCreateTimeEnd(String createTimeEnd) {
this.createTimeEnd = createTimeEnd;
}
public String getProdType() {
return prodType;
}
public void setProdType(String prodType) {
this.prodType = prodType;
}
public String getWorkorderCodeSap() {
return workorderCodeSap;
}
public void setWorkorderCodeSap(String workorderCodeSap) {
this.workorderCodeSap = workorderCodeSap;
}
public String getRouteCode() {
return routeCode;
}
public void setRouteCode(String routeCode) {
this.routeCode = routeCode;
}
public String getSac1() {
return sac1;
}
public void setSac1(String sac1) {
this.sac1 = sac1;
}
public String getSac2() {
return sac2;
}
public void setSac2(String sac2) {
this.sac2 = sac2;
}
public String getSac3() {
return sac3;
}
public void setSac3(String sac3) {
this.sac3 = sac3;
}
public String getSac4() {
return sac4;
}
public void setSac4(String sac4) {
this.sac4 = sac4;
}
public String getSac5() {
return sac5;
}
public void setSac5(String sac5) {
this.sac5 = sac5;
}
public String getSac6() {
return sac6;
}
public void setSac6(String sac6) {
this.sac6 = sac6;
}
public Date getUploadTime() {
return uploadTime;
}
public void setUploadTime(Date uploadTime) {
this.uploadTime = uploadTime;
}
public String getUploadStatus() {
return uploadStatus;
}
public void setUploadStatus(String uploadStatus) {
this.uploadStatus = uploadStatus;
}
public String getUploadMsg() {
return uploadMsg;
}
public void setUploadMsg(String uploadMsg) {
this.uploadMsg = uploadMsg;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryName() {
return factoryName;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
public String getCarCode() {
return carCode;
}
public void setCarCode(String carCode) {
this.carCode = carCode;
}
public String getCarName() {
return carName;
}
public void setCarName(String carName) {
this.carName = carName;
}
public String getProcessCode() {
return processCode;
}
public void setProcessCode(String processCode) {
this.processCode = processCode;
}
public String getProductDateStart() {
return productDateStart;
}
public void setProductDateStart(String productDateStart) {
this.productDateStart = productDateStart;
}
public String getProductDateEnd() {
return productDateEnd;
}
public void setProductDateEnd(String productDateEnd) {
this.productDateEnd = productDateEnd;
}
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setReportType(String reportType) {
this.reportType = reportType;
}
public String getReportType() {
return reportType;
}
public void setReportCode(String reportCode) {
this.reportCode = reportCode;
}
public String getReportCode() {
return reportCode;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductCode() {
return productCode;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductName() {
return productName;
}
public void setSpec(String spec) {
this.spec = spec;
}
public String getSpec() {
return spec;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setQuantity(BigDecimal quantity) {
this.quantity = quantity;
}
public BigDecimal getQuantity() {
return quantity;
}
public void setQuantityFeedback(BigDecimal quantityFeedback) {
this.quantityFeedback = quantityFeedback;
}
public BigDecimal getQuantityFeedback() {
return quantityFeedback;
}
public void setQuantityQualified(BigDecimal quantityQualified) {
this.quantityQualified = quantityQualified;
}
public BigDecimal getQuantityQualified() {
return quantityQualified;
}
public void setQuantityUnqualified(BigDecimal quantityUnqualified) {
this.quantityUnqualified = quantityUnqualified;
}
public BigDecimal getQuantityUnqualified() {
return quantityUnqualified;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserName() {
return userName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getNickName() {
return nickName;
}
public void setFeedbackChannel(String feedbackChannel) {
this.feedbackChannel = feedbackChannel;
}
public String getFeedbackChannel() {
return feedbackChannel;
}
public void setFeedbackTime(Date feedbackTime) {
this.feedbackTime = feedbackTime;
}
public Date getFeedbackTime() {
return feedbackTime;
}
public void setRecordUser(String recordUser) {
this.recordUser = recordUser;
}
public String getRecordUser() {
return recordUser;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setWorkTime(Long workTime) {
this.workTime = workTime;
}
public Long getWorkTime() {
return workTime;
}
public void setMachineCode(String machineCode) {
this.machineCode = machineCode;
}
public String getMachineCode() {
return machineCode;
}
public void setMachineName(String machineName) {
this.machineName = machineName;
}
public String getMachineName() {
return machineName;
}
public void setTeamCode(String teamCode) {
this.teamCode = teamCode;
}
public String getTeamCode() {
return teamCode;
}
public void setShiftCode(String shiftCode) {
this.shiftCode = shiftCode;
}
public String getShiftCode() {
return shiftCode;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public String getProductDate() {
return productDate;
}
public void setProductDate(String productDate) {
this.productDate = productDate;
}
public String getOrderCode() {
return orderCode;
}
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public String getProductSpc() {
return productSpc;
}
public void setProductSpc(String productSpc) {
this.productSpc = productSpc;
}
public String getProcessName() {
return processName;
}
public void setProcessName(String processName) {
this.processName = processName;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("reportType", getReportType())
.append("reportCode", getReportCode())
.append("workorderCode", getWorkorderCode())
.append("productCode", getProductCode())
.append("productName", getProductName())
.append("spec", getSpec())
.append("unit", getUnit())
.append("quantity", getQuantity())
.append("quantityFeedback", getQuantityFeedback())
.append("quantityQualified", getQuantityQualified())
.append("quantityUnqualified", getQuantityUnqualified())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("feedbackChannel", getFeedbackChannel())
.append("feedbackTime", getFeedbackTime())
.append("recordUser", getRecordUser())
.append("status", getStatus())
.append("remark", getRemark())
.append("workTime", getWorkTime())
.append("machineCode", getMachineCode())
.append("machineName", getMachineName())
.append("teamCode", getTeamCode())
.append("shiftCode", getShiftCode())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.toString();
}
}

@ -62,6 +62,39 @@ public class EquCheckItemDTO {
// 设备编码list
private List<String> equipmentCodeList;
// 检查工具
private String itemTools;
// 循环周期类型
private String itemLoopType;
// 循环周期
private int itemLoop;
public String getItemLoopType() {
return itemLoopType;
}
public void setItemLoopType(String itemLoopType) {
this.itemLoopType = itemLoopType;
}
public int getItemLoop() {
return itemLoop;
}
public void setItemLoop(int itemLoop) {
this.itemLoop = itemLoop;
}
public String getItemTools() {
return itemTools;
}
public void setItemTools(String itemTools) {
this.itemTools = itemTools;
}
public List<String> getEquipmentCodeList() {
return equipmentCodeList;
}

@ -0,0 +1,5 @@
package com.op.device.domain.dto;
// 看板传参实体
public class InterfaceDTO {
}

@ -46,6 +46,39 @@ public class EquCheckItemVO {
// 设备编码
private String equipmentCode;
// 检查工具
private String itemTools;
// 循环周期类型
private String itemLoopType;
// 循环周期
private int itemLoop;
public String getItemLoopType() {
return itemLoopType;
}
public void setItemLoopType(String itemLoopType) {
this.itemLoopType = itemLoopType;
}
public int getItemLoop() {
return itemLoop;
}
public void setItemLoop(int itemLoop) {
this.itemLoop = itemLoop;
}
public String getItemTools() {
return itemTools;
}
public void setItemTools(String itemTools) {
this.itemTools = itemTools;
}
public String getEquipmentName() {
return equipmentName;
}

@ -0,0 +1,75 @@
package com.op.device.domain.vo;
// 设备信息VO、设备维修质量VO
public class IEquipmentVO {
// 设备名称
private String equipmentName;
// 设备编码
private String equipmentCode;
// 所在部门
private String department;
// 设备故障率
private Double failureRate;
// 设备有效利用率
private Double utilizationRatio;
// 设备维修质量
private Double rapairQuantity;
// 设备状态
private String equipmentStatus;
public String getEquipmentStatus() {
return equipmentStatus;
}
public void setEquipmentStatus(String equipmentStatus) {
this.equipmentStatus = equipmentStatus;
}
public Double getRapairQuantity() {
return rapairQuantity;
}
public void setRapairQuantity(Double rapairQuantity) {
this.rapairQuantity = rapairQuantity;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getDepartment() {
return department;
}
public void setDepartment(String department) {
this.department = department;
}
public Double getFailureRate() {
return failureRate;
}
public void setFailureRate(Double failureRate) {
this.failureRate = failureRate;
}
public Double getUtilizationRatio() {
return utilizationRatio;
}
public void setUtilizationRatio(Double utilizationRatio) {
this.utilizationRatio = utilizationRatio;
}
}

@ -0,0 +1,77 @@
package com.op.device.domain.vo;
import java.util.Date;
// 看板维修工单返回VO
public class IRepairWorkOrderVO {
// 设备名称
private String equipmentName;
// 设备编码
private String equipmentCode;
// 故障描述
private String workFaultDesc;
// 维修班组
private String teamName;
// 是否立即维修
private String workHandle;
// 计划维修时间
private Date workPlanTime;
// 设备位置
private String equipmentLocation;
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getWorkFaultDesc() {
return workFaultDesc;
}
public void setWorkFaultDesc(String workFaultDesc) {
this.workFaultDesc = workFaultDesc;
}
public String getTeamName() {
return teamName;
}
public void setTeamName(String teamName) {
this.teamName = teamName;
}
public String getWorkHandle() {
return workHandle;
}
public void setWorkHandle(String workHandle) {
this.workHandle = workHandle;
}
public Date getWorkPlanTime() {
return workPlanTime;
}
public void setWorkPlanTime(Date workPlanTime) {
this.workPlanTime = workPlanTime;
}
public String getEquipmentLocation() {
return equipmentLocation;
}
public void setEquipmentLocation(String equipmentLocation) {
this.equipmentLocation = equipmentLocation;
}
}

@ -1,9 +1,6 @@
package com.op.device.domain.vo;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquOrderDetail;
import com.op.device.domain.EquOrderEquSpare;
import com.op.device.domain.Equipment;
import com.op.device.domain.*;
import java.util.List;
@ -12,13 +9,13 @@ public class InspectionWorkVO {
private EquOrder order;
private Equipment equ;
private List<EquOrderDetail> detailList;
private List<EquOrderEquSpare> spareList;
private List<EquSpareApply> spareList;
public List<EquOrderEquSpare> getSpareList() {
public List<EquSpareApply> getSpareList() {
return spareList;
}
public void setSpareList(List<EquOrderEquSpare> spareList) {
public void setSpareList(List<EquSpareApply> spareList) {
this.spareList = spareList;
}

@ -0,0 +1,46 @@
package com.op.device.mapper;
import com.op.device.domain.EquOperationRecord;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.MesReportWork;
import com.op.device.domain.vo.IEquipmentVO;
import com.op.device.domain.vo.IRepairWorkOrderVO;
import java.util.List;
public interface DeviceInterfaceMapper {
/**
* -
* @return
*/
List<IRepairWorkOrderVO> selectEquRepairWorkOrderList();
/**
*
* @return
*/
List<IEquipmentVO> selectEquipmentList();
/**
*
* @return
*/
List<IEquipmentVO> selectRepairEquipmentList();
/**
* code
* quantity quantityFeedback
* @param equipmentCode
* @return
*/
MesReportWork selectReportWorkByEquipmentCode(String equipmentCode);
List<EquRepairWorkOrder> selectRepairRecordByEquipmentCode(String equipmentCode);
/**
*
* 5
*/
String getDeviceRefreshTime(EquOperationRecord equOperationRecord);
}

@ -62,5 +62,4 @@ public interface EquEquipmentMapper {
//查询设备类型
List<EquEquipment> getEquipmentTypeList(EquEquipment equEquipment);
}

@ -3,6 +3,7 @@ package com.op.device.mapper;
import java.util.List;
import com.op.device.domain.EquFaultType;
import com.op.device.domain.EquRepairWorkOrder;
/**
* Mapper
@ -64,4 +65,7 @@ public interface EquFaultTypeMapper {
* @return
*/
int selectSerialNumber();
//故障报修第一级
List<EquFaultType> selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder);
}

@ -74,4 +74,11 @@ public interface EquFileMapper {
//删除照图片
public void deleteEquFileBySourceId(String orderId);
/**
*
* @param selectTemp
* @return
*/
List<String> selectUrlList(BaseFileData selectTemp);
}

@ -0,0 +1,74 @@
package com.op.device.mapper;
import java.util.List;
import com.op.device.domain.EquOperationRecord;
/**
* Mapper
*
* @author Open Platform
* @date 2023-11-27
*/
public interface EquOperationRecordMapper {
/**
*
*
* @param id
* @return
*/
public EquOperationRecord selectEquOperationRecordById(String id);
/**
*
*
* @param equOperationRecord
* @return
*/
public List<EquOperationRecord> selectEquOperationRecordList(EquOperationRecord equOperationRecord);
/**
*
*
* @param equOperationRecord
* @return
*/
public int insertEquOperationRecord(EquOperationRecord equOperationRecord);
/**
*
*
* @param equOperationRecord
* @return
*/
public int updateEquOperationRecord(EquOperationRecord equOperationRecord);
/**
*
*
* @param id
* @return
*/
public int deleteEquOperationRecordById(String id);
/**
*
*
* @param ids
* @return
*/
public int deleteEquOperationRecordByIds(String[] ids);
/**
*
* @param equipmentCode
* @return
*/
List<EquOperationRecord> selectEquOperationRecordByEquipmentCode(String equipmentCode);
//设备稳定性 MTBF设备平均故障间隔
List<EquOperationRecord> getMTBFList(EquOperationRecord equOperationRecord);
//设备完好率
EquOperationRecord getEquipmentIntactRate(EquOperationRecord equOperationRecord);
}

@ -78,4 +78,10 @@ public interface EquOrderDetailMapper {
List<EquOrderDetail> selectEquOrderDetailByOrderCode(String orderCode);
int insertEquOrderDetails(@Param("list") List<EquPlanDetail> details);
/**
* orderIds
* @param orderIds
*/
void delEquOrderDetailByorderIds(String[] orderIds);
}

@ -4,11 +4,8 @@ import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquOrderStandard;
import com.op.device.domain.EquPlan;
import com.op.device.domain.dto.PDADTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* Mapper
@ -121,17 +118,50 @@ public interface EquOrderMapper {
*/
List<EquOrder> selectTodayTask(PDADTO pdadto);
/**
* PC
* @param
* @return
*/
List<EquOrder> selectEquOrderDetailsList(EquOrder equOrder);
/**
*
* @param equipmentCode
* @return
*/
String selectEquipmentNameByEquCode(String equipmentCode);
/**
* OrderCodeID
* @param orderCode
* @return
*/
List<String> getIdsByOrderCode(String orderCode);
/**
*
* @param equOrder
* @return
*/
void updateEquOrderRepairCode(EquOrder equOrder);
/**
* PC
* @param
* @return
*/
List<EquOrder> selectCheckListByWorkCode(EquOrder equOrder);
/**
* PC
* @param
* @return
*/
List<EquOrder> selectCheckListByRepairCode(EquOrder equOrder);
/**
*
* @param orderIds
*/
void delEquOrderByOrderIds(String[] orderIds);
/**
* Code
* @param repairCode
*/
void updateEquOrderStatusComplete(String repairCode);
}

@ -69,4 +69,10 @@ public interface EquOrderPersonMapper {
List<String> selectEquOrderPersonByOrderCode(String orderCode);
int insertEquOrderPersons(@Param("list") List<EquPlanPerson> persons);
/**
* ids
* @param orderIds
*/
void delEquOrderPersonByorderIds(String[] orderIds);
}

@ -74,7 +74,7 @@ public interface EquOrderStandardMapper {
*
* @param files
*/
void insertBaseFileBatch(List<BaseFileData> files);
void insertBaseFileBatch(@Param("baseFiles")List<BaseFileData> files);
/**
*
@ -91,4 +91,19 @@ public interface EquOrderStandardMapper {
public List<EquOrderStandard> selectPdaEquOrderList(EquOrder equOrder);
int insertEquOrderStandards(@Param("list") List<EquPlanStandard> standards);
/**
*
*/
void updateStandardAfterRepair(EquOrderStandard equOrderStandard);
/**
* orderIds
* @param orderIds
*/
void delEquOrderStandardByorderIds(String[] orderIds);
//更新标准
void updateActualValues(EquOrderStandard standardList);
}

@ -62,4 +62,7 @@ public interface EquOutsourceWorkMapper {
//流水号
public int selectWorkCodeSerialNumber();
//通过repairCode删除存在的委外记录
public void deleteEquOutsourceWorkByRepairCode(String workCode);
}

@ -7,6 +7,7 @@ import com.op.common.core.domain.BaseFileData;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquFile;
import com.op.device.domain.EquRepairOrder;
import com.op.device.domain.EquTeamUser;
import org.apache.ibatis.annotations.Param;
/**
@ -72,7 +73,7 @@ public interface EquRepairOrderMapper {
//查询报修人员列表
@DS("master")
List<EquEquipment> getRepairPersonList(EquEquipment equEquipment);
List<EquTeamUser> getRepairPersonList(EquTeamUser equTeamUser);
/**
* code
@ -102,4 +103,7 @@ public interface EquRepairOrderMapper {
*/
public List<BaseFileData> getBaseFileBatch(String orderId);
//联系方式
@DS("master")
EquTeamUser getRepairPhoneNumber(EquTeamUser equTeamUser);
}

@ -94,4 +94,14 @@ public interface EquRepairWorkOrderMapper {
*
*/
Boolean insertBaseFileBatch(@Param("baseFiles") List<BaseFileData> baseFiles);
//更新维修工单状态
void updateWorkStatus(String repairCode);
/**
*
* @param workCode
* @return
*/
EquRepairWorkOrder selectEquRepairWorkOrderByWorkCode(String workCode);
}

@ -62,4 +62,35 @@ public interface EquSpareApplyMapper {
//查询维修工单对应的备件申领记录
public List<EquSpareApply> selectRepairSparePartsRecord(EquRepairWorkOrder equRepairWorkOrder);
/**
*
* @return
*/
int selectSerialNumber();
/**
* codelist
* @param orderCode
* @return
*/
List<EquSpareApply> selectEquSpareApplyListByWorkCode(String orderCode);
/**
* ids
* @param orderIds
*/
void delEquSpareApplyByorderIds(String[] orderIds);
/**
*
* @param applyIds
*/
void delEquSpareApplyByIds(String[] applyIds);
/**
*
* @param id
*/
void delEquSpareApplyByApplyId(String id);
}

@ -73,6 +73,6 @@ public interface EquTeamMapper {
public List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser);
//查询特定人员
@DS("master")
@DS("#master")
public EquTeamUser selectTeamMember(EquTeamUser equTeamUser);
}

@ -6,7 +6,7 @@ public interface EquipmentMapper {
/**
*
*
* @param equipmentId
* @param equipmentCode
* @return
*/
public Equipment selectEquipmentByEquipmentCode(String equipmentCode);

@ -3,6 +3,7 @@ package com.op.device.mapper;
import java.math.BigDecimal;
import java.util.List;
import com.op.device.domain.EquSpareApply;
import com.op.device.domain.SparePartsLedger;
/**
@ -67,4 +68,15 @@ public interface SparePartsLedgerMapper {
*/
BigDecimal selectRealAmountByMaterialCode(String materialCode);
/**
*
* @param apply
*/
void updateSpareNumReduce(EquSpareApply apply);
/**
*
* @param apply
*/
void updateSpareNumAdd(EquSpareApply apply);
}

@ -1,7 +1,48 @@
package com.op.device.service;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOperationRecord;
/**
*
*/
public interface IDeviceInterfaceService {
/**
*
* @return
*/
AjaxResult getRepairWorkOrder();
/**
*
* @return
*/
AjaxResult getEquipmentInfo();
/**
* TOP10
* @return
*/
AjaxResult getRepairQuantity();
/**
* MTBF /
* @return
*/
AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord);
/**
*
* /
* @param equOperationRecord
* @return
*/
AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord);
/**
*
* 5
*/
public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord);
}

@ -4,6 +4,8 @@ import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.*;
import com.op.device.domain.dto.PDADTO;
import java.util.List;
/**
* PDAService
*
@ -14,12 +16,14 @@ public interface IDevicePDAService {
/**
* list
*
* @return
*/
AjaxResult getTodayTask(PDADTO pdadto);
/**
*
*
* @param pdadto
* @return
*/
@ -27,37 +31,45 @@ public interface IDevicePDAService {
/**
*
*
* @param equOrder
* @return
*/
AjaxResult getInspectionOrderInfo(EquOrder equOrder);
/**
*
*
*
* @param equOrder
* @return
*/
AjaxResult updateInspectionRecord(EquOrder equOrder);
//报修
/**
*
*
* @param equRepairOrder
* @return
*/
public AjaxResult addRepairRecord(EquRepairOrder equRepairOrder);
//维修
/**
*
*
* @param equRepairWorkOrder
* @return
*/
public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder);
//班组
/**
*
*
* @param equTeamUser
* @return
*/
@ -65,6 +77,7 @@ public interface IDevicePDAService {
/**
*
*
* @param equRepairWorkOrder
* @return
*/
@ -72,6 +85,7 @@ public interface IDevicePDAService {
/**
*
*
* @param equipmentId
* @return
*/
@ -79,6 +93,7 @@ public interface IDevicePDAService {
/**
*
*
* @param workId
* @return
*/
@ -86,18 +101,26 @@ public interface IDevicePDAService {
/**
*
*
* @param equRepairWorkOrder
* @return
*/
public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder);
//获取设备故障类型
// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder);
//待处理
AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder);
/**
*
*
* @param pdadto
* @return
*/
AjaxResult startMaintenanceTask(PDADTO pdadto);
//查询设备列表
List<EquEquipment> selectEquEquipmentList(EquEquipment equEquipment);
}

@ -50,7 +50,7 @@ public interface IEquOrderService {
* @param orderIds
* @return
*/
public int deleteEquOrderByOrderIds(String[] orderIds);
public AjaxResult deleteEquOrderByOrderIds(String[] orderIds);
/**
*

@ -3,10 +3,8 @@ package com.op.device.service;
import java.util.List;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.*;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquRepairOrder;
import com.op.device.domain.EquRepairWorkOrder;
/**
* Service
@ -78,5 +76,5 @@ public interface IEquRepairOrderService {
public int checkEquRepairOrder(EquRepairOrder equRepairOrder);
//查询报修人员列表
List<EquEquipment> getRepairPersonList(EquEquipment equEquipment);
List<EquTeamUser> getRepairPersonList(EquTeamUser equTeamUser);
}

@ -51,7 +51,7 @@ public interface IEquSpareApplyService {
* @param applyIds
* @return
*/
public int deleteEquSpareApplyByApplyIds(String[] applyIds);
public AjaxResult deleteEquSpareApplyByApplyIds(String[] applyIds);
/**
*

@ -1,11 +1,220 @@
package com.op.device.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOperationRecord;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.MesReportWork;
import com.op.device.mapper.EquEquipmentMapper;
import com.op.device.domain.vo.IEquipmentVO;
import com.op.device.domain.vo.IRepairWorkOrderVO;
import com.op.device.mapper.DeviceInterfaceMapper;
import com.op.device.mapper.EquOperationRecordMapper;
import com.op.device.mapper.EquRepairWorkOrderMapper;
import com.op.device.service.IDeviceInterfaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
*
*/
@Service
public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
@Autowired
private EquRepairWorkOrderMapper equRepairWorkOrderMapper;
@Autowired
private DeviceInterfaceMapper deviceInterfaceMapper;
@Autowired
private EquOperationRecordMapper equOperationRecordMapper;
/**
*
*
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getRepairWorkOrder() {
List<IRepairWorkOrderVO> workOrderVOList = deviceInterfaceMapper.selectEquRepairWorkOrderList();
for (IRepairWorkOrderVO orderVO : workOrderVOList) {
if (orderVO.getWorkHandle().equals("0")) {
orderVO.setWorkHandle("立即");
} else {
orderVO.setWorkHandle("计划");
}
}
return success(workOrderVOList);
}
/**
*
* :/
* /
*
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getEquipmentInfo() {
// 获取所有设备信息
List<IEquipmentVO> equipmentVOList = deviceInterfaceMapper.selectEquipmentList();
for (IEquipmentVO equipmentVO : equipmentVOList) {
// 设备状态
if (equipmentVO.getEquipmentStatus().equals("1")) {
equipmentVO.setEquipmentStatus("正常");
} else {
equipmentVO.setEquipmentStatus("停用");
}
/* 停机故障率逻辑 */
long totalTime = 0L;// 运行总时间
long downTime = 0L;// 停机时间
// 通过设备编码获取运行记录中的运行记录List
List<EquOperationRecord> operationRecordList = equOperationRecordMapper.selectEquOperationRecordByEquipmentCode(equipmentVO.getEquipmentCode());
if (operationRecordList.size() != 0) {
for (EquOperationRecord operationRecord : operationRecordList) {
// 运行时间差值
long diffTime = operationRecord.getEndTime().getTime() - operationRecord.getStartTime().getTime();
// 开机运行时间运行总时间累加
if (operationRecord.getType().equals("on")) {
totalTime += diffTime;
}
// 维修停机时间累加(故障)
if (operationRecord.getMaintenanceType().equals("repair")) {
downTime += diffTime;
}
}
// 设置停机故障率
if (downTime == 0L) {
// 如果未查到该设备停机故障时间
equipmentVO.setFailureRate(0D);
} else {
// 计算故障停机率(设备停机时间总和/一定时间内运行总时间(年))
double failureRate = downTime / totalTime;
equipmentVO.setFailureRate(failureRate);
}
}
/* 设备有效利用率逻辑(每月) */
// 查询该设备下报工单信息(年月日可在该sql中修改)
MesReportWork reportWork = deviceInterfaceMapper.selectReportWorkByEquipmentCode(equipmentVO.getEquipmentCode());
if (reportWork != null) {
BigDecimal theoryQuantity = reportWork.getQuantity();// 理论产量
BigDecimal actualQuantity = reportWork.getQuantityFeedback();// 实际产量
// 计算该设备有效利用率(实际产量/理论产量)
BigDecimal utilizationRatio = actualQuantity.divide(theoryQuantity, 2, BigDecimal.ROUND_HALF_UP);
equipmentVO.setUtilizationRatio(utilizationRatio.doubleValue());
} else {
// 如果未查到该信息则默认设置为0
equipmentVO.setUtilizationRatio(0D);
}
}
return success(equipmentVOList);
}
/**
* TOP10
* /
*
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getRepairQuantity() {
// 获取维修工单中的设备列表
List<IEquipmentVO> equipmentVOList = deviceInterfaceMapper.selectEquipmentList();
for (IEquipmentVO equipmentVO : equipmentVOList) {
// 通过该设备code获取设备维修记录(只获取开始时间、结束时间)
List<EquRepairWorkOrder> workOrderList = deviceInterfaceMapper.selectRepairRecordByEquipmentCode(equipmentVO.getEquipmentCode());
if (workOrderList.size() != 0) {
Long runTime = 0l;
for (EquRepairWorkOrder workOrder : workOrderList) {
// 维修时间差值
long diffTime = workOrder.getWorkEndTime().getTime() - workOrder.getWorkStartTime().getTime();
// 累加时间
runTime += diffTime;
}
// 计算维修质量(故障时间(小时)/故障次数)
long rapairQuantity = runTime / 3600000 / workOrderList.size();
equipmentVO.setRapairQuantity(Double.valueOf(rapairQuantity));
} else {
// 没有该记录则默认为0
equipmentVO.setRapairQuantity(0D);
}
}
// 排序TOP10
// 假数据
// Random random = new Random();
// List<IEquipmentVO> test = new ArrayList<>();
// for (int i = 0 ; i < 30 ; i++) {
// IEquipmentVO vo = new IEquipmentVO();
// vo.setRapairQuantity(random.nextDouble());
// test.add(vo);
// }
// 按照raparQuantity字段进行排序并使用subList获取前10个结果
List<IEquipmentVO> top10 = equipmentVOList.stream()
.sorted(Comparator.comparingDouble(IEquipmentVO::getRapairQuantity)) // 排序
.limit(10) // 限制结果数量为10
.collect(Collectors.toList()); // 将结果收集到List中
return success(top10);
}
/**
* -MTBF top10
* /
*/
@Override
@DS("#header.poolName")
public AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord) {
//查询所有设备(设备停用的除外)
List<EquOperationRecord> equipmentList = equOperationRecordMapper.getMTBFList(equOperationRecord);
return success(equipmentList);
}
/**
*
* /
*/
@Override
@DS("#header.poolName")
public AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord) {
//查询所有设备(设备停用的除外)
EquOperationRecord equipmentIntactRate = equOperationRecordMapper.getEquipmentIntactRate(equOperationRecord);
return success(equipmentIntactRate);
}
/**
*
*/
@Override
@DS("master")
public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) {
String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperationRecord);
int time = Integer.parseInt(refreshTime);
return success(time);
}
}

@ -23,10 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.*;
import static com.op.common.core.web.domain.AjaxResult.error;
import static com.op.common.core.web.domain.AjaxResult.success;
@ -59,11 +56,15 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
@Autowired
private EquEquipmentMapper equEquipmentMapper;
@Autowired
private EquSpareApplyMapper equSpareApplyMapper;
private EquSpareApplyMapper equSpareApplyMapper;
@Autowired
private EquFileMapper equFileMapper;
@Autowired
private EquOrderEquSpareMapper equOrderEquSpareMapper;
private EquFaultTypeMapper equFaultTypeMapper;
@Autowired
private SparePartsLedgerMapper sparePartsLedgerMapper;
/**
@ -121,6 +122,16 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode());
for (EquOrderDetail detail : detailList) {
List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId());
for (EquOrderStandard standard : standardList) {
// 未达标图片
BaseFileData selectTemp = new BaseFileData();
selectTemp.setSourceId(standard.getId());
selectTemp.setImageType("3");
List<String> checkPictrueList = equFileMapper.selectUrlList(selectTemp);
if (checkPictrueList != null) {
standard.setCheckPictrueList(checkPictrueList);
}
}
detail.setStandardList(standardList);
}
order.setDetailList(detailList);
@ -135,19 +146,26 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
}
// 备件
List<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode());
List<EquSpareApply> spareList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode());
if (spareList != null) {
order.setSpareList(spareList);
}
order.setPersonList(personList);
// 保养图片
BaseFileData selectTemp = new BaseFileData();
selectTemp.setSourceId(equOrder.getId());
List<String> upkeepPictures = equFileMapper.selectUrlList(selectTemp);
if (upkeepPictures != null) {
order.setUpkeepPictures(upkeepPictures);
}
return success(order);
}
/**
*
*
*
* @param equOrder
* @return
@ -160,20 +178,24 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
if (equOrder.getRepairCode() != null) {
if (!equOrder.getRepairCode().isEmpty()) {
EquRepairOrder repairOrder = equRepairOrderMapper.selectEquRepairOrderByRepairCode(equOrder.getRepairCode());
if (repairOrder==null) {
return error(500,"未查询到报修单信息!");
}else {
if (!repairOrder.getOrderStatus().equals("待审核")){
return error(500,"报修单已审核,不可修改记录!");
if (repairOrder == null) {
return error(500, "未查询到报修单信息!");
} else {
if (!repairOrder.getOrderStatus().equals("待审核")) {
return error(500, "报修单已审核,不可修改记录!");
}
}
}
}
boolean hasError = false;
boolean maintenanceFlag = false;
EquOrderEqu equ = equOrder.getEqu();
List<EquOrderDetail> detailList = equ.getDetailList();
if (equOrder.getPlanType().equals("maintenance")) {
maintenanceFlag = true;
}
List<EquOrderDetail> detailList = equOrder.getDetailList();
for (EquOrderDetail detail : detailList) {
List<EquOrderStandard> standardList = detail.getStandardList();
for (EquOrderStandard standard : standardList) {
@ -202,18 +224,15 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
int up = standard.getActualValue().compareTo(standard.getDetailUpLimit());
int down = standard.getActualValue().compareTo(standard.getDetailDownLimit());
standard.setDetailReach("1");
standard.setErrorFlag("0");
if (!(up != 1 && down != -1)) {
hasError = true;
standard.setErrorFlag("1");
standard.setDetailReach("0");
}
}else {
// TODO 未达标
} else {
// 未达标
standard.setErrorFlag("0");
if (standard.getDetailReach().equals("0")) {
hasError = true;
standard.setErrorFlag("1");
}
}
@ -236,22 +255,22 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
boolean checkRepair = false;
if (equOrder.getRepairCode() == null){
if (equOrder.getRepairCode() == null) {
checkRepair = true;
}else {
if (equOrder.getRepairCode().isEmpty()){
} else {
if (equOrder.getRepairCode().isEmpty()) {
checkRepair = true;
}
}
// 报修信息
if (checkRepair && hasError ) {
if (checkRepair && hasError && !maintenanceFlag) {
// 获取故障报修流水号
EquRepairOrder equRepairOrder = new EquRepairOrder();
String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
String equipmentCode = equOrder.getEqu().getEquipmentCode();
String equipmentCode = equOrder.getEquipmentCode();
//报修单号
equRepairOrder.setOrderCode("BX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equRepairOrder.setOrderCode("BX" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
//在主表中存入报修单号信息
equOrder.setRepairCode(equRepairOrder.getOrderCode());
@ -259,25 +278,35 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());
equRepairOrder.setCreateTime(DateUtils.getNowDate());
equRepairOrder.setCreateBy(SecurityUtils.getUsername());
//报修人编码、故障时间、设备编码、报修时间、联系人联系方式-自动报修
equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate());
equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername());
equRepairOrder.setEquipmentCode(equipmentCode);
equRepairOrder.setOrderTime(DateUtils.getNowDate());
EquTeamUser equTeamUser = new EquTeamUser();
equTeamUser.setUserName(SecurityUtils.getUsername());
EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser);
equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber());
equRepairOrder.setOrderRepairmanName(equTeamUserList.getNickName());
// 报修来源
if (equOrder.getPlanType().equals("inspection")){
if (equOrder.getPlanType().equals("inspection")) {
equRepairOrder.setOrderSource("巡检");
}
if (equOrder.getPlanType().equals("spotInspection")){
if (equOrder.getPlanType().equals("spotInspection")) {
equRepairOrder.setOrderSource("点检");
}
if (equOrder.getPlanType().equals("maintenance")){
if (equOrder.getPlanType().equals("maintenance")) {
equRepairOrder.setOrderSource("保养");
}
equRepairOrder.setOrderStatus("待审核");
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
equRepairOrderMapper.insertEquRepairOrder(equRepairOrder);
}
if (!hasError) {
// TODO 删除报修单
// 删除报修单
if (equOrder.getRepairCode() != null) {
if (!equOrder.getRepairCode().isEmpty()) {
equRepairOrderMapper.deleteEquRepairOrderByRepairCode(equOrder.getRepairCode());
@ -287,9 +316,26 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
}
// 保养逻辑
if (equOrder.getPlanType().equals("maintenance")) {
if (maintenanceFlag) {
// 设置结束时间
equOrder.setOrderEnd(DateUtils.getNowDate());
//上传附件
if (StringUtils.isNotEmpty(equOrder.getPicturePath())) {
String[] ids = equOrder.getPicturePath().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equOrder.getOrderId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
files.add(file);
}
equFileMapper.insertEquFileBatch(files);
}
}
// 更新工单信息
@ -298,8 +344,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
}
//////////////////////报修
/**
*
*
*
* @param equRepairOrder
* @return
@ -308,13 +355,15 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
@DS("#header.poolName")
public AjaxResult addRepairRecord(EquRepairOrder equRepairOrder) {
try {
// equRepairOrder
//自动填入联系人 联系方式!!!!!
String id = IdUtils.fastSimpleUUID();
equRepairOrder.setOrderId(id);
// 获取故障报修流水号
// 新增 是需要获取故障报修流水号
String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
String equipmentCode = equRepairOrder.getEquipmentCode();
//报修单号
equRepairOrder.setOrderCode("BX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equRepairOrder.setOrderCode("BX" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equRepairOrder.setCreateTime(DateUtils.getNowDate());
equRepairOrder.setCreateBy(SecurityUtils.getUsername());
equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername());
@ -322,9 +371,10 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
equRepairOrder.setOrderStatus("待审核");
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
equRepairOrderMapper.insertEquRepairOrder(equRepairOrder);
//删除照片 不需要清照片 因为是新增
//新增文件
if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) {
String[] ids1 = equRepairOrder.getFileList().split(",");
@ -386,10 +436,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
/**
*
* TODO
*
* @param pdadto
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult startMaintenanceTask(PDADTO pdadto) {
EquOrder order = equOrderMapper.selectEquOrderByOrderCode(pdadto.getOrderCode());
// 改为进行中
@ -398,6 +451,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
order.setShutDown(pdadto.getShutDown());
// 设置开始时间
order.setOrderStart(DateUtils.getNowDate());
// 设置保养人
order.setPlanPerson(SecurityContextHolder.getUserName());
// 更新数据表
order.setUpdateBy(SecurityContextHolder.getUserName());
order.setUpdateTime(DateUtils.getNowDate());
@ -406,7 +461,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
}
/**
*
*
*
* @param equRepairWorkOrder
* @return
@ -438,8 +493,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
return error();
}
}
/**
*
*
*
* @param equTeamUser
* @return
@ -466,7 +522,11 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
public AjaxResult updateDowntime(EquRepairWorkOrder equRepairWorkOrder) {
try {
//不停机 那么实际停机开始时间和实际停机结束时间都没有
//如果停机 那么实际停机时间就是传入的时间 停机时间必须选择校验
//如果停机 那么实际停机时间就是传入的时间
equRepairWorkOrder.setWorkStartTime(DateUtils.getNowDate());
if (equRepairWorkOrder.getWorkDownMachine().equals("1")) {
equRepairWorkOrder.setActualDownStartTime(DateUtils.getNowDate());
}
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
//维修中
@ -479,8 +539,6 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
}
/**
*
*
* @param equipmentId
* @return
*/
@ -488,8 +546,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
@DS("#header.poolName")
public AjaxResult selectEquEquipmentByEquEquipmentId(Long equipmentId) {
try {
EquEquipment list = equEquipmentMapper.selectEquEquipmentByEquEquipmentId(equipmentId);
return success(list);
EquEquipment list = equEquipmentMapper.selectEquEquipmentByEquEquipmentId(equipmentId);
return success(list);
} catch (Exception e) {
return error();
}
@ -505,40 +563,43 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
@DS("#header.poolName")
public AjaxResult selectPdaRepairWorkOrderDetails(String workId) {
try {
EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId);
//查询对应检查项信息
EquOrder equOrder = new EquOrder();
equOrder.setWorkCode(list.getWorkCode());
//检查项
List<EquOrder> checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder);
//每个检查项对应的检测标准
for(EquOrder equOrder1 :checkLists){
EquOrderStandard equOrderStandard = new EquOrderStandard();
equOrderStandard.setOrderCode(equOrder1.getOrderCode());
List<EquOrderStandard> standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard);
for(EquOrderStandard standardList :standardLists){
//每个检查标准里面的照片
List<BaseFileData> files = equOrderStandardMapper.getBaseFileBatch(standardList.getId());
if (!CollectionUtils.isEmpty(files)) {
standardList.setPicturePaths(files);
EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId);
//查询对应检查项信息
EquOrder equOrder = new EquOrder();
equOrder.setWorkCode(list.getWorkCode());
//检查项
List<EquOrder> checkLists = equOrderMapper.selectCheckListByWorkCode(equOrder);
//每个检查项对应的检测标准
for (EquOrder equOrder1 : checkLists) {
EquOrderStandard equOrderStandard = new EquOrderStandard();
equOrderStandard.setOrderCode(equOrder1.getOrderCode());
equOrderStandard.setParentCode(equOrder1.getId());
List<EquOrderStandard> standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard);
for (EquOrderStandard standardList : standardLists) {
//每个检查标准里面的照片
List<BaseFileData> files = equOrderStandardMapper.getBaseFileBatch(standardList.getId());
if (!CollectionUtils.isEmpty(files)) {
standardList.setPicturePaths(files);
}
standardList.setDetailReach(standardList.getRepairReach());
standardList.setActualValue(standardList.getRepairValue());
}
equOrder1.setStandardList(standardLists);
}
equOrder1.setStandardList(standardLists);
}
list.setDetailList(checkLists);
list.setDetailList(checkLists);
//备件申领单
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
equRepairWorkOrder.setWorkCode(list.getWorkCode());
List<EquSpareApply> applyLists = equSpareApplyMapper.selectRepairSparePartsRecord(equRepairWorkOrder);
list.setApplyList(applyLists);
//备件申领单
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
equRepairWorkOrder.setWorkCode(list.getWorkCode());
List<EquSpareApply> applyLists = equSpareApplyMapper.selectRepairSparePartsRecord(equRepairWorkOrder);
list.setApplyList(applyLists);
//文件
List<BaseFileData> files = equRepairWorkOrderMapper.getBaseFileBatch(workId);
if (!CollectionUtils.isEmpty(files)) {
list.setFiles(files);
}
return success(list);
//文件
List<BaseFileData> files = equRepairWorkOrderMapper.getBaseFileBatch(workId);
if (!CollectionUtils.isEmpty(files)) {
list.setFiles(files);
}
return success(list);
} catch (Exception e) {
return error();
}
@ -553,76 +614,149 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
@Override
@DS("#header.poolName")
public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) {
try {
//更新每一项点检/巡检检查项信息
List<EquOrder> checkLists = equRepairWorkOrder.getDetailList();
for(EquOrder checkList:checkLists){
checkList.setUpdateBy(SecurityUtils.getUsername());
checkList.setUpdateTime(DateUtils.getNowDate());
List<EquOrderStandard> standardLists = checkList.getStandardList();
for(EquOrderStandard standardList :standardLists){
//先删除每个检查项标准图片
equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId());
//图片
if (StringUtils.isNotEmpty(standardList.getPicturePath())) {
String[] ids = standardList.getPicturePath().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(standardList.getId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//维修后
file.setImageType("4");
files.add(file);
}
equOrderStandardMapper.insertBaseFileBatch(files);
}
equOrderStandardMapper.updateEquOrderStandard(standardList);
}
equOrderMapper.updateEquOrder(checkList);
}
//新建申领单 缺少code
List<EquSpareApply> equSpareApplies = equRepairWorkOrder.getApplyList();
for(EquSpareApply equSpareApply:equSpareApplies){
equSpareApply.setApplyId(IdUtils.fastSimpleUUID());
equSpareApply.setCreateBy(SecurityUtils.getUsername());
equSpareApply.setCreateTime(DateUtils.getNowDate());
equSpareApply.setApplyTime(DateUtils.getNowDate());
equSpareApplyMapper.insertEquSpareApply(equSpareApply);
}
//维修人员名字????前端能够提供吗???
//图片
//先删除每个维修工单对应图片
equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId());
if (StringUtils.isNotEmpty(equRepairWorkOrder.getFileList())) {
String[] ids = equRepairWorkOrder.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equRepairWorkOrder.getWorkId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//维修后
file.setImageType("4");
files.add(file);
}
equRepairWorkOrderMapper.insertBaseFileBatch(files);
}
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
return success("提交成功,维修完成!");
} catch (Exception e) {
return error();
//判断是否停机
EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId());
if (list.getWorkDownMachine().equals("1")) {
//维修结束时间、维修真正停机时间
equRepairWorkOrder.setActualDownEndTime(DateUtils.getNowDate());
}
equRepairWorkOrder.setWorkEndTime(DateUtils.getNowDate());
//更新每一项点检/巡检检查项信息
List<EquOrder> checkLists = equRepairWorkOrder.getDetailList();
for (EquOrder checkList : checkLists) {
checkList.setUpdateBy(SecurityUtils.getUsername());
checkList.setUpdateTime(DateUtils.getNowDate());
List<EquOrderStandard> standardLists = checkList.getStandardList();
for (EquOrderStandard standardList : standardLists) {
//先删除每个检查项标准图片
equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId());
//图片
if (StringUtils.isNotEmpty(standardList.getPicturePath())) {
String[] ids = standardList.getPicturePath().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(standardList.getId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//维修后
file.setImageType("4");
files.add(file);
}
equOrderStandardMapper.insertBaseFileBatch(files);
}
standardList.setRepairReach(standardList.getDetailReach());
standardList.setRepairValue(standardList.getActualValue());
standardList.setUpdateTime(DateUtils.getNowDate());
standardList.setUpdateBy(SecurityUtils.getUsername());
equOrderStandardMapper.updateActualValues(standardList);
}
equOrderMapper.updateEquOrder(checkList);
}
//新建申领单
List<EquSpareApply> equSpareApplies = equRepairWorkOrder.getApplyList();
for (EquSpareApply equSpareApply : equSpareApplies) {
//生成领料单code
String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber());
String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairWorkOrder.getWorkCode().substring(10);
//十五位单号
equSpareApply.setApplyCode("AW" + code + serialNum);
equSpareApply.setApplyId(IdUtils.fastSimpleUUID());
//备品备件规格型号!!!!!
// equSpareApply.setSpareModel(equSpareApply.getS);
equSpareApply.setSpareCode(equSpareApply.getMaterialCode());
equSpareApply.setSpareName(equSpareApply.getMaterialDesc());
equSpareApply.setApplyPeople(SecurityUtils.getUsername());
equSpareApply.setCreateBy(SecurityUtils.getUsername());
equSpareApply.setCreateTime(DateUtils.getNowDate());
equSpareApply.setApplyTime(DateUtils.getNowDate());
equSpareApply.setSpareUseEquipment(equRepairWorkOrder.getEquipmentCode());
equSpareApply.setWorkCode(equRepairWorkOrder.getWorkCode());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
equSpareApplyMapper.insertEquSpareApply(equSpareApply);
//更新完备品申领单后,更新库存
SparePartsLedger sparePartsLedger = new SparePartsLedger();
sparePartsLedger.setStorageId(equSpareApply.getStorageId());
BigDecimal applyNum = equSpareApply.getSpareQuantity();
BigDecimal amount = equSpareApply.getAmount();
sparePartsLedger.setAmount(amount.subtract(applyNum));
sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger);
}
//图片
//先删除每个维修工单对应图片
equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId());
if (StringUtils.isNotEmpty(equRepairWorkOrder.getFileList())) {
String[] ids = equRepairWorkOrder.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equRepairWorkOrder.getWorkId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//维修后
file.setImageType("4");
files.add(file);
}
equRepairWorkOrderMapper.insertBaseFileBatch(files);
}
//维修人:当前登录人
//维修状态
equRepairWorkOrder.setWorkStatus("1");
//维修结束时间
equRepairWorkOrder.setWorkPerson(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
//需要更新设备状态????这里没做
return success("提交成功,维修完成!");
}
/**
*
*
* @param equRepairWorkOrder
* @return
*/
// @Override
// @DS("#header.poolName")
// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
// // 查询一级数据
// List<EquFaultType> firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder);
// // 一级list
// List<EquFaultTypeTree> firstTree = new ArrayList<>();
// // 判空
// if (!CollectionUtils.isEmpty(firstLevel)) {
// for(EquFaultType equFaultType : firstLevel){
//
// }
// }
//
// return treeAll;
// }
/**
*
*
* @param equEquipment
* @return
*/
@Override
@DS("#header.poolName")
public List<EquEquipment> selectEquEquipmentList(EquEquipment equEquipment) {
return equEquipmentMapper.selectEquEquipmentList(equEquipment);
}
}

@ -2,6 +2,7 @@ package com.op.device.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.domain.R;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
@ -73,6 +74,10 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
@Autowired
private EquOutsourceWorkMapper equOutsourceWorkMapper;
@Autowired
private EquSpareApplyMapper equSpareApplyMapper;
@Autowired
private SparePartsLedgerMapper sparePartsLedgerMapper;
/**
*
* **/
@ -91,11 +96,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
new LinkedBlockingQueue<Runnable>());
try {
dateSources.forEach(dateSource -> {
if("ds_1000".equals(dateSource.get("poolName"))){//TODO生产去掉
logger.info("++++++++++++" + dateSource.get("poolName") + "++++点检开始++++++++++");
Runnable run = () -> createSpotCheckPlanFunc(dateSource.get("poolName"));
executorService.execute(run);
}
logger.info("++++++++++++" + dateSource.get("poolName") + "++++点检开始++++++++++");
Runnable run = () -> createSpotCheckPlanFunc(dateSource.get("poolName"));
executorService.execute(run);
});
} catch (Exception e) {
logger.error("service == dataClearTask == exception", e);
@ -157,11 +160,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
new LinkedBlockingQueue<Runnable>());
try {
dateSources.forEach(dateSource -> {
if("ds_1000".equals(dateSource.get("poolName"))){//TODO生产去掉
logger.info("++++++++++++" + dateSource.get("poolName") + "++++保养开始++++++++++");
Runnable run = () -> createMaintenancePlanFunc(dateSource.get("poolName"));
executorService.execute(run);
}
logger.info("++++++++++++" + dateSource.get("poolName") + "++++保养开始++++++++++");
Runnable run = () -> createMaintenancePlanFunc(dateSource.get("poolName"));
executorService.execute(run);
});
} catch (Exception e) {
logger.error("service == dataClearTask == exception", e);
@ -245,6 +246,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
private int createOrderPlan(EquPlan plan){
Date nowtime = DateUtils.getNowDate();
String createBy = "job";
String factory = plan.getFactoryCode();
int sce = 0;
/**equ_plan->equ_order********************************************************************/
EquOrder order = new EquOrder();
@ -264,22 +266,42 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
/**equ_order**/
sce = equOrderMapper.insertEquOrder(order);
System.out.println(plan.getPlanCode()+"========equ_order:"+sce);
/**equ_plan_equ_spare->equ_order_equ_spare*************************************************************/
/**equ_plan_equ_spare->equ_spare_apply*************************************************************/
EquPlanEquSpare equPlanEquSpare = new EquPlanEquSpare();
equPlanEquSpare.setParentCode(plan.getPlanEquId());
List<EquPlanEquSpare> spares = equPlanEquSpareMapper.selectEquPlanEquSpareList(equPlanEquSpare);
for(EquPlanEquSpare spare:spares){
spare.setId(IdUtils.fastSimpleUUID());
spare.setCreateTime(nowtime);
spare.setCreateBy(createBy);
spare.setDelFlag("0");
spare.setCode(orderCode);
}
if(!CollectionUtils.isEmpty(spares)){
sce = equOrderEquSpareMapper.insertEquOrderEquSpares(spares);
System.out.println(plan.getPlanCode()+"========equ_order_equ_spare:"+sce);
// 获取流水单号
int applySerialNum = equSpareApplyMapper.selectSerialNumber();
for (EquPlanEquSpare spare : spares) {
EquSpareApply apply = new EquSpareApply();
apply.setApplyId(IdUtils.fastSimpleUUID());
apply.setApplyCode("A"+orderCode+String.format("%02d",applySerialNum));
applySerialNum++;
apply.setSpareCode(spare.getMaterialCode());
apply.setSpareName(spare.getMaterialDesc());
apply.setSpareModel(spare.getSpareType());
apply.setSpareQuantity(spare.getApplyNum());
apply.setFactoryCode(factory);
apply.setApplyPeople("job");
apply.setWorkCode(orderCode);
apply.setCreateBy("job");
apply.setCreateTime(nowtime);
apply.setSpareUseEquipment(plan.getEquipmentCode());
apply.setApplyTime(nowtime);
// 插入备件信息
equSpareApplyMapper.insertEquSpareApply(apply);
// 减少备件仓库中备件数量
sparePartsLedgerMapper.updateSpareNumReduce(apply);
}
// if(!CollectionUtils.isEmpty(spares)){
// sce = equOrderEquSpareMapper.insertEquOrderEquSpares(spares);
// System.out.println(plan.getPlanCode()+"========equ_spare_apply:"+sce);
// }
/**equ_plan_detail->equ_order_detail*******************************************************/
EquPlanDetail itqo = new EquPlanDetail();
itqo.setParentCode(plan.getPlanEquId());
@ -324,12 +346,12 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
EquOutsourceWork equOutsourceWork = new EquOutsourceWork();
BeanUtils.copyProperties(plan,equOutsourceWork);
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
equOutsourceWork.setOrderCode(orderCode);
equOutsourceWork.setWorkCode(order.getOutsourceCode());
equOutsourceWork.setWorkType("1");//1委外保养0委外维修
equOutsourceWork.setCreateBy(createBy);
equOutsourceWork.setCreateTime(nowtime);
equOutsourceWork.setDelFlag("0");
equOutsourceWork.setRepairCode(orderCode);
sce = equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork);
System.out.println(plan.getPlanCode() + "========equ_outsource_work:" + sce);
}else {

@ -48,13 +48,15 @@ public class EquOrderServiceImpl implements IEquOrderService {
@Autowired
private PersonMapper personMapper;
@Autowired
private EquOrderEquSpareMapper equOrderEquSpareMapper;
@Autowired
private EquRepairOrderMapper equRepairOrderMapper;
@Autowired
private EquFileMapper equFileMapper;
@Autowired
private EquPlanMapper equPlanMapper;
@Autowired
private EquSpareApplyMapper equSpareApplyMapper;
@Autowired
private SparePartsLedgerMapper sparePartsLedgerMapper;
/**
*
@ -91,7 +93,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
order.setDetailList(detailList);
// 备件
List<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode());
List<EquSpareApply> spareList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode());
if (spareList.size() > 0) {
order.setSpareList(spareList);
}
@ -196,6 +198,11 @@ public class EquOrderServiceImpl implements IEquOrderService {
}
boolean hasError = false;
boolean maintenanceFlag = false;
if (equOrder.getPlanType().equals("maintenance")) {
maintenanceFlag = true;
}
List<EquOrderDetail> detailList = equOrder.getDetailList();
for (EquOrderDetail detail : detailList) {
@ -264,7 +271,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
}
// 报修信息
if (checkRepair && hasError) {
if (checkRepair && hasError && !maintenanceFlag) {
// 获取故障报修流水号
EquRepairOrder equRepairOrder = new EquRepairOrder();
String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
@ -278,6 +285,18 @@ public class EquOrderServiceImpl implements IEquOrderService {
equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());
equRepairOrder.setCreateTime(DateUtils.getNowDate());
equRepairOrder.setCreateBy(SecurityUtils.getUsername());
//报修人编码、故障时间、设备编码、报修时间、联系人联系方式-自动报修
equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate());
equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername());
equRepairOrder.setEquipmentCode(equipmentCode);
equRepairOrder.setOrderTime(DateUtils.getNowDate());
EquTeamUser equTeamUser = new EquTeamUser();
equTeamUser.setUserName(SecurityUtils.getUsername());
EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser);
equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber());
equRepairOrder.setOrderRepairmanName(equTeamUserList.getNickName());
// 报修来源
if (equOrder.getPlanType().equals("inspection")) {
equRepairOrder.setOrderSource("巡检");
@ -296,7 +315,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
}
if (!hasError) {
// TODO 删除报修单
// 删除报修单
if (equOrder.getRepairCode() != null) {
if (!equOrder.getRepairCode().isEmpty()) {
equRepairOrderMapper.deleteEquRepairOrderByRepairCode(equOrder.getRepairCode());
@ -306,12 +325,29 @@ public class EquOrderServiceImpl implements IEquOrderService {
}
// 保养逻辑
if (equOrder.getPlanType().equals("maintenance")) {
if (maintenanceFlag) {
// 用时
if (equOrder.getOrderStart() != null) {
long diffSeconds = (equOrder.getOrderEnd().getTime() - equOrder.getOrderStart().getTime()) / 60000;
equOrder.setOrderCostTime(String.valueOf(diffSeconds));
}
// 保养图片
if (StringUtils.isNotEmpty(equOrder.getPicturePath())) {
String[] ids = equOrder.getPicturePath().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equOrder.getOrderId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
files.add(file);
}
equFileMapper.insertEquFileBatch(files);
}
}
// 更新工单信息
@ -327,8 +363,32 @@ public class EquOrderServiceImpl implements IEquOrderService {
*/
@Override
@DS("#header.poolName")
public int deleteEquOrderByOrderIds(String[] orderIds) {
return equOrderMapper.deleteEquOrderByOrderIds(orderIds);
public AjaxResult deleteEquOrderByOrderIds(String[] orderIds) {
// 保养-备件逻辑
for (String orderId : orderIds) {
EquOrder order = equOrderMapper.selectEquOrderByOrderId(orderId);
if (!order.getOrderStatus().equals("0")) {
return error(500,"工单已进行修改!不可删除!");
}
if (order.getPlanType().equals("maintenance")) {
List<EquSpareApply> applyList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode());
for (EquSpareApply apply : applyList) {
// 返回备件数量
sparePartsLedgerMapper.updateSpareNumAdd(apply);
}
}
}
// 逻辑删除获取人员
equOrderPersonMapper.delEquOrderPersonByorderIds(orderIds);
// 逻辑删除标准信息
equOrderStandardMapper.delEquOrderStandardByorderIds(orderIds);
// 逻辑删除检查项信息
equOrderDetailMapper.delEquOrderDetailByorderIds(orderIds);
// 逻辑删除备件信息
equSpareApplyMapper.delEquSpareApplyByorderIds(orderIds);
// 逻辑删除工单
equOrderMapper.delEquOrderByOrderIds(orderIds);
return success();
}
/**

@ -7,6 +7,7 @@ import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.mapper.EquOrderMapper;
import com.op.device.mapper.EquRepairWorkOrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -29,6 +30,12 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
@Autowired
private EquOutsourceWorkMapper equOutsourceWorkMapper;
@Autowired
private EquRepairWorkOrderMapper equRepairWorkOrderMapper;
@Autowired
private EquOrderMapper equOrderMapper;
/**
*
@ -63,6 +70,7 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
@Override
@DS("#header.poolName")
public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork) {
//新增的委外工单,不用报修单号、维修单号拼接
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber());
String equipmentCode = equOutsourceWork.getEquipmentCode();
@ -87,6 +95,13 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
@Override
@DS("#header.poolName")
public int updateEquOutsourceWork(EquOutsourceWork equOutsourceWork) {
//1完成委外
if(equOutsourceWork.getWorkStatus().equals("1")){
//更新维修工单状态
equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode());
//更新保养工单状态
equOrderMapper.updateEquOrderStatusComplete(equOutsourceWork.getRepairCode());
}
equOutsourceWork.setUpdateTime(DateUtils.getNowDate());
equOutsourceWork.setUpdateBy(SecurityUtils.getUsername());
return equOutsourceWorkMapper.updateEquOutsourceWork(equOutsourceWork);

@ -264,26 +264,29 @@ public class EquPlanServiceImpl implements IEquPlanService {
if (equCheckItemList.size() > 0) {
List<EquPlanDetail> detailList = new ArrayList<>();
for (EquCheckItem checkItem : equCheckItemList) {
EquPlanDetail detail = new EquPlanDetail();
BeanUtils.copyProperties(checkItem,detail);
// 只需要循环周期一致的检查项
if(checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType())) {
EquPlanDetail detail = new EquPlanDetail();
BeanUtils.copyProperties(checkItem,detail);
if (!detail.getItemCode().isEmpty()) {
itemTempName.append(detail.getItemName()).append(",");
// 获取检查项详情list
List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
if (equCheckItemList.size() > 0) {
List<EquPlanStandard> standardList = new ArrayList<>();
for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
EquPlanStandard standard = new EquPlanStandard();
BeanUtils.copyProperties(standardTemp,standard);
if (!detail.getItemCode().isEmpty()) {
itemTempName.append(detail.getItemName()).append(",");
// 获取检查项详情list
List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
if (equCheckItemList.size() > 0) {
List<EquPlanStandard> standardList = new ArrayList<>();
for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
EquPlanStandard standard = new EquPlanStandard();
BeanUtils.copyProperties(standardTemp,standard);
standard.setShowFlag(true);
standardList.add(standard);
standard.setShowFlag(true);
standardList.add(standard);
}
detail.setEquPlanStandardList(standardList);
}
detail.setEquPlanStandardList(standardList);
}
detailList.add(detail);
}
detailList.add(detail);
}
data.setEquPlanDetailList(detailList);
data.setItemTempName(itemTempName.toString());
@ -365,6 +368,8 @@ public class EquPlanServiceImpl implements IEquPlanService {
List<EquPlanStandard> standardList = equPlanStandardMapper.selectEquPlanStandardListByParentCode(detail.getId());
for (EquPlanStandard standard : standardList) {
standard.setShowFlag(true);
standard.setItemLoop(detail.getItemLoop());
standard.setItemLoopType(detail.getItemLoopType());
}
// 置入标准

@ -1,5 +1,6 @@
package com.op.device.service.impl;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -66,29 +67,17 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
list.setFiles(files);
}
// //查询对应检查项信息
// EquOrder equOrder = new EquOrder();
// equOrder.setOrderCode(list.getOrderCode());
// List<EquOrderStandard> checkLists = equOrderStandardMapper.selectPdaEquOrderList(equOrder);
// //每个检查项对应文件
// for(EquOrderStandard equOrderStandard :checkLists){
// List<BaseFileData> file = equOrderStandardMapper.getBaseFileBatch(equOrderStandard.getId());
// if (!CollectionUtils.isEmpty(file)) {
// equOrderStandard.setPicturePaths(file);
// }
// }
// list.setCheckList(checkLists);
//查询对应检查项信息
EquOrder equOrder = new EquOrder();
//报修单号
equOrder.setRepairCode(list.getOrderCode());
//检查项
List<EquOrder> checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder);
List<EquOrder> checkLists = equOrderMapper.selectCheckListByRepairCode(equOrder);
//每个检查项对应的检测标准
for(EquOrder equOrder1 :checkLists){
EquOrderStandard equOrderStandard = new EquOrderStandard();
equOrderStandard.setOrderCode(equOrder1.getOrderCode());
equOrderStandard.setParentCode(equOrder1.getId());
List<EquOrderStandard> standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard);
for(EquOrderStandard standardList :standardLists){
//每个检查标准里面的照片
@ -112,6 +101,22 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
@Override
@DS("#header.poolName")
public List<EquRepairOrder> selectEquRepairOrderList(EquRepairOrder equRepairOrder) {
if (equRepairOrder.getOrderBreakdownTimeArray() != null) {
// 设置故障开始时间、结束时间
if (equRepairOrder.getOrderBreakdownTimeArray().size() == 2) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
equRepairOrder.setOrderBreakdownTimeStart(formatter.format(equRepairOrder.getOrderBreakdownTimeArray().get(0)));
equRepairOrder.setOrderBreakdownTimeEnd(formatter.format(equRepairOrder.getOrderBreakdownTimeArray().get(1)));
}
}
if (equRepairOrder.getOrderTimeArray() != null) {
// 设置更新日期开始和结束
if (equRepairOrder.getOrderTimeArray().size() == 2) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
equRepairOrder.setOrderTimeStart(formatter.format(equRepairOrder.getOrderTimeArray().get(0)));
equRepairOrder.setOrderTimeEnd(formatter.format(equRepairOrder.getOrderTimeArray().get(1)));
}
}
return equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder);
}
@ -166,14 +171,31 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
@Override
@DS("#header.poolName")
public int checkEquRepairOrder(EquRepairOrder equRepairOrder) {
//改了,不生成流水号,从第十位开始切割
String code = equRepairOrder.getOrderCode().substring(10);
String workCode = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + code;
//判断是否是点检、巡检过来的
if(equRepairOrder.getOrderSource().equals("点检") || equRepairOrder.getOrderSource().equals("巡检")){
//更新检查项信息
EquOrder equOrder = new EquOrder();
List<String> ids = equOrderMapper.getIdsByOrderCode(equRepairOrder.getOrderCode());
for(String id :ids){
EquOrder one = new EquOrder();
one.setOrderId(id);
one.setWorkCode("WX" + workCode);
one.setUpdateBy(SecurityUtils.getUsername());
one.setUpdateTime(DateUtils.getNowDate());
//只更新其中一个信息
equOrderMapper.updateEquOrderRepairCode(one);
}
}
if(equRepairOrder.getRepairDestination().equals("计划性维修")){
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
//报修单号
equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode());
//维修单号
String serialNum = String.format("%03d", equRepairWorkOrderMapper.selectWorkCodeSerialNumber());
String equipmentCode = equRepairOrder.getEquipmentCode();
equRepairWorkOrder.setWorkCode("WX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equRepairWorkOrder.setWorkCode("WX" + workCode);
equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId());
equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode());
equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam());
@ -202,22 +224,24 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder);
equRepairOrder.setOrderStatus("审核通过");
}else if(equRepairOrder.getRepairDestination().equals("不维修")){
equRepairOrder.setOrderStatus("驳回");
}else if(equRepairOrder.getRepairDestination().equals("委外维修")){
EquOutsourceWork equOutsourceWork = new EquOutsourceWork();
//委外工单编码、id、联系方式、委外单位、委外人员、委外原因
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
equOutsourceWork.setOrderCode(equRepairOrder.getOrderCode());
String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber());
String equipmentCode = equRepairOrder.getEquipmentCode();
equOutsourceWork.setEquipmentCode(equipmentCode);
equOutsourceWork.setWorkCode("WW"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equOutsourceWork.setEquipmentCode(equRepairOrder.getEquipmentCode());
equOutsourceWork.setWorkCode("WW" + workCode);
equOutsourceWork.setRepairCode("无");
equOutsourceWork.setWorkConnection(equRepairOrder.getWorkConnection());
equOutsourceWork.setWorkOutsourcingUnit(equRepairOrder.getWorkOutsourcingUnit());
equOutsourceWork.setWorkPerson(equRepairOrder.getOutSourcePerson());
equOutsourceWork.setWorkReason(equRepairOrder.getOutSourceReason());
//委外类型 维修委外
equOutsourceWork.setWorkType("0");
equOutsourceWork.setCreateBy(SecurityUtils.getUsername());
equOutsourceWork.setCreateTime(DateUtils.getNowDate());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@ -226,10 +250,38 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork);
equRepairOrder.setOrderStatus("审核通过");
}else if(equRepairOrder.getRepairDestination().equals("立即维修")){
//立即维修
//是否立即维修 1是 0 否
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
//报修单号
equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode());
//维修单号
equRepairWorkOrder.setWorkCode("WX"+workCode);
equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId());
equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode());
equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam());
//不委外
equRepairWorkOrder.setWorkOutsource("0");
equRepairWorkOrder.setOutWorkCode("无");
//是否立即维修 1是 0 否
equRepairWorkOrder.setWorkHandle("0");
//计划维修时间
equRepairWorkOrder.setWorkPlanTime(equRepairOrder.getWorkPlanTime());
//是否停机维修 停机维修时间
if(equRepairOrder.getWorkPlanDownTime() != null){
equRepairWorkOrder.setWorkDownMachine("1");
equRepairWorkOrder.setWorkPlanDownTime(equRepairOrder.getWorkPlanDownTime());
}else{
equRepairWorkOrder.setWorkDownMachine("0");
}
equRepairWorkOrder.setWorkFaultDesc(equRepairOrder.getOrderDesc());
equRepairWorkOrder.setWorkStatus("0");
equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID());
equRepairWorkOrder.setCreateTime(DateUtils.getNowDate());
equRepairWorkOrder.setCreateBy(SecurityUtils.getUsername());
//工厂
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder);
equRepairOrder.setOrderStatus("审核通过");
}
equRepairOrder.setUpdateTime(DateUtils.getNowDate());
@ -326,12 +378,12 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
/**
*
*
* @param equEquipment
* @param equTeamUser
* @return
*/
@Override
@DS("#header.poolName")
public List<EquEquipment> getRepairPersonList(EquEquipment equEquipment) {
return equRepairOrderMapper.getRepairPersonList(equEquipment);
public List<EquTeamUser> getRepairPersonList(EquTeamUser equTeamUser) {
return equRepairOrderMapper.getRepairPersonList(equTeamUser);
}
}

@ -1,11 +1,14 @@
package com.op.device.service.impl;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.domain.BaseFileData;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.*;
@ -53,7 +56,7 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId);
List<BaseFileData> beforeFiles = equRepairWorkOrderMapper.getBaseFileBatch(list.getOrderId());
if (!CollectionUtils.isEmpty(beforeFiles)) {
list.setBeforeRepairFiles(beforeFiles);
list.setBeforeRepairFiles(beforeFiles);
}
//查询维修后图片
List<BaseFileData> afterFiles = equRepairWorkOrderMapper.getBaseFileBatch(workId);
@ -65,11 +68,12 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
EquOrder equOrder = new EquOrder();
equOrder.setWorkCode(list.getWorkCode());
//检查项
List<EquOrder> checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder);
List<EquOrder> checkLists = equOrderMapper.selectCheckListByWorkCode(equOrder);
//每个检查项对应的检测标准
for(EquOrder equOrder1 :checkLists){
EquOrderStandard equOrderStandard = new EquOrderStandard();
equOrderStandard.setOrderCode(equOrder1.getOrderCode());
equOrderStandard.setParentCode(equOrder1.getId());
List<EquOrderStandard> standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard);
for(EquOrderStandard standardList :standardLists){
//每个检查标准里面的照片
@ -153,6 +157,34 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
}
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
//先删除每个维修工单对应图片
equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId());
if (StringUtils.isNotEmpty(equRepairWorkOrder.getAfterRepairFile())) {
String[] ids = equRepairWorkOrder.getAfterRepairFile().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equRepairWorkOrder.getWorkId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//维修后
file.setImageType("4");
files.add(file);
}
equRepairWorkOrderMapper.insertBaseFileBatch(files);
}
//更新标准表
for(EquOrderStandard equOrderStandard:equRepairWorkOrder.getStandardList()){
equOrderStandard.setUpdateBy(SecurityUtils.getUsername());
equOrderStandard.setUpdateTime(DateUtils.getNowDate());
equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard);
}
return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
}
@ -190,20 +222,25 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
@Override
@DS("#header.poolName")
public int applyEquOutsourceWork(EquRepairWorkOrder equRepairWorkOrder) {
//如果存在之前的删掉重新增加,物理删除
equOutsourceWorkMapper.deleteEquOutsourceWorkByRepairCode(equRepairWorkOrder.getWorkCode());
//转委外
EquOutsourceWork equOutsourceWork = new EquOutsourceWork();
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
//委外工单号
String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber());
String equipmentCode = equRepairWorkOrder.getEquipmentCode();
//String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber());
//改了,不生成流水号,从第十位开始切割
String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairWorkOrder.getWorkCode().substring(10);
equOutsourceWork.setWorkCode("WW"+ code);
equOutsourceWork.setOrderCode("无");
equOutsourceWork.setWorkCode("WW"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum);
equOutsourceWork.setEquipmentCode(equipmentCode);
equOutsourceWork.setEquipmentCode(equRepairWorkOrder.getEquipmentCode());
equOutsourceWork.setRepairCode(equRepairWorkOrder.getWorkCode());
equOutsourceWork.setWorkReason(equRepairWorkOrder.getOutSourceReason());
equOutsourceWork.setWorkPerson(equRepairWorkOrder.getOutSourcePerson());
equOutsourceWork.setWorkOutsourcingUnit(equRepairWorkOrder.getWorkOutsourcingUnit());
equOutsourceWork.setWorkConnection(equRepairWorkOrder.getWorkConnection());
//委外类型 维修委外
equOutsourceWork.setWorkType("0");
equOutsourceWork.setCreateTime(DateUtils.getNowDate());
equOutsourceWork.setCreateBy(SecurityUtils.getUsername());
if(equRepairWorkOrder.getWorkId()!= null){
@ -211,6 +248,10 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
equRepairWorkOrder.setOutWorkCode(equOutsourceWork.getWorkCode());
equRepairWorkOrderMapper.updateWorkOutsource(equRepairWorkOrder);
}
//工厂号
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
return equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork);
}
}

@ -9,8 +9,11 @@ import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquOrder;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.SparePartsLedger;
import com.op.device.mapper.EquOrderMapper;
import com.op.device.mapper.EquRepairWorkOrderMapper;
import com.op.device.mapper.SparePartsLedgerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -23,6 +26,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import static com.op.common.core.web.domain.AjaxResult.error;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
* Service
@ -36,10 +40,14 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
private EquSpareApplyMapper equSpareApplyMapper;
@Autowired
private SparePartsLedgerMapper sparePartsLedgerMapper;
@Autowired
private EquRepairWorkOrderMapper equRepairWorkOrderMapper;
@Autowired
private EquOrderMapper equOrderMapper;
/**
*
*
*
* @param applyId
* @return
*/
@ -51,7 +59,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
/**
*
*
*
* @param equSpareApply
* @return
*/
@ -71,7 +79,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
/**
*
*
*
* @param equSpareApply
* @return
*/
@ -79,11 +87,16 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
@DS("#header.poolName")
public AjaxResult insertEquSpareApply(EquSpareApply equSpareApply) {
try {
//equSpareApply.getSpareApplyLists().size() 是在申领备件的时候进行的操作
if(equSpareApply.getSpareApplyLists().size() >= 1){
//equSpareApply.getSpareApplyLists().size() 是在维修申领备件的时候进行的操作 批量新增
if(equSpareApply.getSpareApplyLists().size() >= 1){
List<EquSpareApply> list = equSpareApply.getSpareApplyLists();
for(EquSpareApply applyList:list){
applyList.setApplyId(IdUtils.fastSimpleUUID());
//生成领料单code //申领单号
String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber());
String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + applyList.getWorkCode().substring(2);
//申领单号
equSpareApply.setApplyCode("AW" + code + serialNum);
//领用时间
applyList.setApplyTime(DateUtils.getNowDate());
//申领人
@ -92,28 +105,52 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
applyList.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
//创建人、创建时间
applyList.setCreateTime(DateUtils.getNowDate());
applyList.setCreateBy(SecurityUtils.getUsername());
equSpareApplyMapper.insertEquSpareApply(applyList);
//更新完备品申领单后,更新库存
SparePartsLedger sparePartsLedger = new SparePartsLedger();
sparePartsLedger.setStorageId(applyList.getStorageId());
BigDecimal applyNum = new BigDecimal(applyList.getSpareQuantity());
BigDecimal applyNum = applyList.getSpareQuantity();
BigDecimal amount = applyList.getAmount();
sparePartsLedger.setAmount(amount.subtract(applyNum));
sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger);
}
}else{
equSpareApply.setApplyId(IdUtils.fastSimpleUUID());
String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber());
if(equSpareApply.getWorkCode().length() == 12){
//生成领料单code 十五位单号
equSpareApply.setApplyCode("A" + equSpareApply.getWorkCode() + serialNum);
}else if(equSpareApply.getWorkCode().length() > 12){
equSpareApply.setApplyCode("AW" + equSpareApply.getWorkCode().substring(2) + serialNum);
}else{
//普通申领单
equSpareApply.setApplyCode("AN" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equSpareApply.getSpareUseEquipment() + serialNum);
}
//领用时间
equSpareApply.setApplyTime(DateUtils.getNowDate());
//申领人
equSpareApply.setApplyPeople(SecurityUtils.getUsername());
//工厂号
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
//创建人、创建时间
equSpareApply.setCreateTime(DateUtils.getNowDate());
equSpareApply.setCreateBy(SecurityUtils.getUsername());
equSpareApplyMapper.insertEquSpareApply(equSpareApply);
//更新完备品申领单后,更新库存
SparePartsLedger sparePartsLedger = new SparePartsLedger();
sparePartsLedger.setStorageId(equSpareApply.getStorageId());
BigDecimal applyNum = equSpareApply.getSpareQuantity();
BigDecimal amount = equSpareApply.getAmount();
sparePartsLedger.setAmount(amount.subtract(applyNum));
sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger);
}
return AjaxResult.success("新增申领记录成功!");
return success("新增申领记录成功!");
} catch (Exception e) {
return error();
}
@ -121,7 +158,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
/**
*
*
*
* @param equSpareApply
* @return
*/
@ -135,19 +172,59 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
/**
*
*
*
* @param applyIds
* @return
*/
@Override
@DS("#header.poolName")
public int deleteEquSpareApplyByApplyIds(String[] applyIds) {
return equSpareApplyMapper.deleteEquSpareApplyByApplyIds(applyIds);
public AjaxResult deleteEquSpareApplyByApplyIds(String[] applyIds) {
boolean check = true;
// 校验
for (String id : applyIds) {
EquSpareApply apply = equSpareApplyMapper.selectEquSpareApplyByApplyId(id);
int checkNull = 0;
if (apply.getWorkCode() != null) {
if (!apply.getWorkCode().isEmpty()) {
EquRepairWorkOrder workOrder = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkCode(apply.getWorkCode());
if (workOrder != null) {
if (workOrder.getWorkStatus().equals("1")) {
check = false;
}
}else {
checkNull++;
}
EquOrder order = equOrderMapper.selectEquOrderByOrderCode(apply.getWorkCode());
if (order != null) {
if (order.getOrderStatus().equals("1")){
check = false;
}
}else {
checkNull++;
}
}
}
if (checkNull == 2) {
return error(500,"关联单号信息为空!删除失败!");
}
if (check) {
// 回填数据
sparePartsLedgerMapper.updateSpareNumAdd(apply);
// 逻辑删除领用单
equSpareApplyMapper.delEquSpareApplyByApplyId(id);
}else {
return error(500,"关联工单状态已完成,不可删除!");
}
}
return success();
}
/**
*
*
*
* @param applyId
* @return
*/

@ -46,26 +46,29 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService {
if (equCheckItemList.size() > 0) {
List<EquPlanDetail> detailList = new ArrayList<>();
for (EquCheckItem checkItem : equCheckItemList) {
EquPlanDetail detail = new EquPlanDetail();
BeanUtils.copyProperties(checkItem,detail);
// 只需要循环周期一致的检查项
if(checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType())) {
EquPlanDetail detail = new EquPlanDetail();
BeanUtils.copyProperties(checkItem,detail);
if (!detail.getItemCode().isEmpty()) {
itemTempName.append(detail.getItemName()).append(",");
// 获取检查项详情list
List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
if (equCheckItemList.size() > 0) {
List<EquPlanStandard> standardList = new ArrayList<>();
for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
EquPlanStandard standard = new EquPlanStandard();
BeanUtils.copyProperties(standardTemp,standard);
if (!detail.getItemCode().isEmpty()) {
itemTempName.append(detail.getItemName()).append(",");
// 获取检查项详情list
List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
if (equCheckItemList.size() > 0) {
List<EquPlanStandard> standardList = new ArrayList<>();
for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
EquPlanStandard standard = new EquPlanStandard();
BeanUtils.copyProperties(standardTemp,standard);
standard.setShowFlag(true);
standardList.add(standard);
standard.setShowFlag(true);
standardList.add(standard);
}
detail.setEquPlanStandardList(standardList);
}
detail.setEquPlanStandardList(standardList);
}
detailList.add(detail);
}
detailList.add(detail);
}
data.setEquPlanDetailList(detailList);
data.setItemTempName(itemTempName.toString());

@ -52,7 +52,7 @@ public class EquTeamServiceImpl implements IEquTeamService {
List<EquTeamUser> equTeamUser1 = equTeamUserMapper.selectEquTeamUserList(equTeamUser);
EquTeam equTeam = equTeamMapper.selectEquTeamById(id);
equTeam.setSelectedData(equTeamUser1);
return equTeamMapper.selectEquTeamById(id);
return equTeam;
}
/**
@ -99,9 +99,9 @@ public class EquTeamServiceImpl implements IEquTeamService {
list = equTeam.getRightData();
String userId = list.get(i);
equTeamUser.setUserId(userId);
EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser);
equTeamUser.setUserName(memberList.getUserName());
equTeamUser.setNickName(memberList.getNickName());
// EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser);
// equTeamUser.setUserName(memberList.getUserName());
// equTeamUser.setNickName(memberList.getNickName());
equTeamUserMapper.insertEquTeamUser(equTeamUser);
}
return success("新增设备班组成功!");
@ -123,6 +123,7 @@ public class EquTeamServiceImpl implements IEquTeamService {
try{
equTeam.setUpdateTime(DateUtils.getNowDate());
equTeam.setUpdateBy(SecurityUtils.getUsername());
equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId());
equTeamMapper.updateEquTeam(equTeam);
for(int i = 0;i<equTeam.getRightData().size();i++){
EquTeamUser equTeamUser = new EquTeamUser();
@ -135,9 +136,8 @@ public class EquTeamServiceImpl implements IEquTeamService {
list = equTeam.getRightData();
String userId = list.get(i);
equTeamUser.setUserId(userId);
String userName = equTeamUserMapper.selectUserName(equTeamUser);
//判断班组人员有没有变动 挨个遍历
equTeamUser.setUserName(userName);
// String userName = equTeamUserMapper.selectUserName(equTeamUser);
// equTeamUser.setUserName(userName);
equTeamUserMapper.insertEquTeamUser(equTeamUser);
}
return success("修改设备班组成功!");

@ -33,8 +33,6 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
@Autowired
private EquOrderMapper equOrderMapper;
@Autowired
private EquOrderEquSpareMapper equOrderEquSpareMapper;
@Autowired
private EquOrderStandardMapper equOrderStandardMapper;
@Autowired
private EquOrderDetailMapper equOrderDetailMapper;
@ -42,6 +40,10 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
private EquOrderPersonMapper equOrderPersonMapper;
@Autowired
private EquOrderEquMapper equOrderEquMapper;
@Autowired
private EquSpareApplyMapper equSpareApplyMapper;
@Autowired
private SparePartsLedgerMapper sparePartsLedgerMapper;
/**
*
@ -68,7 +70,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
}
/**
* TODO
*
*
* @param equPlan
* @return
@ -92,8 +94,10 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
String serialNum = String.format("%03d",equOrderMapper.selectSerialNumber());
equOrder.setOrderCode("F"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+serialNum);
equOrder.setPlanLoopType("");
equOrder.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));
equOrder.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));
if (equPlan.getPlanTimeArray() != null) {
equOrder.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));
equOrder.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));
}
// 设置工单状态
equOrder.setOrderStatus("0");
equOrder.setFactoryCode(factory);
@ -102,6 +106,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
equOrder.setUpdateBy(SecurityContextHolder.getUserName());
equOrder.setUpdateTime(DateUtils.getNowDate());
equOrder.setPlanType("maintenance");
equOrder.setUpkeep("0");
equOrder.setEquipmentCode(equPlan.getEquipmentItem().get(0).getEquipmentCode());
// 工单插入数据库
equOrderMapper.insertEquOrder(equOrder);
@ -109,22 +114,32 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
EquPlanEqu equPlanEqu = equPlan.getEquipmentItem().get(0);
// 生成工单-备件
List<EquOrderEquSpare> spareList = new ArrayList<>();
List<EquPlanEquSpare> equSpareList = equPlanEqu.getSpareList();
if (equSpareList != null) {
// 获取流水单号
int applySerialNum = equSpareApplyMapper.selectSerialNumber();
for (EquPlanEquSpare spare : equSpareList) {
EquOrderEquSpare spareTemp = new EquOrderEquSpare();
BeanUtils.copyProperties(spare,spareTemp);
spareTemp.setId(IdUtils.fastSimpleUUID());
spareTemp.setOrderCode(equOrder.getOrderCode());
spareTemp.setFactoryCode(factory);
spareTemp.setCreateBy(SecurityContextHolder.getUserName());
spareTemp.setCreateTime(DateUtils.getNowDate());
spareTemp.setUpdateBy(SecurityContextHolder.getUserName());
spareTemp.setUpdateTime(DateUtils.getNowDate());
EquSpareApply apply = new EquSpareApply();
apply.setApplyId(IdUtils.fastSimpleUUID());
apply.setApplyCode("A"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+String.format("%03d",applySerialNum));
applySerialNum++;
apply.setSpareCode(spare.getMaterialCode());
apply.setSpareName(spare.getMaterialDesc());
apply.setSpareModel(spare.getSpareType());
apply.setSpareQuantity(spare.getApplyNum());
apply.setFactoryCode(factory);
apply.setApplyPeople(SecurityContextHolder.getUserName());
apply.setWorkCode(equOrder.getOrderCode());
apply.setCreateBy(SecurityContextHolder.getUserName());
apply.setCreateTime(DateUtils.getNowDate());
apply.setSpareUseEquipment(equOrder.getEquipmentCode());
apply.setApplyTime(DateUtils.getNowDate());
// 插入备件信息
equOrderEquSpareMapper.insertEquOrderEquSpare(spareTemp);
spareList.add(spareTemp);
equSpareApplyMapper.insertEquSpareApply(apply);
// 减少备件仓库中备件数量
sparePartsLedgerMapper.updateSpareNumReduce(apply);
}
}

@ -182,26 +182,29 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
if (equCheckItemList.size() > 0) {
List<EquPlanDetail> detailList = new ArrayList<>();
for (EquCheckItem checkItem : equCheckItemList) {
EquPlanDetail detail = new EquPlanDetail();
BeanUtils.copyProperties(checkItem,detail);
// 只需要循环周期一致的检查项
if(checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType())) {
EquPlanDetail detail = new EquPlanDetail();
BeanUtils.copyProperties(checkItem,detail);
if (!detail.getItemCode().isEmpty()) {
itemTempName.append(detail.getItemName()).append(",");
// 获取检查项详情list
List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
if (equCheckItemList.size() > 0) {
List<EquPlanStandard> standardList = new ArrayList<>();
for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
EquPlanStandard standard = new EquPlanStandard();
BeanUtils.copyProperties(standardTemp,standard);
if (!detail.getItemCode().isEmpty()) {
itemTempName.append(detail.getItemName()).append(",");
// 获取检查项详情list
List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
if (equCheckItemList.size() > 0) {
List<EquPlanStandard> standardList = new ArrayList<>();
for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
EquPlanStandard standard = new EquPlanStandard();
BeanUtils.copyProperties(standardTemp,standard);
standard.setShowFlag(true);
standardList.add(standard);
standard.setShowFlag(true);
standardList.add(standard);
}
detail.setEquPlanStandardList(standardList);
}
detail.setEquPlanStandardList(standardList);
}
detailList.add(detail);
}
detailList.add(detail);
}
data.setEquPlanDetailList(detailList);
data.setItemTempName(itemTempName.toString());

@ -1,6 +1,7 @@
package com.op.device.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.domain.BaseFileData;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.*;
import com.op.device.domain.vo.InspectionWorkVO;
@ -36,7 +37,9 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService {
@Autowired
private EquOrderEquSpareMapper equOrderEquSpareMapper;
@Autowired
private EquOrderEquMapper equOrderEquMapper;
private EquSpareApplyMapper equSpareApplyMapper;
@Autowired
private EquFileMapper equFileMapper;
/**
*
@ -56,8 +59,16 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService {
order.setPlanName(equPlan.getPlanName());
}
// 保养图片
BaseFileData selectTemp = new BaseFileData();
selectTemp.setSourceId(orderId);
List<String> upkeepPictures = equFileMapper.selectUrlList(selectTemp);
if (upkeepPictures != null) {
order.setUpkeepPictures(upkeepPictures);
}
// 查询备件信息
List<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode());
List<EquSpareApply> spareList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode());
// 替换循环周期
order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType()));
@ -82,6 +93,14 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService {
standard.setDetailReach("达标");
}
}
// 未达标图片
selectTemp.setSourceId(standard.getId());
selectTemp.setImageType("3");
List<String> checkPictrueList = equFileMapper.selectUrlList(selectTemp);
if (checkPictrueList != null) {
standard.setCheckPictrueList(checkPictrueList);
}
}
detail.setStandardList(standardList);
}

@ -0,0 +1,67 @@
<?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.op.device.mapper.DeviceInterfaceMapper">
<select id="selectEquRepairWorkOrderList" resultType="com.op.device.domain.vo.IRepairWorkOrderVO">
select be.equipment_name AS "equipmentName",
wo.equipment_code AS "equipmentCode",
wo.work_fault_desc AS "workFaultDesc",
et.team_name AS "teamName",
wo.work_handle AS "workHandle",
wo.work_plan_time AS "workPlanTime",
be.equipment_location AS "equipmentLocation"
from equ_repair_work_order wo
left join base_equipment be
on wo.equipment_code = be.equipment_code
left join equ_team et
on wo.work_team = et.team_code
where wo.work_status = '0'
</select>
<select id="selectEquipmentList" resultType="com.op.device.domain.vo.IEquipmentVO">
select be.equipment_code AS 'equipmentCode', be.equipment_name AS 'equipmentName',be.equipment_status AS 'equipmentStatus'
from base_equipment be
where be.equipment_code in (select wo.equipment_code
from equ_repair_work_order wo
where wo.del_flag = '0'
and wo.work_status = '1'
GROUP BY wo.equipment_code)
</select>
<select id="selectRepairEquipmentList" resultType="com.op.device.domain.vo.IEquipmentVO">
select be.equipment_code AS 'equipmentCode', be.equipment_name AS 'equipmentName'
from base_equipment be
where be.equipment_code in (select wo.equipment_code
from equ_repair_work_order wo
where wo.del_flag = '0'
and wo.work_status = '1'
GROUP BY wo.equipment_code)
</select>
<select id="selectReportWorkByEquipmentCode" resultType="com.op.device.domain.MesReportWork">
select SUM(mrw.quantity) AS "quantity",
SUM(mrw.quantity_feedback) AS "quantityFeedback"
from mes_report_work mrw
where mrw.del_flag = '0'
and mrw.status = 'PREPARE'
and mrw.machine_code = #{equipmentCode}
and mrw.feedback_time >= DATEADD(MONTH, -1, GETDATE())
</select>
<select id="selectRepairRecordByEquipmentCode" resultType="com.op.device.domain.EquRepairWorkOrder">
select wo.work_start_time AS "workStartTime", wo.work_end_time AS "workEndTime"
from equ_repair_work_order wo
where wo.del_flag = '0'
and wo.equipment_code = #{equipmentCode}
and wo.work_status = '1'
</select>
<select id="getDeviceRefreshTime" resultType="java.lang.String">
select dict_value
from sys_dict_data
where dict_label = 'device_refresh_time'
</select>
</mapper>

@ -22,6 +22,7 @@
ep.work_outsourcing_unit workOutsourcingUnit,
ep.work_connection workConnection,
ep.work_reason workReason,
ep.plan_code planCode,
epe.equipment_code equipmentCode,
epe.equipment_name equipmentName,
epe.id planEquId

@ -60,7 +60,7 @@
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(detail_id)+1 AS serialNum
FROM equ_check_item_detail
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and parent_code = #{itemCode} and del_flag = '0'
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and parent_code = #{itemCode}
</select>
<select id="selectEquCheckItemDetailByParentCode" parameterType="String" resultMap="EquCheckItemDetailResult">

@ -21,10 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="itemTools" column="item_tools" />
<result property="itemLoop" column="item_loop" />
<result property="itemLoopType" column="item_loop_type" />
</resultMap>
<sql id="selectEquCheckItemVo">
select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_time, create_by, update_time, update_by from equ_check_item
select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_time, create_by, update_time, update_by ,item_tools ,item_loop,item_loop_type from equ_check_item
</sql>
<select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult">
@ -41,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
<if test="itemLoop != null and itemLoop != ''"> and item_loop = #{itemLoop}</if>
<if test="itemLoopType != null and itemLoopType != ''"> and item_loop_type = #{itemLoopType}</if>
<if test="itemTools != null and itemTools != ''"> and item_tools like concat('%', #{itemTools}, '%')</if>
<if test="createTimeStart != null "> and CONVERT(date,create_time) >= #{createTimeStart}</if>
<if test="createTimeEnd != null "> and #{createTimeEnd} >= CONVERT(date,create_time)</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
@ -65,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(item_id)+1 AS serialNum
FROM equ_check_item
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
</select>
<select id="selectAllEquipmentList" resultType="com.op.device.domain.vo.EquCheckItemVO">
@ -100,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="itemTools != null and itemTools != ''">item_tools,</if>
<if test="itemLoop != null and itemLoop != ''">item_loop,</if>
<if test="itemLoopType != null and itemLoopType != ''">item_loop_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="itemId != null">#{itemId},</if>
@ -118,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="itemTools != null and itemTools != ''">#{itemTools},</if>
<if test="itemLoop != null and itemLoop != ''">#{itemLoop},</if>
<if test="itemLoopType != null and itemLoopType != ''">#{itemLoopType},</if>
</trim>
</insert>
@ -139,6 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="itemTools != null and itemTools != ''">item_tools = #{itemTools},</if>
<if test="itemLoop != null and itemLoop != ''">item_loop = #{itemLoop},</if>
<if test="itemLoopType != null and itemLoopType != ''">item_loop_type = #{itemLoopType},</if>
</trim>
where item_id = #{itemId} and del_flag = '0'
</update>

@ -19,6 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<!--故障大类-->
<result property="dictLabel" column="dict_label"/>
<result property="dictValue" column="dict_value"/>
</resultMap>
<sql id="selectEquFaultTypeVo">
@ -56,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(fault_id)+1 AS serialNum
FROM equ_fault_type
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
</select>
<insert id="insertEquFaultType" parameterType="EquFaultType">
@ -125,4 +130,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{faultId}
</foreach>
</delete>
<select id="selectFirstLevelList" resultMap="EquFaultTypeResult">
SELECT
dict_label AS dictLabel
dict_value AS dictValue
FROM sys_dict_data
WHERE dict_type = 'device_fault_type'
</select>
</mapper>

@ -68,7 +68,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and image_type = #{imageType}
</select>
<insert id="insertEquFile" parameterType="EquFile">
<select id="selectUrlList" resultType="java.lang.String">
select file_address from base_file
<where>
<if test="imageType != null and imageType != ''"> and image_type = #{imageType}</if>
<if test="sourceId != null and sourceId != ''"> and source_id = #{sourceId}</if>
</where>
</select>
<insert id="insertEquFile" parameterType="EquFile">
insert into base_file
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fileId != null">file_id,</if>
@ -105,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<insert id="insertEquFileBatch">
INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time)
INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type)
VALUES
<foreach collection="baseFiles" index="" item="baseFile" separator=",">
(
@ -115,7 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{baseFile.sourceId},
#{baseFile.remark},
#{baseFile.createBy},
#{baseFile.createTime}
#{baseFile.createTime},
#{baseFile.imageType}
)
</foreach>
</insert>

@ -50,7 +50,7 @@
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(id)+1 AS serialNum
FROM equ_item_equipment
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
</select>
<select id="selectEquipmentCodeList" resultType="java.lang.String">

@ -0,0 +1,182 @@
<?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.op.device.mapper.EquOperationRecordMapper">
<resultMap type="EquOperationRecord" id="EquOperationRecordResult">
<result property="id" column="id"/>
<result property="equipmentCode" column="equipment_code"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="type" column="type"/>
<result property="maintenanceType" column="maintenance_type"/>
<result property="parentId" column="parent_id"/>
<result property="factoryCode" column="factory_code"/>
<result property="attr1" column="attr1"/>
<result property="attr2" column="attr2"/>
<result property="attr3" column="attr3"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<sql id="selectEquOperationRecordVo">
select id,
equipment_code,
start_time,
end_time,
type,
maintenance_type,
parent_id,
factory_code,
attr1,
attr2,
attr3,
del_flag,
create_by,
create_time,
update_by,
update_time
from equ_operation_record
</sql>
<select id="selectEquOperationRecordList" parameterType="EquOperationRecord" resultMap="EquOperationRecordResult">
<include refid="selectEquOperationRecordVo"/>
<where>
<if test="equipmentCode != null and equipmentCode != ''">and equipment_code = #{equipmentCode}</if>
<if test="startTime != null ">and start_time = #{startTime}</if>
<if test="endTime != null ">and end_time = #{endTime}</if>
<if test="type != null and type != ''">and type = #{type}</if>
<if test="maintenanceType != null and maintenanceType != ''">and maintenance_type = #{maintenanceType}</if>
<if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if>
<if test="attr1 != null and attr1 != ''">and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''">and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''">and attr3 = #{attr3}</if>
</where>
</select>
<select id="selectEquOperationRecordById" parameterType="String" resultMap="EquOperationRecordResult">
<include refid="selectEquOperationRecordVo"/>
where id = #{id}
</select>
<select id="selectEquOperationRecordByEquipmentCode" resultType="com.op.device.domain.EquOperationRecord">
select eor.start_time AS "startTime",
eor.end_time AS "endTime",
eor.maintenance_type AS "maintenanceType",
eor.type AS "type"
from equ_operation_record eor
where eor.del_flag = '0'
and eor.end_time is not null
and eor.equipment_code = #{equipmentCode}
</select>
<insert id="insertEquOperationRecord" parameterType="EquOperationRecord">
insert into equ_operation_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="equipmentCode != null">equipment_code,</if>
<if test="startTime != null">start_time,</if>
<if test="endTime != null">end_time,</if>
<if test="type != null">type,</if>
<if test="maintenanceType != null">maintenance_type,</if>
<if test="parentId != null">parent_id,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="delFlag != null">del_flag,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="equipmentCode != null">#{equipmentCode},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
<if test="type != null">#{type},</if>
<if test="maintenanceType != null">#{maintenanceType},</if>
<if test="parentId != null">#{parentId},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateEquOperationRecord" parameterType="EquOperationRecord">
update equ_operation_record
<trim prefix="SET" suffixOverrides=",">
<if test="equipmentCode != null">equipment_code = #{equipmentCode},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="type != null">type = #{type},</if>
<if test="maintenanceType != null">maintenance_type = #{maintenanceType},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEquOperationRecordById" parameterType="String">
delete
from equ_operation_record
where id = #{id}
</delete>
<delete id="deleteEquOperationRecordByIds" parameterType="String">
delete from equ_operation_record where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!--设备稳定性 MTBF-->
<select id="getMTBFList" parameterType="EquOperationRecord" resultType="com.op.device.domain.EquOperationRecord">
select
row_number() over (ORDER BY sum(CASE WHEN eor.type = 'on' THEN cast(datediff(minute, eor.start_time,eor.end_time)*1.0/60 as decimal(10,2)) ELSE null END )/sum(CASE WHEN type = 'off' THEN 1 ELSE 0 END) DESC) AS serialNumber,
eor.equipment_code AS equipmentCode,
sum(CASE WHEN eor.type = 'on' THEN cast(datediff(minute, eor.start_time,eor.end_time)*1.0/60 as decimal(10,2)) ELSE null END ) AS onTime,
sum(CASE WHEN eor.type = 'off' THEN 1 ELSE 0 END) AS shutDownNumber,
cast(sum(CASE WHEN eor.type = 'on' THEN datediff(minute, eor.start_time,eor.end_time)*1.0/60 ELSE null END )/sum(CASE WHEN type = 'off' THEN 1 ELSE 0 END)as decimal(10,2)) as mtbf
from equ_operation_record eor
left join base_equipment be on eor.equipment_code = be.equipment_code
where be.status = '1'
and be.del_flag = '0'
and eor.start_time is not null
and eor.end_time is not null
GROUP BY eor.equipment_code
ORDER BY onTime desc
</select>
<!--完好设备占比-->
<select id="getEquipmentIntactRate" parameterType="EquOperationRecord" resultType="com.op.device.domain.EquOperationRecord">
SELECT
SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END) AS operationEquipment,
SUM(CASE WHEN equipment_status = '0' or equipment_status = '0' THEN 1 Else 0 END) AS faultEquipment,
COUNT(*) AS totalEquipment,
CONCAT(cast(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100/COUNT(*)as decimal(10,2)),'%') AS intactRate
FROM base_equipment
WHERE del_flag = '0' AND status = '1'
</select>
</mapper>

@ -23,12 +23,13 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="itemTools" column="item_tools" />
</resultMap>
<sql id="selectEquOrderDetailVo">
select id, code, order_code, parent_code, item_code, item_name, item_method,
item_type, item_type_name, factory_code, attr1, attr2, attr3, del_flag,
create_by, create_time, update_by, update_time
create_by, create_time, update_by, update_time,item_tools
from equ_order_detail
</sql>
@ -47,6 +48,7 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="itemTools != null and itemTools != ''"> and item_tools = #{itemTools}</if>
and del_flag = '0'
</where>
</select>
@ -87,6 +89,7 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="itemTools != null">item_tools,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -107,6 +110,7 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="itemTools != null">#{itemTools},</if>
</trim>
</insert>
<insert id="insertEquOrderDetails">
@ -115,7 +119,7 @@
id, order_code,
item_code, item_name, item_method,
item_type, item_type_name, factory_code, del_flag,
create_by, create_time
create_by, create_time,item_tools
)
VALUES
<foreach collection="list" index="index" item="item" separator=",">
@ -123,7 +127,7 @@
#{item.id},#{item.parentCode},
#{item.itemCode},#{item.itemName},#{item.itemMethod},
#{item.itemType},#{item.itemTypeName},#{item.factoryCode},#{item.delFlag},
#{item.createBy},#{item.createTime}
#{item.createBy},#{item.createTime},#{itemTools}
)
</foreach>
@ -141,6 +145,7 @@
<if test="itemType != null">item_type = #{itemType},</if>
<if test="itemTypeName != null">item_type_name = #{itemTypeName},</if>
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="itemTools != null and itemTools != ''">item_tools = #{itemTools},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
@ -163,4 +168,13 @@
#{id}
</foreach>
</delete>
<delete id="delEquOrderDetailByorderIds" parameterType="String">
update equ_order_detail set del_flag = '1' where del_flag = '0' and order_code in ( select order_code from
equ_order where del_flag = '0' and order_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
)
</delete>
</mapper>

@ -105,6 +105,7 @@
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insertEquOrderEquSpares">
insert into equ_order_equ_spare(
id, order_code, material_code, material_desc,

@ -40,6 +40,7 @@
<result property="repairCode" column="repair_code" />
<result property="workCode" column="work_code" />
<result property="id" column="id" />
<result property="itemName" column="item_name" />
<result property="itemMethod" column="item_method" />
<result property="itemType" column="item_type" />
@ -127,7 +128,7 @@
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(order_id)+1 AS serialNum
FROM equ_order
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
</select>
<select id="changeLoopType" resultType="java.lang.String">
@ -136,7 +137,7 @@
<select id="selectTodayTask" parameterType="String" resultMap="EquOrderResult">
<include refid="selectEquOrderVo"/>
where CONVERT(date,GETDATE()) > plan_loop_start and plan_type = #{planType} and del_flag = '0' and order_status != '1' and order_code in (
where CONVERT(date,GETDATE()) >= plan_loop_start and plan_type = #{planType} and del_flag = '0' and order_status != '1' and order_code in (
select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
)
</select>
@ -285,24 +286,76 @@
</foreach>
</delete>
<!-- 手持维修查询检查项-->
<select id="selectEquOrderDetailsList" parameterType="EquOrder" resultMap="EquOrderResult">
<delete id="delEquOrderByOrderIds">
update equ_order set del_flag = '1' where order_id in
<foreach item="orderId" collection="array" open="(" separator="," close=")">
#{orderId}
</foreach>
</delete>
<!-- 手持维修查询检查项-->
<select id="selectCheckListByWorkCode" parameterType="EquOrder" resultMap="EquOrderResult">
select
eo.order_id,
eo.order_code,
eo.repair_code,
eo.work_code,
eod.id,
eod.item_name,
eod.item_method,
eod.item_type,
eod.item_type_name
from equ_order eo
left join equ_order_detail eod on eo.order_code = eod.order_code
<where>
<if test="workCode != null "> and eo.work_code = #{workCode}</if>
<if test="repairCode != null "> and eo.repair_code = #{repairCode}</if>
and eo.del_flag = '0'
</where>
where eo.work_code = #{workCode}
and eo.del_flag = '0'
</select>
<!-- 手持报修查询检查项-->
<select id="selectCheckListByRepairCode" parameterType="EquOrder" resultMap="EquOrderResult">
select
eo.order_id,
eo.order_code,
eo.repair_code,
eo.work_code,
eod.id,
eod.item_name,
eod.item_method,
eod.item_type,
eod.item_type_name
from equ_order eo
left join equ_order_detail eod on eo.order_code = eod.order_code
where eo.repair_code = #{repairCode}
and eo.del_flag = '0'
</select>
<!-- 查询对应检查项id-->
<select id="getIdsByOrderCode" parameterType="EquOrder" resultType="java.lang.String">
select
order_id
from equ_order
where repair_code = #{orderCode}
and del_flag = '0'
</select>
<!-- 更新维修单号 -->
<update id="updateEquOrderRepairCode" parameterType="EquOrder">
update equ_order
<trim prefix="SET" suffixOverrides=",">
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="workCode != null">work_code = #{workCode},</if>
</trim>
where order_id = #{orderId}
</update>
<update id="updateEquOrderStatusComplete" parameterType="String">
update equ_order
set
order_status = '1'
where order_code = #{repairCode}
and del_flag = '0'
</update>
</mapper>

@ -127,4 +127,15 @@
#{id}
</foreach>
</delete>
<delete id="delEquOrderPersonByorderIds" parameterType="String">
update equ_order_person
set del_flag = '1'
where del_flag = '0' and order_code in (
select order_code from equ_order where del_flag = '0' and order_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
)
</delete>
</mapper>

@ -209,6 +209,17 @@
where id = #{id} and del_flag = '0'
</update>
<update id="updateActualValues" parameterType="EquOrderStandard">
update equ_order_standard
<trim prefix="SET" suffixOverrides=",">
<if test="repairReach != null">repair_reach = #{repairReach},</if>
<if test="repairValue != null">repair_value = #{repairValue},</if>
<if test="repairPicture != null">repair_picture = #{repairPicture},</if>
</trim>
where id = #{id}
and del_flag = '0'
</update>
<delete id="deleteEquOrderStandardById" parameterType="String">
delete from equ_order_standard where id = #{id}
</delete>
@ -223,23 +234,21 @@
<!--手持查询维修工单接口 /PC查询点检巡检信息接口-->
<select id="selectPdaEquOrderList" parameterType="EquOrderStandard" resultMap="EquOrderStandardResult">
select
eos.id,
eos.order_code,
eos.standard_name,
eod.item_method,
eos.detail_up_limit,
eos.detail_down_limit,
eos.detail_unit,
eos.detail_reach,
eos.actual_value,
eos.standard_type
eos.id,
eos.order_code,
eos.standard_name,
eos.detail_up_limit,
eos.detail_down_limit,
eos.detail_unit,
eos.detail_reach,
eos.actual_value,
eos.standard_type,
eos.repair_reach,
eos.repair_value
from equ_order_standard eos
left join equ_order eo on eos.order_code = eo.order_code
<where>
<if test="orderCode != null "> and eo.order_code = #{orderCode}</if>
and eo.del_flag = '0'
and eos.error_flag = '1'
</where>
where parent_code = #{parentCode}
and order_code = #{orderCode}
and eos.detail_reach = '0'
</select>
<insert id="insertBaseFileBatch">
@ -263,9 +272,31 @@
delete from base_file where source_id = #{sourceId}
</delete>
<delete id="delEquOrderStandardByorderIds" parameterType="String">
update equ_order_standard set del_flag = '1'
where del_flag = '0' and order_code in (
select order_code from equ_order where del_flag = '0' and order_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
)
</delete>
<select id="getBaseFileBatch" resultMap="BaseFileResult">
<include refid="selectBaseFileVo"/>
where source_id = #{sourceId}
</select>
<update id="updateStandardAfterRepair" parameterType="EquOrderStandard">
update equ_order_standard
<trim prefix="SET" suffixOverrides=",">
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="repairReach != null">repair_reach = #{repairReach},</if>
<if test="repairValue != null">repair_value = #{repairValue},</if>
</trim>
where id = #{id}
and del_flag = '0'
</update>
</mapper>

@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="equipmentCode" column="equipment_code" />
<result property="workCost" column="work_cost" />
<result property="workCostTime" column="work_cost_time" />
<result property="workStatus" column="work_status" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEquOutsourceWorkVo">
select work_id, work_code,order_code, repair_code, work_person, work_outsourcing_unit, work_connection, work_reason, work_type, equipment_code, work_cost, work_cost_time, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_outsource_work
select work_id, work_code,order_code, repair_code, work_person, work_outsourcing_unit, work_connection, work_reason, work_type, equipment_code, work_cost, work_cost_time,work_status, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_outsource_work
</sql>
<select id="selectEquOutsourceWorkList" parameterType="EquOutsourceWork" resultMap="EquOutsourceWorkResult">
@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
eow.equipment_code,
eow.work_cost,
eow.work_cost_time,
eow.work_status,
eow.attr1,
eow.attr2,
eow.attr3,
@ -79,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workType != null and workType != ''"> and work_type = #{workType}</if>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
<if test="workCost != null and workCost != ''"> and work_cost like concat('%', #{workCost}, '%')</if>
<if test="workCostTime != null and workCostTime != ''"> and work_cost_time = #{workCostTime}</if>
<if test="workCostTime != null and workCostTime != ''"> and work_cost_time like concat('%', #{workCostTime}, '%')</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="equipmentCode != null">equipment_code,</if>
<if test="workCost != null">work_cost,</if>
<if test="workCostTime != null">work_cost_time,</if>
<if test="workStatus != null">work_status,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
@ -134,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="equipmentCode != null">#{equipmentCode},</if>
<if test="workCost != null">#{workCost},</if>
<if test="workCostTime != null">#{workCostTime},</if>
<if test="workStatus != null">#{workStatus},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
@ -160,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="equipmentCode != null">equipment_code = #{equipmentCode},</if>
<if test="workCost != null">work_cost = #{workCost},</if>
<if test="workCostTime != null">work_cost_time = #{workCostTime},</if>
<if test="workStatus != null">work_status = #{workStatus},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
@ -180,6 +185,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where work_id = #{workId}
</delete>
<delete id="deleteEquOutsourceWorkByRepairCode" parameterType="String">
delete from equ_outsource_work
where repair_code = #{workCode}
</delete>
<delete id="deleteEquOutsourceWorkByWorkIds" parameterType="String">
update equ_outsource_work
set del_flag = '1'
@ -189,10 +199,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<!--流水单号-->
<select id="selectWorkCodeSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(work_id)+1 AS serialNum
FROM equ_outsource_work
where del_flag = '0'
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
</select>
</mapper>

@ -25,12 +25,13 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="itemTools" column="item_tools" />
</resultMap>
<sql id="selectEquPlanDetailVo">
select id, code, plan_id,plan_code, parent_code, item_code, item_name, item_method, item_type,
item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag,
create_by, create_time, update_by, update_time
create_by, create_time, update_by, update_time,item_tools
from equ_plan_detail
</sql>
@ -51,6 +52,7 @@
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="itemTools != null and itemTools != ''"> and item_tools = #{itemTools}</if>
and del_flag = '0'
</where>
ORDER BY item_name
@ -94,6 +96,7 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="itemTools != null">item_tools,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -116,6 +119,7 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="itemTools != null">#{itemTools},</if>
</trim>
</insert>
@ -141,6 +145,7 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="itemTools != null">item_tools = #{itemTools},</if>
</trim>
where id = #{id} and del_flag = '0'
</update>

@ -97,7 +97,7 @@
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(plan_id)+1 AS serialNum
FROM equ_plan
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
</select>
<select id="selectWorkCenter" resultType="com.op.device.domain.WorkCenter">

@ -46,6 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="workOutsourcingUnit" column="work_outsourcing_unit" />
<result property="workConnection" column="work_connection" />
<result property="outSourceReason" column="work_reason" />
<!-- 检查项信息 -->
</resultMap>
<resultMap type="com.op.common.core.domain.BaseFileData" id="BaseFileResult">
@ -81,9 +84,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderCode != null and orderCode != ''"> and order_code like concat('%', #{orderCode}, '%')</if>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
<if test="orderDesc != null and orderDesc != ''"> and order_desc like concat('%', #{orderDesc}, '%')</if>
<if test="orderBreakdownTime != null "> and order_breakdown_time = #{orderBreakdownTime}</if>
<!--故障开始时间 结束时间-->
<if test="orderBreakdownTimeStart != null "> and CONVERT(date,order_breakdown_time) >= #{orderBreakdownTimeStart}</if>
<if test="orderBreakdownTimeEnd != null "> and #{orderBreakdownTimeEnd} >= CONVERT(date,order_breakdown_time)</if>
<if test="orderSource != null and orderSource != ''"> and order_source like concat('%', #{orderSource}, '%')</if>
<if test="orderTime != null "> and order_time = #{orderTime}</if>
<!--报修开始时间 结束时间-->
<if test="orderTimeStart != null "> and CONVERT(date,order_time) >= #{orderTimeStart}</if>
<if test="orderTimeEnd != null "> and #{orderTimeEnd} >= CONVERT(date,order_time)</if>
<if test="orderHandle != null and orderHandle != ''"> and order_handle = #{orderHandle}</if>
<if test="orderRepairmanCode != null and orderRepairmanCode != ''"> and order_repairman_code like concat('%', #{orderRepairmanCode}, '%')</if>
<if test="orderRepairmanName != null and orderRepairmanName != ''"> and order_repairman_name like concat('%', #{orderRepairmanName}, '%')</if>
@ -254,11 +261,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from equ_repair_order where order_code = #{repairCode} and del_flag = '0'
</delete>
<!--流水单号-->
<select id="selectOrderCodeSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(order_id)+1 AS serialNum
FROM equ_repair_order
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
and del_flag = '0'
</select>
<select id="getRepairPersonList" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
@ -266,9 +273,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
user_id AS userId,
user_name AS userName,
nick_name AS nickName,
CONCAT(nick_name,user_name) AS teamUserName
CONCAT(nick_name,user_name) AS teamUserName,
phonenumber AS phonenumber
from sys_user
where del_flag = '0'
<where>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="nickName != null and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
and del_flag = '0'
</where>
</select>
<select id="getRepairPhoneNumber" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
select
user_id AS userId,
user_name AS userName,
nick_name AS nickName,
CONCAT(nick_name,user_name) AS teamUserName,
phonenumber AS phoneNumber
from sys_user
where user_name = #{userName}
and del_flag = '0'
</select>
<select id="selectEquRepairOrderByRepairCode" parameterType="String" resultMap="EquRepairOrderResult">

@ -23,6 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="workFaultDesc" column="work_fault_desc" />
<result property="workStartTime" column="work_start_time" />
<result property="workEndTime" column="work_end_time" />
<result property="actualDownStartTime" column="actual_down_start_time" />
<result property="actualDownEndTime" column="actual_down_end_time" />
<result property="workConnection" column="work_connection" />
<result property="workCostTime" column="work_cost_time" />
<result property="workCost" column="work_cost" />
<result property="workStatus" column="work_status" />
@ -103,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.work_fault_desc,
erwo.work_start_time,
erwo.work_end_time,
erwo.actual_down_start_time,
erwo.actual_down_end_time,
erwo.work_connection,
erwo.work_cost_time,
erwo.work_cost,
erwo.work_status,
@ -178,6 +184,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.work_fault_desc,
erwo.work_start_time,
erwo.work_end_time,
erwo.actual_down_start_time,
erwo.actual_down_end_time,
erwo.work_connection,
erwo.work_cost_time,
erwo.work_cost,
erwo.work_status,
@ -223,6 +232,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.work_fault_desc,
erwo.work_start_time,
erwo.work_end_time,
erwo.actual_down_start_time,
erwo.actual_down_end_time,
erwo.work_connection,
erwo.work_cost_time,
erwo.work_cost,
erwo.work_status,
@ -251,7 +263,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ero.order_connection,
eow.work_person AS outSourcePerson,
eow.work_outsourcing_unit AS workOutsourcingUnit,
eow.work_connection AS workConnection,
eow.work_connection AS outSourceConnection,
eow.work_reason AS outSourceReason
from equ_repair_work_order erwo
left join base_equipment be on erwo.equipment_code = be.equipment_code
@ -282,6 +294,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workFaultDesc != null">work_fault_desc,</if>
<if test="workStartTime != null">work_start_time,</if>
<if test="workEndTime != null">work_end_time,</if>
<if test="actualDownStartTime != null">actual_down_start_time,</if>
<if test="actualDownEndTime != null">actual_down_end_time,</if>
<if test="workConnection != null">work_connection,</if>
<if test="workCostTime != null">work_cost_time,</if>
<if test="workCost != null">work_cost,</if>
<if test="workStatus != null">work_status,</if>
@ -315,6 +330,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workFaultDesc != null">#{workFaultDesc},</if>
<if test="workStartTime != null">#{workStartTime},</if>
<if test="workEndTime != null">#{workEndTime},</if>
<if test="actualDownStartTime != null">#{actualDownStartTime},</if>
<if test="actualDownEndTime != null">#{actualDownEndTime},</if>
<if test="workConnection != null">#{workConnection},</if>
<if test="workCostTime != null">#{workCostTime},</if>
<if test="workCost != null">#{workCost},</if>
<if test="workStatus != null">#{workStatus},</if>
@ -351,6 +369,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workFaultDesc != null">work_fault_desc = #{workFaultDesc},</if>
<if test="workStartTime != null">work_start_time = #{workStartTime},</if>
<if test="workEndTime != null">work_end_time = #{workEndTime},</if>
<if test="actualDownStartTime != null">actual_down_start_time = #{actualDownStartTime},</if>
<if test="actualDownEndTime != null">actual_down_end_time = #{actualDownEndTime},</if>
<if test="workConnection != null">work_connection = #{workConnection},</if>
<if test="workCostTime != null">work_cost_time = #{workCostTime},</if>
<if test="workCost != null">work_cost = #{workCost},</if>
<if test="workStatus != null">work_status = #{workStatus},</if>
@ -396,10 +417,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<!--流水单号-->
<select id="selectWorkCodeSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(work_id)+1 AS serialNum
FROM equ_repair_work_order
where del_flag = '0'
</select>
<select id="getMaintenancePersonList" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
@ -426,7 +447,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where source_id = #{sourceId}
</select>
<insert id="insertBaseFileBatch">
<select id="selectEquRepairWorkOrderByWorkCode" parameterType="EquRepairWorkOrder" resultMap="EquRepairWorkOrderResult">
<include refid="selectEquRepairWorkOrderVo"/>
where work_code = #{workCode} and del_flag = '0'
</select>
<insert id="insertBaseFileBatch">
INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type)
VALUES
<foreach collection="baseFiles" index="" item="baseFile" separator=",">
@ -443,4 +469,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</insert>
<update id="updateWorkStatus" parameterType="EquRepairWorkOrder">
update equ_repair_work_order
set
work_status = '1'
where work_code = #{repairCode}
and del_flag = '0'
</update>
</mapper>

@ -28,7 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="factoryCode" column="factory_code" />
</resultMap>
<sql id="selectEquSpareApplyVo">
@ -167,6 +166,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<delete id="delEquSpareApplyByorderIds" parameterType="String">
update equ_spare_apply set del_flag = '1' where del_flag = '0' and work_code in ( select order_code from
equ_order where del_flag = '0' and order_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
)
</delete>
<delete id="delEquSpareApplyByIds" parameterType="String">
update equ_spare_apply set del_flag = '1'
where apply_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="delEquSpareApplyByApplyId" parameterType="String">
update equ_spare_apply set del_flag = '1' where apply_id = #{id}
</delete>
<select id="selectRepairSparePartsRecord" parameterType="EquRepairWorkOrder" resultMap="EquSpareApplyResult">
<include refid="selectEquSpareApplyVo"/>
<where>
@ -176,4 +196,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY apply_time DESC
</select>
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(apply_id)+1 AS serialNum
FROM equ_spare_apply
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
</select>
<select id="selectEquSpareApplyListByWorkCode" parameterType="String" resultMap="EquSpareApplyResult">
<include refid="selectEquSpareApplyVo"/>
where work_code = #{orderCode} and del_flag = '0'
</select>
</mapper>

@ -129,4 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where del_flag = '0'
</select>
<select id="selectTeamMember" parameterType="EquTeamUser" resultType="com.op.device.domain.EquTeamUser">
select
user_id AS userId,
user_name AS userName,
nick_name AS nickName,
CONCAT(nick_name,user_name) AS teamUserName
from sys_user
where del_flag = '0'
and user_id = #{userId}
</select>
</mapper>

@ -21,13 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectEquTeamUserList" parameterType="EquTeamUser" resultMap="EquTeamUserResult">
<include refid="selectEquTeamUserVo"/>
<where>
<if test="teamId != null and teamId != ''"> and team_id = #{teamId}</if>
<if test="teamCode != null and teamCode != ''"> and team_code = #{teamCode}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
</where>
select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time from equ_team_user
where team_id = #{teamId}
</select>
<select id="selectEquTeamUserById" parameterType="String" resultMap="EquTeamUserResult">
@ -76,10 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</update>
<delete id="deleteEquTeamUserById" parameterType="String">
delete from equ_team_user where id = #{id}
</delete>
<delete id="deleteEquTeamUserByTeamId" parameterType="String">
delete from equ_team_user where team_id = #{teamId}
</delete>

@ -280,6 +280,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where storage_id = #{storageId}
</update>
<update id="updateSpareNumReduce">
update wms_ods_mate_storage_news
set amount = ( amount - #{spareQuantity} ) where material_code = #{spareCode}
</update>
<update id="updateSpareNumAdd">
update wms_ods_mate_storage_news
set amount = ( amount + #{spareQuantity} ) where material_code = #{spareCode}
</update>
<delete id="deleteSparePartsLedgerByStorageId" parameterType="String">
delete from wms_ods_mate_storage_news where storage_id = #{storageId}
</delete>

@ -0,0 +1,51 @@
package com.op.energy.base.config;
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
import com.op.common.core.domain.R;
import com.op.common.datasource.creator.DynamicDatasourceCreator;
import com.op.system.api.RemoteUserService;
import com.op.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
*
*
* @ClassName: DynamicDatasource
* @Description: TODO
* @author shichangzhou
* @date 2023419 1:01:30
*/
@Component
public class DynamicDatasource {
@Resource
private DynamicDatasourceCreator dynamicDatasourceCreator;
@Autowired
private RemoteUserService remoteUserService;
@PostConstruct
public void init() {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
List<Map<String, String>> dateSources = dateSources0.getData();
for (Map<String, String> dateSource : dateSources) {
DataSourceProperty sdp = new DataSourceProperty();
sdp.setUrl(dateSource.get("url"));
sdp.setUsername(dateSource.get("userName"));
sdp.setPassword(dateSource.get("password"));
sdp.setDriverClassName(dateSource.get("driveClassName"));
sdp.setPoolName(dateSource.get("poolName"));// 这是数据源的key
sdp.setLazy(false);
dynamicDatasourceCreator.createDynamicDataSource(sdp);
}
}
}

@ -0,0 +1,101 @@
package com.op.energy.base.controller;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.energy.base.domain.BaseBuildInfo;
import com.op.energy.base.domain.Ztree;
import com.op.energy.base.service.IBaseBuildInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* Controller
*
* @author YinQ
* @date 2023-05-05
*/
@RestController
@RequestMapping("/buildInfo")
public class BaseBuildInfoController extends BaseController {
@Autowired
private IBaseBuildInfoService baseBuildInfoService;
/**
*
*/
@RequiresPermissions("base:buildInfo:list")
@GetMapping("/list")
public AjaxResult list(BaseBuildInfo baseBuildInfo) {
List<BaseBuildInfo> list = baseBuildInfoService.selectBaseBuildInfoList(baseBuildInfo);
return success(list);
}
/**
*
*/
@RequiresPermissions("base:buildInfo:export")
@Log(title = "建筑信息管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseBuildInfo baseBuildInfo) {
List<BaseBuildInfo> list = baseBuildInfoService.selectBaseBuildInfoList(baseBuildInfo);
ExcelUtil<BaseBuildInfo> util = new ExcelUtil<BaseBuildInfo>(BaseBuildInfo.class);
util.exportExcel(response, list, "建筑信息管理数据");
}
/**
*
*/
@RequiresPermissions("base:buildInfo:query")
@GetMapping(value = "/{objid}")
public AjaxResult getInfo(@PathVariable("objid") Long objid) {
return success(baseBuildInfoService.selectBaseBuildInfoByObjid(objid));
}
/**
*
*/
@RequiresPermissions("base:buildInfo:add")
@Log(title = "建筑信息管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseBuildInfo baseBuildInfo) {
return toAjax(baseBuildInfoService.insertBaseBuildInfo(baseBuildInfo));
}
/**
*
*/
@RequiresPermissions("base:buildInfo:edit")
@Log(title = "建筑信息管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseBuildInfo baseBuildInfo) {
return toAjax(baseBuildInfoService.updateBaseBuildInfo(baseBuildInfo));
}
/**
*
*/
@RequiresPermissions("base:buildInfo:remove")
@Log(title = "建筑信息管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{objids}")
public AjaxResult remove(@PathVariable Long[] objids) {
return toAjax(baseBuildInfoService.deleteBaseBuildInfoByObjids(objids));
}
/**
*
*/
@GetMapping("/treeData")
@ResponseBody
public List<Ztree> treeData() {
List<Ztree> ztrees = baseBuildInfoService.selectBaseBuildInfoTree();
return ztrees;
}
}

@ -0,0 +1,100 @@
package com.op.energy.base.controller;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.energy.base.domain.BaseBusinessType;
import com.op.energy.base.domain.Ztree;
import com.op.energy.base.service.IBaseBusinessTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* Controller
*
* @author YinQ
* @date 2023-05-05
*/
@RestController
@RequestMapping("/businessType")
public class BaseBusinessTypeController extends BaseController {
@Autowired
private IBaseBusinessTypeService baseBusinessTypeService;
/**
*
*/
@RequiresPermissions("base:businessType:list")
@GetMapping("/list")
public AjaxResult list(BaseBusinessType baseBusinessType) {
List<BaseBusinessType> list = baseBusinessTypeService.selectBaseBusinessTypeList(baseBusinessType);
return success(list);
}
/**
*
*/
@RequiresPermissions("base:businessType:export")
@Log(title = "业态类型管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseBusinessType baseBusinessType) {
List<BaseBusinessType> list = baseBusinessTypeService.selectBaseBusinessTypeList(baseBusinessType);
ExcelUtil<BaseBusinessType> util = new ExcelUtil<BaseBusinessType>(BaseBusinessType.class);
util.exportExcel(response, list, "业态类型管理数据");
}
/**
*
*/
@RequiresPermissions("base:businessType:query")
@GetMapping(value = "/{objid}")
public AjaxResult getInfo(@PathVariable("objid") Long objid) {
return success(baseBusinessTypeService.selectBaseBusinessTypeByObjid(objid));
}
/**
*
*/
@RequiresPermissions("base:businessType:add")
@Log(title = "业态类型管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseBusinessType baseBusinessType) {
return toAjax(baseBusinessTypeService.insertBaseBusinessType(baseBusinessType));
}
/**
*
*/
@RequiresPermissions("base:businessType:edit")
@Log(title = "业态类型管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseBusinessType baseBusinessType) {
return toAjax(baseBusinessTypeService.updateBaseBusinessType(baseBusinessType));
}
/**
*
*/
@RequiresPermissions("base:businessType:remove")
@Log(title = "业态类型管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{objids}")
public AjaxResult remove(@PathVariable Long[] objids) {
return toAjax(baseBusinessTypeService.deleteBaseBusinessTypeByObjids(objids));
}
/**
*
*/
@GetMapping("/treeData")
@ResponseBody
public List<Ztree> treeData() {
List<Ztree> ztrees = baseBusinessTypeService.selectBaseBusinessTypeTree();
return ztrees;
}
}

@ -0,0 +1,91 @@
package com.op.energy.base.controller;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.web.page.TableDataInfo;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.energy.base.domain.BaseCollectCommunicate;
import com.op.energy.base.service.IBaseCollectCommunicateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* Controller
*
* @author sf
* @date 2023-04-20
*/
@RestController
@RequestMapping("/communicate")
public class BaseCollectCommunicateController extends BaseController {
@Autowired
private IBaseCollectCommunicateService baseCollectCommunicateService;
/**
*
*/
@RequiresPermissions("energy:communicate:list")
@GetMapping("/list")
public TableDataInfo list(BaseCollectCommunicate baseCollectCommunicate) {
startPage();
List<BaseCollectCommunicate> list = baseCollectCommunicateService.selectBaseCollectCommunicateList(baseCollectCommunicate);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("energy:communicate:export")
@Log(title = "集中器通讯信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseCollectCommunicate baseCollectCommunicate) {
List<BaseCollectCommunicate> list = baseCollectCommunicateService.selectBaseCollectCommunicateList(baseCollectCommunicate);
ExcelUtil<BaseCollectCommunicate> util = new ExcelUtil<BaseCollectCommunicate>(BaseCollectCommunicate.class);
util.exportExcel(response, list, "集中器通讯信息数据");
}
/**
*
*/
@RequiresPermissions("energy:communicate:query")
@GetMapping(value = "/{objid}")
public AjaxResult getInfo(@PathVariable("objid") Long objid) {
return success(baseCollectCommunicateService.selectBaseCollectCommunicateByObjid(objid));
}
/**
*
*/
@RequiresPermissions("energy:communicate:add")
@Log(title = "集中器通讯信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseCollectCommunicate baseCollectCommunicate) {
return toAjax(baseCollectCommunicateService.insertBaseCollectCommunicate(baseCollectCommunicate));
}
/**
*
*/
@RequiresPermissions("energy:communicate:edit")
@Log(title = "集中器通讯信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseCollectCommunicate baseCollectCommunicate) {
return toAjax(baseCollectCommunicateService.updateBaseCollectCommunicate(baseCollectCommunicate));
}
/**
*
*/
@RequiresPermissions("energy:communicate:remove")
@Log(title = "集中器通讯信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{objids}")
public AjaxResult remove(@PathVariable Long[] objids) {
return toAjax(baseCollectCommunicateService.deleteBaseCollectCommunicateByObjids(objids));
}
}

@ -0,0 +1,91 @@
package com.op.energy.base.controller;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.web.page.TableDataInfo;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.energy.base.domain.BaseCollectDeviceInfo;
import com.op.energy.base.service.IBaseCollectDeviceInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* Controller
*
* @author sf
* @date 2023-04-20
*/
@RestController
@RequestMapping("/info")
public class BaseCollectDeviceInfoController extends BaseController {
@Autowired
private IBaseCollectDeviceInfoService baseCollectDeviceInfoService;
/**
*
*/
@RequiresPermissions("energy:info:list")
@GetMapping("/list")
public TableDataInfo list(BaseCollectDeviceInfo baseCollectDeviceInfo) {
startPage();
List<BaseCollectDeviceInfo> list = baseCollectDeviceInfoService.selectBaseCollectDeviceInfoList(baseCollectDeviceInfo);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("energy:info:export")
@Log(title = "采集设备信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseCollectDeviceInfo baseCollectDeviceInfo) {
List<BaseCollectDeviceInfo> list = baseCollectDeviceInfoService.selectBaseCollectDeviceInfoList(baseCollectDeviceInfo);
ExcelUtil<BaseCollectDeviceInfo> util = new ExcelUtil<BaseCollectDeviceInfo>(BaseCollectDeviceInfo.class);
util.exportExcel(response, list, "采集设备信息数据");
}
/**
*
*/
@RequiresPermissions("energy:info:query")
@GetMapping(value = "/{objid}")
public AjaxResult getInfo(@PathVariable("objid") Long objid) {
return success(baseCollectDeviceInfoService.selectBaseCollectDeviceInfoByObjid(objid));
}
/**
*
*/
@RequiresPermissions("energy:info:add")
@Log(title = "采集设备信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseCollectDeviceInfo baseCollectDeviceInfo) {
return toAjax(baseCollectDeviceInfoService.insertBaseCollectDeviceInfo(baseCollectDeviceInfo));
}
/**
*
*/
@RequiresPermissions("energy:info:edit")
@Log(title = "采集设备信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseCollectDeviceInfo baseCollectDeviceInfo) {
return toAjax(baseCollectDeviceInfoService.updateBaseCollectDeviceInfo(baseCollectDeviceInfo));
}
/**
*
*/
@RequiresPermissions("energy:info:remove")
@Log(title = "采集设备信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{objids}")
public AjaxResult remove(@PathVariable Long[] objids) {
return toAjax(baseCollectDeviceInfoService.deleteBaseCollectDeviceInfoByObjids(objids));
}
}

@ -0,0 +1,100 @@
package com.op.energy.base.controller;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.web.page.TableDataInfo;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.energy.base.domain.BaseDnbThreshold;
import com.op.energy.base.domain.BaseMonitorInfo;
import com.op.energy.base.service.IBaseDnbThresholdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* Controller
*
* @author sf
* @date 2023-04-20
*/
@RestController
@RequestMapping("/dnbThreshold")
public class BaseDnbThresholdController extends BaseController {
@Autowired
private IBaseDnbThresholdService baseDnbThresholdService;
/**
*
*/
@RequiresPermissions("energy:dnbThreshold:list")
@GetMapping("/list")
public TableDataInfo list(BaseDnbThreshold baseDnbThreshold) {
startPage();
List<BaseDnbThreshold> list = baseDnbThresholdService.selectBaseDnbThresholdList(baseDnbThreshold);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("energy:dnbThreshold:export")
@Log(title = "电阈值信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseDnbThreshold baseDnbThreshold) {
List<BaseDnbThreshold> list = baseDnbThresholdService.selectBaseDnbThresholdList(baseDnbThreshold);
ExcelUtil<BaseDnbThreshold> util = new ExcelUtil<BaseDnbThreshold>(BaseDnbThreshold.class);
util.exportExcel(response, list, "电阈值信息数据");
}
/**
*
*/
@RequiresPermissions("energy:dnbThreshold:query")
@GetMapping(value = "/{objid}")
public AjaxResult getInfo(@PathVariable("objid") Long objid) {
return success(baseDnbThresholdService.selectBaseDnbThresholdByObjid(objid));
}
/**
*
*/
@RequiresPermissions("energy:dnbThreshold:add")
@Log(title = "电阈值信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseDnbThreshold baseDnbThreshold) {
return toAjax(baseDnbThresholdService.insertBaseDnbThreshold(baseDnbThreshold));
}
/**
*
*/
@RequiresPermissions("energy:dnbThreshold:edit")
@Log(title = "电阈值信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseDnbThreshold baseDnbThreshold) {
return toAjax(baseDnbThresholdService.updateBaseDnbThreshold(baseDnbThreshold));
}
/**
*
*/
@RequiresPermissions("energy:dnbThreshold:remove")
@Log(title = "电阈值信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{objids}")
public AjaxResult remove(@PathVariable Long[] objids) {
return toAjax(baseDnbThresholdService.deleteBaseDnbThresholdByObjids(objids));
}
/**
*
*/
@GetMapping("/monitorTree")
public AjaxResult monitorTree(BaseMonitorInfo baseMonitorInfo) {
return success(baseDnbThresholdService.selectMonitorTreeList(baseMonitorInfo));
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save