显示所有部件数据

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

@@ -52,10 +52,10 @@ public class EquipmentDetail extends BaseEntity {
 	@Excel(name = "所属分系统id", orderNum = "4")
 	private Long manufacturerId;
 
-	@TableField("maintenance_cycle")
+	@TableField("supplier_id")
 	@ApiModelProperty(value = "工作时间")
 	//@Excel(name = "工作时间", orderNum = "5")
-	private BigDecimal maintenanceCycle;
+	private String supplierId;
 
 	@TableField("standard")
 	@ApiModelProperty(value = "部件型号")
@@ -99,6 +99,11 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "装备定义名称")
 	private String equipmentName;
 
+
+	@TableField("maintenance_cycle")
+	@ApiModelProperty(value = "保养周期")
+	private BigDecimal maintenanceCycle;
+
 	@TableField(exist = false)
 	private Equipment equipment;
 
@@ -137,10 +142,6 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "是否进口")
 	private Boolean isImport;
 
-	@TableField("supplier_id")
-	@ApiModelProperty(value = "供应商id")
-	private String supplierId;
-
 	@TableField(exist = false)
 	private List<UploadFile> img;
 	
@@ -178,4 +179,6 @@ public class EquipmentDetail extends BaseEntity {
 	@TableField(exist = false)
 	private String unitName;
 
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -165,6 +165,9 @@ public class EquipmentDetailController extends AbstractBaseController {
         return equipmentPar;
     }
 
+
+
+
     /***
      *
      * 根id查询
@@ -328,6 +331,8 @@ public class EquipmentDetailController extends AbstractBaseController {
 
     }
 
+
+
     /**
      * 列表分页查询
      *
@@ -396,6 +401,53 @@ public class EquipmentDetailController extends AbstractBaseController {
     }
 
     /**
+     * 列表分页查询
+     *
+     * @return
+     */
+    @RequestMapping(value = "/listEqu", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<EquipmentPar> listEqu(String pageNum, String pageSize, EquipmentPar equipmentPar) {
+
+        Page<EquipmentPar> pageBean;
+        QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
+        Class<? extends EquipmentPar> aClass = equipmentPar.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(equipmentPar);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(equipmentPar);
+                        equipmentDetailQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(equipmentPar);
+                        equipmentDetailQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(equipmentPar);
+                        equipmentDetailQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(equipmentPar);
+                        equipmentDetailQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        IPage<EquipmentPar> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iEquipmentDetailService.getEqur(pageBean,equipmentPar);
+        return page;
+    }
+
+    /**
      * <pre>
      * 装备补码操作
      * </pre>

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

@@ -23,6 +23,11 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
 	List<EquipmentDetail> page(@Param("offset") long offset, @Param("size") long size,
 			@Param("equip") EquipmentDetail equipmentDetail);
 
+	List<EquipmentPar> pagequ(@Param("offset") long offset, @Param("size") long size,
+							   @Param("equip") EquipmentPar equipmentPar);
+
+
+	int countequ(@Param("equip") EquipmentPar equipmentPar);
 	int count(@Param("equip") EquipmentDetail equipmentDetail);
 
 	List<EquipmentDetail> pageCategory(@Param("offset") long offset, @Param("size") long size,

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

@@ -35,5 +35,6 @@ public interface IEquipmentDetailService extends IService<EquipmentDetail> {
 
 	String checkDelete( List<Long> ids);
 
-	List<EquipmentPar> getEqur();
+	Page<EquipmentPar> getEqur(Page<EquipmentPar> pageBean, EquipmentPar equipmentPar);
+//	List<EquipmentPar> getEqur();
 }

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

@@ -258,11 +258,19 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
     }
 
 
-    @Override
-    public List<EquipmentPar> getEqur() {
-        return equipmentDetailMapper.equpar();
+//    @Override
+//    public List<EquipmentPar> getEqur() {
+//        return equipmentDetailMapper.equpar();
+    public Page<EquipmentPar> getEqur(Page<EquipmentPar> pageBean, EquipmentPar equipmentPar) {
+        List<EquipmentPar> list = equipmentDetailMapper.pagequ(pageBean.offset(), pageBean.getSize(), equipmentPar);
+        int count = equipmentDetailMapper.countequ(equipmentPar);
+        pageBean.setRecords(list);
+        pageBean.setTotal(count);
+        return pageBean;
     }
 
+
+
     @Override
     public String checkDelete(List<Long> ids) {
         String res = "";

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

@@ -68,6 +68,36 @@
 		LIMIT #{offset},#{size}
 	</select>
 
+	<select id="pagequ"
+			resultMap="EquipmentDetailMap">
+		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,
+		wec.name
+		FROM
+		wl_equipment_detail wled
+		LEFT JOIN
+		wl_equipment_params	wlun ON wlun.code =
+		wled.code
+		LEFT JOIN
+		wl_equipment_category wec ON wec.id =
+		wled.manufacturer_id
+		ORDER BY wled.id DESC
+		LIMIT #{offset},#{size}
+	</select>
+
 	<select id="equpar" resultMap="EquipmentDetailMap">
 	SELECT
 	wled.name,
@@ -115,6 +145,18 @@
 		</where>
 	</select>
 
+	<select id="countequ" resultType="Integer">
+		SELECT
+		COUNT(1)
+		FROM
+		wl_equipment_detail wed
+		LEFT JOIN wl_equipment_params we ON
+		we.code =
+		wed.code
+		LEFT JOIN wl_equipment_category wec ON wec.id =
+		wed.manufacturer_id
+	</select>
+
 	<select id="pageCategory"
 		resultType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
 		SELECT