更新分页接口

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;
@@ -627,15 +624,26 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/fire/equip/list")
     @ApiOperation(httpMethod = "GET", value = "根据装备分类code获取装备list", notes = "根据装备分类code获取装备list")
-    public List<Map<String, Object>> getFireEquipListByDefineCode(@RequestParam(value = "code") String code){
-        ReginParams reginParams = JSONObject.parseObject(redisUtils
-                        .get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
-                ReginParams.class);
-        String bizOrgCode = null;
-        if (reginParams != null && reginParams.getCompany() !=null && !org.apache.commons.lang3.ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
-            bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+    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 equipmentSpecificMapper.getFireEquipListByDefineCode(bizOrgCode, code);
+        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/EquipmentSpecificMapper.java

@@ -338,7 +338,9 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     List<Map<String, Object>> getFireEquipStatistic(@Param("bizOrgCode") String bizOrgCode);
 
-    List<Map<String, Object>> getFireEquipListByDefineCode(@Param("bizOrgCode") String bizOrgCode, @Param("code") String code);
+    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/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/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/EquipmentSpecificMapper.xml

@@ -2926,6 +2926,7 @@
             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
@@ -2935,6 +2936,29 @@
             <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>