Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

 package com.yeejoin.equipmanage.common.entity;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 /**
- * 
+ *
  *
  * @author wujiang
  * @date 2020-07-07
@@ -40,7 +39,7 @@ public class EquipmentDetail extends BaseEntity {
 	@TableField("equipment_id")
 	@ApiModelProperty(value = "装备定义id")
 	private Long equipmentId;
-	
+
 	@TableField("equipment_name")
 	@ApiModelProperty(value = "装备定义名称")
 	private String equipmentName;
@@ -97,6 +96,10 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "生产日期")
 	private Date productionDate;
 
+	@TableField("delivery_date")
+	@ApiModelProperty(value = "投运日期")
+	private Date deliveryDate;
+
 	@TableField("perf_quota_str")
 	@ApiModelProperty(value = "核心参数")
 	private String perfQuotaStr;
@@ -120,16 +123,16 @@ public class EquipmentDetail extends BaseEntity {
 	@TableField("supplier_id")
 	@ApiModelProperty(value = "供应商id")
 	private String supplierId;
-	
+
 	@TableField(exist = false)
 	private List<UploadFile> img;
-	
+
 	@TableField(exist = false)
 	private List<UploadFile> video;
 
 	@TableField(exist = false)
 	private List<UploadFile> certification;
-	
+
 	@TableField(exist = false)
 	private List<UploadFile> instruction;
 
@@ -151,7 +154,7 @@ public class EquipmentDetail extends BaseEntity {
 	@TableField("department_name")
 	@ApiModelProperty(value = "部门名")
 	private String departmentName;
-	
+
 	@TableField(exist = false)
 	private String countryName;
 

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

+package com.yeejoin.equipmanage.common.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author lisong
+ * @date 2022-08-08.
+ */
+@Data
+public class EquipmentExportVO {
+
+    @ExcelProperty(value = "编码", index = 0)
+    private String code = "";
+    @ExcelProperty(value = "存储（安装）区域", index = 1)
+    private String location = "";
+    @ExcelProperty(value = "名称", index = 2)
+    private String name = "";
+    @ExcelProperty(value = "生产日期", index = 3)
+    private String productionDate = "";
+    @ExcelProperty(value = "报废年限", index = 4)
+    private String validityPeriod = "";
+    @ExcelProperty(value = "维保周期", index = 5)
+    private String maintenanceCycle = "";
+    @ExcelProperty(value = "投运时间", index = 6)
+    private String operationTime = "";
+    @ExcelProperty(value = "生产厂商", index = 7)
+    private String manufacturer = "";
+    @ExcelProperty(value = "规格型号", index = 8)
+    private String standard = "";
+    @ExcelProperty(value = "品牌", index = 9)
+    private String brand = "";
+    @ExcelProperty(value = "器材分类", index = 10)
+    private String classification = "";
+    @ExcelProperty(value = "所属系统", index = 11)
+    private String systemName = "";
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -600,7 +600,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
 		//处理循环中的远程调用（原有逻辑不变）
 		List<String> amosIds = new ArrayList<>();
-		list.stream().forEach(t -> {
+		list.forEach(t -> {
 			// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm
 			// 2021-09-16
 			if (null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString())) {

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

 package com.yeejoin.equipmanage.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.yeejoin.equipmanage.common.entity.*;
-import com.yeejoin.equipmanage.common.entity.dto.RequestBaseDto;
-import com.yeejoin.equipmanage.common.utils.SpringUtils;
-import com.yeejoin.equipmanage.fegin.JcsFeign;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.http.MediaType;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
+import com.yeejoin.equipmanage.common.entity.EquProperty;
+import com.yeejoin.equipmanage.common.entity.Equipment;
+import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
+import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
+import com.yeejoin.equipmanage.common.entity.ManufacturerInfo;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
+import com.yeejoin.equipmanage.common.entity.dto.RequestBaseDto;
 import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentExportVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
 import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
@@ -56,6 +33,7 @@ import com.yeejoin.equipmanage.common.vo.FireFightingSystemTreeVo;
 import com.yeejoin.equipmanage.common.vo.FireFightingSystemTypeTreeVo;
 import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
 import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
+import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
@@ -69,10 +47,38 @@ import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import com.yeejoin.equipmanage.service.IFireFightingSystemService;
 import com.yeejoin.equipmanage.service.IManufacturerInfoService;
 import com.yeejoin.equipmanage.service.IUploadFileService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.http.MediaType;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author zjw
@@ -826,6 +832,24 @@ public class FireFightingSystemController extends AbstractBaseController {
         return fireFightingSystemService.iotgetEquipmentTypeAndCount(bizOrgCode);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "装备信息导出", notes = "装备信息导出")
+    @PostMapping(value = "/downParameter")
+    public void export(HttpServletResponse response, EquipTypeAmountPageDTO dto) {
+        List<EquipmentExportVO> list = fireFightingSystemMapper.exportEquipmentList(dto);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (EquipmentExportVO vo : list) {
+                if (!ObjectUtils.isEmpty(vo.getProductionDate())) {
+                    vo.setProductionDate(vo.getProductionDate().substring(0, 10));
+                }
+                if (!ObjectUtils.isEmpty(vo.getOperationTime())) {
+                    vo.setOperationTime(vo.getOperationTime().substring(0, 10));
+                }
+            }
+        }
+        ExcelUtil.createTemplate(response, "装备信息", "装备信息", list, EquipmentExportVO.class, null, false);
+    }
+
 
 
 

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

@@ -363,4 +363,12 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      * @return
      */
     List<Map<String, Object>> getPressurePumpInfo3Small(@Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode);
+
+    /**
+     * 装备导出列表查询
+     *
+     * @param dto
+     * @return
+     */
+    List<EquipmentExportVO> exportEquipmentList(@Param("dto") EquipTypeAmountPageDTO dto);
 }

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

@@ -1604,6 +1604,7 @@
         wes.id,
         wes.name,
         wes.position,
+        wes.code,
         wes.equipment_code equipmentCode,
         wes.realtime_iot_index_name realtimeIotIndexName,
         wes.realtime_iot_index_key realtimeIotIndexKey,

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

@@ -2561,4 +2561,89 @@
             ed.`code` LIKE '92010800%'
           AND biz_org_code = #{bizOrgCode}
     </select>
+    <select id="exportEquipmentList" resultType="com.yeejoin.equipmanage.common.entity.vo.EquipmentExportVO">
+              SELECT
+          wesp.`code` ,
+          wws.full_name location,
+          wesp.`name`,
+          ed.production_date,
+          ed.maintenance_cycle AS maintenanceCycle,
+          ed.expiry_date AS validityPeriod,
+          mi.`name` AS manufacturer,
+          ed.standard,
+          ed.brand,
+          eq.`name`AS classification,
+          ed.delivery_date AS   operationTime,
+
+          (
+            SELECT
+              GROUP_CONCAT(fem.`name`)
+            FROM
+              `f_fire_fighting_system` fem
+            WHERE
+              find_in_set(fem.id, wesp.system_id)
+          ) AS system_name
+        FROM
+          wl_equipment_specific wesp
+        LEFT JOIN wl_equipment_detail ed ON ed.id = wesp.equipment_detail_id
+        LEFT JOIN wl_equipment eq ON eq.id = ed.equipment_id
+        LEFT JOIN wl_manufacturer_info mi ON mi.id = ed.manufacturer_id
+        LEFT JOIN wl_stock_detail wsd ON wsd.equipment_specific_id = wesp.id
+        LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id
+
+        <where>
+
+        <if test="dto.code!=null and dto.code!=''">
+            and wesp.code = #{dto.code}
+        </if>
+
+        <if test="dto.equipmentName!=null and dto.equipmentName!=''">
+            and wesp.`name` LIKE CONCAT('%', #{dto.equipmentName},'%')
+        </if>
+        <if test="dto.iotCode!=null and dto.iotCode!=''">
+            and  wesp.iot_code LIKE CONCAT('%', #{dto.iotCode},'%')
+        </if>
+
+        <if test="dto.warehouseStructureName!=null and dto.warehouseStructureName!=''">
+            and  wws.full_name LIKE CONCAT('%', #{dto.warehouseStructureName},'%')
+        </if>
+
+        <if test="dto.isIot!=null and dto.isIot!=''">
+            and eq.is_iot = #{dto.isIot}
+        </if>
+
+         <if test="dto.manufacturerId!=null and dto.manufacturerId!=''">
+            and  mi.id = #{dto.manufacturerId}
+        </if>
+
+        <if test="dto.status == 1">
+            and wsd.warehouse_structure_id is null
+        </if>
+
+        <if test="dto.status == 0">
+            and wsd.warehouse_structure_id is not null
+        </if>
+
+        <if test="dto.teamId!=null and dto.teamId!=''">
+            and wesp.team_id = #{dto.teamId}
+        </if>
+
+        <if test="dto.systemId!=null and dto.systemId!=''">
+            and wesp.system_id = #{dto.systemId}
+        </if>
+
+        <if test="dto.warehouseStructureId!=null and dto.warehouseStructureId!=''">
+            and wws.id  = #{dto.warehouseStructureId}
+        </if>
+        <if test="dto.isImport!=null">
+            and wled.is_import = #{dto.isImport}
+        </if>
+
+        <if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
+            and wesp.biz_org_code =  #{dto.bizOrgCode}
+        </if>
+     </where>
+
+
+    </select>
 </mapper>