查询全部部件数据

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java

@@ -38,69 +38,70 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "编码")
 	private String code;
 
-	@TableField("equipment_id")
-	@ApiModelProperty(value = "装备定义id")
-	private Long equipmentId;
-	
-	@TableField("equipment_name")
-	@ApiModelProperty(value = "装备定义名称")
-	private String equipmentName;
-
-	@TableField(exist = false)
-	private Equipment equipment;
-
-	@TableField(exist = false)
-	private String categoryName;
 
 	@TableField("remark")
-	@ApiModelProperty(value = "备注")
+	@ApiModelProperty(value = "生产厂家")
 	private String remark;
 
-	@TableField("creator_id")
-	@ApiModelProperty(value = "创建人id")
-	private Long creatorId;
-
 	@TableField("manufacturer_id")
-	@ApiModelProperty(value = "生产厂商id")
+	@ApiModelProperty(value = "所属分系统id")
 	private Long manufacturerId;
 
-	@TableField(exist = false)
-	private String manufacturerName;
-
-	@TableField(exist = false)
-	private ManufacturerInfo manufacturerInfo;
+	@TableField("maintenance_cycle")
+	@ApiModelProperty(value = "工作时间")
+	private BigDecimal maintenanceCycle;
 
 	@TableField("standard")
-	@ApiModelProperty(value = "规格")
+	@ApiModelProperty(value = "部件型号")
 	private String standard;
 
-	@TableField("maintenance_cycle")
-	@ApiModelProperty(value = "保养周期")
-	private BigDecimal maintenanceCycle;
-
+	@TableField("brand")
+	@ApiModelProperty(value = "所属单位")
+	private String brand;
 
 	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField("production_date")
+	@ApiModelProperty(value = "出厂日期")
+	private Date productionDate;
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@TableField("update_date")
-	@ApiModelProperty(value = "更新时间")
+	@ApiModelProperty(value = "入库时间")
 	private Date updateDate;
 
+	@TableField("area")
+	@ApiModelProperty(value = "存放位置")
+	private String area;
+
+
 	@TableField("agent")
 	@ApiModelProperty(value = "代理商")
 	private String agent;
 
-	@TableField("brand")
-	@ApiModelProperty(value = "品牌")
-	private String brand;
+	@TableField("creator_id")
+	@ApiModelProperty(value = "创建人id")
+	private Long creatorId;
+	@TableField("equipment_id")
+	@ApiModelProperty(value = "装备定义id")
+	private Long equipmentId;
+
+	@TableField("equipment_name")
+	@ApiModelProperty(value = "装备定义名称")
+	private String equipmentName;
+
+	@TableField(exist = false)
+	private Equipment equipment;
+
+	@TableField(exist = false)
+	private String categoryName;
+
+	@TableField(exist = false)
+	private ManufacturerInfo manufacturerInfo;
 
 	@TableField("contract_code")
 	@ApiModelProperty(value = "合同编号")
 	private String contractCode;
 
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@TableField("production_date")
-	@ApiModelProperty(value = "生产日期")
-	private Date productionDate;
-
 	@TableField("perf_quota_str")
 	@ApiModelProperty(value = "核心参数")
 	private String perfQuotaStr;
@@ -162,9 +163,12 @@ public class EquipmentDetail extends BaseEntity {
 	@TableField(exist = false)
 	private String unitName;
 
+	@TableField(exist = false)
+	private String manufacturerName;
+
+
+
+
 
-	@TableField("area")
-	@ApiModelProperty(value = "位置信息")
-	private String area;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentDetailMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.mapper;
 import java.util.List;
 
 import com.yeejoin.equipmanage.common.entity.EquProperty;
+import com.yeejoin.equipmanage.common.vo.EquipmentPar;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -30,6 +31,7 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
 	int countCategory(@Param("offset") long offset, @Param("size") long size,
 			@Param("list") List<EquipmentCategory> list);
 
+	EquipmentPar equpar();
 
 	int quotaUpdate(EquProperty e);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentDetailService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.EquProperty;
 import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
+import com.yeejoin.equipmanage.common.vo.EquipmentPar;
 
 import java.util.List;
 
@@ -33,4 +34,6 @@ public interface IEquipmentDetailService extends IService<EquipmentDetail> {
 	String getPref(String id);
 
 	String checkDelete( List<Long> ids);
+
+	EquipmentPar getEqur();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.enums.BillContentEnum;
 import com.yeejoin.equipmanage.common.enums.FileTypeEnum;
+import com.yeejoin.equipmanage.common.vo.EquipmentPar;
 import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -256,6 +257,12 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         return equipmentDetailMapper.getPref(id);
     }
 
+
+    @Override
+    public EquipmentPar getEqur() {
+        return equipmentDetailMapper.equpar();
+    }
+
     @Override
     public String checkDelete(List<Long> ids) {
         String res = "";

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -37,10 +37,10 @@ spring.redis.expire.time=300
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.11.201:1883
+emqx.broker=tcp://172.16.3.156:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
+mqtt.scene.host=mqtt://172.16.3.156:18083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000

amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml

@@ -49,6 +49,28 @@
 		LIMIT #{offset},#{size}
 	</select>
 
+	<select id="equpar" resultType="com.yeejoin.equipmanage.common.vo.EquipmentPar">
+	SELECT
+	wled.name,
+	wled.code,
+	wled.remark,
+	wled.manufacturer_id,
+	wled.maintenance_cycle,
+	wled.standard,
+	wled.brand,
+	wled.production_date,
+	wled.update_date,
+	wled.create_date,
+	wled.area,
+	wlun.status,
+	wlun.reason,
+	wlun.measure
+	FROM wl_equipment_detail wled
+	LEFT JOIN wl_equipment_params wlun ON wled.code = wlun.code
+	LEFT JOIN wl_equipment_category wec ON wled.manufacturer_id = wec.id
+	ORDER BY
+	wled.create_date DESC
+	</select>
 	<select id="count" resultType="Integer">
 		SELECT
 		COUNT(1)