微型消防站增加接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationDto.java

@@ -82,5 +82,14 @@ public class FireStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
+    
+    @ApiModelProperty(value = "战备装备数量")
+    private Integer eqNum;
+    
+    @ApiModelProperty(value = "战备人数量")
+    private Integer userNum;
+    
+    @ApiModelProperty(value = "战备车辆数量")
+    private Integer carNum;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -10,5 +18,21 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @date 2021-06-28
 */
 public interface FireStationMapper extends BaseMapper<FireStation> {
+	
+	
+	
+	@Select("<script>"
+			+ "select * from  cb_fire_station  where cb_fire_station.is_delete=0 "
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'{par.postQualification}'%' </if>"			
+			+"limit  #{pageNum},#{pageSize}"
+			+ "</script>")	
+	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+	@Select("<script>"
+			+ "select COUNT(cb_fire_station.sequence_nbr) num from  cb_fire_station  where cb_fire_station.is_delete=0 "
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'{par.postQualification}'%' </if>"
+			
+			+"limit  #{pageNum},#{pageSize}"
+			+ "</script>")	
+	 Map<String, Long> getFireStationCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireStationService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 
 /**
 * 微型消防站接口类
@@ -8,5 +15,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-06-28
 */
 public interface IFireStationService {
+	Page<FireStationDto> getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+	
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersMapper.java

@@ -42,7 +42,6 @@ List<Firefighters>getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize"
 + "<if test='par.state!=null'>" + "and a.state_code= #{par.state}" + "</if>"
 + "<if test='par.fireTeamId!=null'>" + "and a.fire_team_id= #{par.fireTeamId}" + "</if>"
 + "<if test='par.jobTitle!=null'>" + "and a.job_title_code= #{par.jobTitle}" + "</if>"
-+"limit 0,#{pageSize}"
 + "</script>")	 
 Map<String, Long>getFirefightersCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersListVo par);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireStationController.java

@@ -64,7 +64,7 @@ public class FireStationController extends BaseController {
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除微型消防站", notes = "根据sequenceNbr删除微型消防站")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(fireStationServiceImpl.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(fireStationServiceImpl.updateisDelete(sequenceNbr));
     }
     /**
              * 根据sequenceNbr查询
@@ -79,7 +79,7 @@ public class FireStationController extends BaseController {
 	    return ResponseHelper.buildResponse(fireStationServiceImpl.queryBySeq(sequenceNbr));
 	}
 	/**
-             * 列表分页查询
+    * 列表分页查询
     *@param current 当前页
     *@param current 每页大小
     * @return
@@ -94,6 +94,22 @@ public class FireStationController extends BaseController {
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page));
 	}
+	
+	/**
+	    * 新列表分页查询
+	    *@param current 当前页
+	    *@param current 每页大小
+	    * @return
+	    */
+		@TycloudOperation(ApiLevel = UserType.AGENCY)
+		@GetMapping(value = "/list/page")
+		@ApiOperation(httpMethod = "GET",value = "新微型消防站分页查询",  notes = "新微型消防站分页查询")
+		public ResponseModel<Page<FireStationDto>> getFireStation(@RequestParam(value = "pageNum") int pageNum,@RequestParam(value = "pageSize") int pageSize, FireStationDto fireStationDto)
+		{			
+			return ResponseHelper.buildResponse(fireStationServiceImpl.getFirefighters(pageNum, pageSize, fireStationDto));
+		}
+	
+	
 	/**
 	*列表全部数据查询
 	*@return

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

@@ -5,9 +5,13 @@ import com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
+import java.util.Map;
 /**
 * 微型消防站服务实现类
 *
@@ -16,6 +20,9 @@ import java.util.List;
 */
 @Service
 public class FireStationServiceImpl extends BaseService<FireStationDto,FireStation,FireStationMapper> implements IFireStationService {
+	
+	 @Autowired
+	 FireStationMapper fireStationMapper;
         /**
                             * 分页查询
          */
@@ -29,4 +36,23 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
         public List<FireStationDto> queryForFireStationList()   {
                 return this.queryForList("" , false);
         }
+        /**
+         * 删除
+         * */
+        public Boolean updateisDelete( Long sequenceNbr)   {
+        	
+        	return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));         	
+    }
+
+		@Override
+		public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {			
+		    List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
+		    Map<String, Long> num = fireStationMapper.getFireStationCount((pageNum - 1) * pageSize, pageSize, par);
+		    Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+		    return   pageBean.setRecords(list);
+		}
+
+		
+
+		
 }