Merge remote-tracking branch 'origin/develop_dl' into develop_dl

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

@@ -240,4 +240,13 @@ public class Car extends BaseEntity {
 
 	@TableField(exist = false)
 	private Double monthTravel;
+
+	@TableField(exist = false)
+	private Integer pageNum;
+
+	@TableField(exist = false)
+	private Integer pageSize;
+
+	@TableField(exist = false)
+	private String equipStatusFilter;
 }

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

@@ -1599,4 +1599,18 @@ public class CarController extends AbstractBaseController {
 		return iCarService.getTankAndFireCarNum(code);
 	}
 
+
+	/**
+	 * 卡片列表分页查询API
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/carListByPage", method = RequestMethod.POST)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST", value = "卡片列表分页查询API", notes = "卡片列表分页查询API")
+	public Page<Map<String, String>> carListByPage(@RequestBody Car car) {
+		Page<Map<String, String>> carListByPage = iCarService.carListByPage(car, new Page<>(car.getPageNum(), car.getPageSize()));
+		return carListByPage;
+	}
+
 }

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

@@ -9,10 +9,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
-import com.yeejoin.equipmanage.common.entity.EquipQrcodeRecord;
-import com.yeejoin.equipmanage.common.entity.Equipment;
-import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.dto.SourceNameListDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
@@ -624,4 +621,29 @@ public class EquipmentSpecificController extends AbstractBaseController {
         return equipmentSpecificMapper.getFireEquipStatistic(bizOrgCode);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/fire/equip/list")
+    @ApiOperation(httpMethod = "GET", value = "根据装备分类code获取装备list", notes = "根据装备分类code获取装备list")
+    public IPage<Map<String, Object>> getFireEquipListByDefineCode(@RequestParam(value = "code") String code,
+                                                                         @RequestParam(value = "equipStatus") String equipStatus,
+                                                                         @RequestParam(value = "bizOrgCode") String bizOrgCode,
+                                                                         @RequestParam(value = "pageNum") String pageNum,
+                                                                         @RequestParam(value = "pageSize") String pageSize){
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = JSONObject.parseObject(redisUtils
+                            .get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
+                    ReginParams.class);
+            if (reginParams != null && reginParams.getCompany() !=null && !org.apache.commons.lang3.ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
+                bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+            }
+        }
+        Page<Map<String, Object>> pageBean;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        return equipmentSpecificSerivce.getFireEquipListByDefineCode(code, equipStatus, bizOrgCode, pageBean);
+    }
+
 }

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

 package com.yeejoin.equipmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.equipmanage.common.entity.Car;
 import com.yeejoin.equipmanage.common.entity.CarProperty;
 import com.yeejoin.equipmanage.common.entity.vo.CarIndexVo;
 import com.yeejoin.equipmanage.common.entity.vo.CarPropertyVo;
@@ -40,4 +42,6 @@ public interface CarPropertyMapper extends BaseMapper<CarProperty> {
     List<Map<String, String>> selectIndexByTime(String carStartIndexKey);
 
     List<Map<String, String>> getTankAndFireCarNum(@Param("bizOrgCode") String bizOrgCode);
+
+    Page<Map<String, String>> carListByPage(@Param("page")Page<Car> page, @Param("dto") Car car);
 }

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

@@ -338,6 +338,10 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     List<Map<String, Object>> getFireEquipStatistic(@Param("bizOrgCode") String bizOrgCode);
 
+    List<Map<String, Object>> getFireEquipListByDefineCode(@Param("offset") long offset, @Param("size") long size, @Param("bizOrgCode") String bizOrgCode, @Param("code") String code, @Param("equipStatus") String equipStatus);
+
+    int count(@Param("bizOrgCode") String bizOrgCode, @Param("code") String code, @Param("equipStatus") String equipStatus);
+
     Integer selectEquipmentCountBySystemId(@Param("systemId") Long systemId);
 
 }

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

@@ -216,4 +216,5 @@ public interface ICarService extends IService<Car> {
 
     List<Map<String, String>> getTankAndFireCarNum(String bizOrgCode);
 
+    Page<Map<String, String>> carListByPage(Car car, Page<Car> objectPage);
 }

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

@@ -10,14 +10,16 @@ import com.yeejoin.equipmanage.common.datasync.vo.FireEquipmentVO;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.FireFightingSystemDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
+import com.yeejoin.equipmanage.common.entity.Car;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.vo.*;
-import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -324,6 +326,6 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
 
     List<Map<String, Object>> getZJScrapStatics(String bizOrgCode);
 
-
+    Page<Map<String, Object>> getFireEquipListByDefineCode(String code, String equipStatus, String bizOrgCode, Page<Map<String, Object>> pageBean);
 
 }

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

@@ -1839,6 +1839,11 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
 		return carPropertyMapper.getTankAndFireCarNum(bizOrgCode);
 	}
 
+	@Override
+	public Page<Map<String, String>> carListByPage(Car car, Page<Car> page) {
+		return carPropertyMapper.carListByPage(page, car);
+	}
+
 	class LossParams {
 		private Long carId;
 

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

@@ -2223,5 +2223,13 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         return equipmentSpecificMapper.getZJScrapStatics(bizOrgCode);
     }
 
+    @Override
+    public Page<Map<String, Object>> getFireEquipListByDefineCode(String code, String equipStatus, String bizOrgCode, Page<Map<String, Object>> pageBean) {
+        List<Map<String, Object>> list = equipmentSpecificMapper.getFireEquipListByDefineCode(pageBean.offset(), pageBean.getSize(), bizOrgCode, code, equipStatus);
+        int count = equipmentSpecificMapper.count(bizOrgCode, code, equipStatus);
+        pageBean.setRecords(list);
+        pageBean.setTotal(count);
+        return pageBean;
+    }
 
 }

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

@@ -118,7 +118,8 @@
                     '消防车' AS `name`,
                     count( 1 ) AS `value`,
                     '辆' AS unit,
-                    IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '21010000', '%' ) LIMIT 1 ), '') AS icon
+                    IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '21010000', '%' ) LIMIT 1 ), '') AS icon,
+                    '2101' as code
                 FROM
                     `wl_car` wc
                         LEFT JOIN wl_equipment we ON we.`id` = wc.equipment_id
@@ -133,7 +134,8 @@
                     '消防坦克' AS `name`,
                     count( 1 ) AS `value`,
                     '辆' AS unit,
-                    IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '21030000', '%' ) LIMIT 1 ), '') AS icon
+                    IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '21030000', '%' ) LIMIT 1 ), '') AS icon,
+                    '2103' as code
                 FROM
                     `wl_car` wc
                     LEFT JOIN wl_equipment we ON we.`id` = wc.equipment_id
@@ -146,4 +148,29 @@
             ) a
     </select>
 
+    <select id="carListByPage" resultType="java.util.Map">
+        SELECT
+        wc.`name` AS `name`,
+        wc.biz_org_code AS bizOrgCode,
+        wc.biz_org_name AS bizOrgName,
+        wec.`name` AS categoryName,
+        wc.equip_status AS equipStatus,
+        wc.id AS id,
+        wec.`code` AS `code`
+        FROM
+        wl_car wc
+        LEFT JOIN wl_equipment we ON we.`id` = wc.equipment_id
+        LEFT JOIN wl_equipment_category wec ON wec.id = we.category_id
+        <where>
+            <if test="dto.bizOrgCode != null and dto.bizOrgCode != ''">
+                AND wc.biz_org_code like concat (#{dto.bizOrgCode},'%')
+            </if>
+            <if test="dto.code != null and dto.code != ''">
+                AND wec.code like concat (#{dto.code},'%')
+            </if>
+            <if test="dto.equipStatusFilter != null and dto.equipStatusFilter != ''">
+                AND wc.equip_status = #{dto.equipStatusFilter}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -2905,14 +2905,14 @@
     <select id="getFireEquipStatistic" resultType="Map">
         SELECT
             a.`name` AS `name`,
+            wes.equipment_code AS `code`,
             COUNT(1) AS `value`,
             IFNULL(wu.`name`, '') AS unit,
             IFNULL(IF(a.img IS NOT NULL, a.img, a.shbz_img), '') AS icon
         FROM
             wl_equipment_specific wes
-                LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
-                LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8)) a ON a.id = wed.equipment_id
-                LEFT JOIN wl_unit wu ON wu.id = a.unit_id
+            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8)) a ON a.`code` = wes.equipment_code
+            LEFT JOIN wl_unit wu ON wu.id = a.unit_id
         WHERE
             a.`name` IS NOT NULL
             <if test="bizOrgCode != null and bizOrgCode != ''">
@@ -2922,6 +2922,50 @@
             wes.equipment_code
     </select>
 
+    <select id="getFireEquipListByDefineCode" resultType="Map">
+        SELECT
+            wes.id AS specificId,
+            a.`name` AS `typeName`,
+            wes.biz_org_name AS bizOrgName,
+            wes.biz_org_code AS bizOrgCode,
+            wes.`name` AS `name`,
+            wes.equip_status AS equipStatus
+        FROM
+            wl_equipment_specific wes
+            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8)) a ON a.`code` = wes.equipment_code
+        <where>
+            <if test="code != null and code != ''">
+                wes.equipment_code = #{code}
+            </if>
+            <if test="equipStatus != null and equipStatus != ''">
+                AND wes.equip_status = #{equipStatus}
+            </if>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND wes.biz_org_code like concat (#{bizOrgCode},'%')
+            </if>
+        </where>
+        LIMIT #{offset}, #{size}
+    </select>
+
+    <select id="count" resultType="Integer">
+        SELECT
+            count(1)
+        FROM
+        wl_equipment_specific wes
+        LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8)) a ON a.`code` = wes.equipment_code
+        <where>
+            <if test="code != null and code != ''">
+                wes.equipment_code = #{code}
+            </if>
+            <if test="equipStatus != null and equipStatus != ''">
+                AND wes.equip_status = #{equipStatus}
+            </if>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND wes.biz_org_code like concat (#{bizOrgCode},'%')
+            </if>
+        </where>
+    </select>
+
     <select id="selectEquipmentCountBySystemId" resultType="int">
         SELECT
         es.id,