删除消防队伍vo

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

@@ -7,12 +7,8 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamCardDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamListDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
-import java.util.Map;
 
 /**
 * 消防队伍 Mapper 接口
@@ -22,22 +18,22 @@ import java.util.Map;
 */
 public interface FireTeamMapper extends BaseMapper<FireTeam> {
 
-	@Select("<script>"
-	+ "select a.sequence_nbr sequenceNbr, a.img,a.name,a.contact_user contactUser,a.contact_phone contactPhone, a.address from cb_fire_team a  where a.is_delete=0"
-	+ "<if test='par.parent!=null'>" + "and a.parent= #{par.parent}" + "</if>"
-	+ "<if test='par.typeCode!=null'>" + "and a.type_code= #{par.typeCode}" + "</if>"
-	+ "<if test='par.companyCode!=null'>" + "and a.company_code= #{par.companyCode}" + "</if>"
-	+ "<if test='par.name!=null'>" + "and a.name= #{par.name}" + "</if>"
-	+ "</script>")
-	List<FireTeamVo> getFireTeam(int pageNum, int pageSize, FireTeamListVo par);
-	@Select("<script>"
-	+ "select COUNT(a.sequence_nbr) num from cb_fire_team a  where a.is_delete=0"
-	+ "<if test='par.parent!=null'>" + "and a.parent= #{par.parent}" + "</if>"
-	+ "<if test='par.typeCode!=null'>" + "and a.type_code= #{par.typeCode}" + "</if>"
-	+ "<if test='par.companyCode!=null'>" + "and a.company_code= #{par.companyCode}" + "</if>"
-	+ "<if test='par.name!=null'>" + " and a.name= #{par.name}" + "</if>"
-	+ "</script>")
-	Map<String, Long> getFireTeamCount(int pageNum, int pageSize, FireTeamListVo par);
+//	@Select("<script>"
+//	+ "select a.sequence_nbr sequenceNbr, a.img,a.name,a.contact_user contactUser,a.contact_phone contactPhone, a.address from cb_fire_team a  where a.is_delete=0"
+//	+ "<if test='par.parent!=null'>" + "and a.parent= #{par.parent}" + "</if>"
+//	+ "<if test='par.typeCode!=null'>" + "and a.type_code= #{par.typeCode}" + "</if>"
+//	+ "<if test='par.companyCode!=null'>" + "and a.company_code= #{par.companyCode}" + "</if>"
+//	+ "<if test='par.name!=null'>" + "and a.name= #{par.name}" + "</if>"
+//	+ "</script>")
+//	List<FireTeamVo> getFireTeam(int pageNum, int pageSize, FireTeamListVo par);
+//	@Select("<script>"
+//	+ "select COUNT(a.sequence_nbr) num from cb_fire_team a  where a.is_delete=0"
+//	+ "<if test='par.parent!=null'>" + "and a.parent= #{par.parent}" + "</if>"
+//	+ "<if test='par.typeCode!=null'>" + "and a.type_code= #{par.typeCode}" + "</if>"
+//	+ "<if test='par.companyCode!=null'>" + "and a.company_code= #{par.companyCode}" + "</if>"
+//	+ "<if test='par.name!=null'>" + " and a.name= #{par.name}" + "</if>"
+//	+ "</script>")
+//	Map<String, Long> getFireTeamCount(int pageNum, int pageSize, FireTeamListVo par);
 
 	/**
 	 * 返回监控大队信息列表

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireTeamService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
-
-import java.util.List;
-import java.util.Map;
-
 /**
  * 消防队伍 服务类
  *
@@ -13,8 +7,4 @@ import java.util.Map;
  * @date 2021-06-07
  */
 public interface IFireTeamService {
-	
-	List<FireTeamVo> getFireTeam(int pageNum, int pageSize, FireTeamListVo par);
-
-	Map<String, Long> getFireTeamCount(int pageNum, int pageSize, FireTeamListVo par);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FireTeamListVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class FireTeamListVo{
-
-
-    @ApiModelProperty(value = "单位名称")
-    private String name;   
-
-    @ApiModelProperty(value = "机构code")
-    private String companyCode;
-    
-    @ApiModelProperty(value = "队伍code")
-    private String typeCode;
-    
-    @ApiModelProperty(value = "父级id")
-    private Long parent;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCompanyCode() {
-		return companyCode;
-	}
-
-	public void setCompanyCode(String companyCode) {
-		this.companyCode = companyCode;
-	}
-
-	public String getTypeCode() {
-		return typeCode;
-	}
-
-	public void setTypeCode(String typeCode) {
-		this.typeCode = typeCode;
-	}
-
-	public Long getParent() {
-		return parent;
-	}
-
-	public void setParent(Long parent) {
-		this.parent = parent;
-	}
-    
-
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FireTeamVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 消防队伍
- *
- * @author tb
- * @date 2021-06-07
- */
-@Data
-@ApiModel(value = "FireTeamVo", description = "消防队伍")
-public class FireTeamVo {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "消防队伍图片")
-    private String img;
-    @ApiModelProperty(value = "队伍名称")
-    private String name;
-    @ApiModelProperty(value = "队伍类型")
-    private String type;
-    @ApiModelProperty(value = "联系人")
-    private String contactUser;
-    @ApiModelProperty(value = "联系电话")
-    private String contactPhone;
-    @ApiModelProperty(value = "队伍地址")
-    private String address;
-    @ApiModelProperty(value = "队伍id")
-    private Long sequenceNbr;
-    @ApiModelProperty(value = "队伍车数量")
-    private Double carNum = 0D;
-    @ApiModelProperty(value = "队伍装备数量")
-    private Double eqNum = 0D;
-    @ApiModelProperty(value = "出动数量")
-    private Integer dispatchNum;
-    @ApiModelProperty(value = "执勤数量")
-    private Integer onDutyNum;
-
-
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java

@@ -11,8 +11,6 @@ import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamCardDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamListDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -56,7 +54,7 @@ public class FireTeamController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防队伍", notes = "新增消防队伍")
     public ResponseModel<Object>  saveFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
@@ -70,7 +68,7 @@ public class FireTeamController extends BaseController {
      * @param id
      * @return
      */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public ResponseModel<Object>  deleteById(HttpServletRequest request, @PathVariable Long id) {
@@ -78,13 +76,12 @@ public class FireTeamController extends BaseController {
         return ResponseHelper.buildResponse(null);
     }
 
-
     /**
      * 修改消防队伍
      *
      * @return
      */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改消防队伍", notes = "修改消防队伍")
     public ResponseModel<Object> updateByIdFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
@@ -93,36 +90,22 @@ public class FireTeamController extends BaseController {
 
     }
 
-
     /**
      * 根据id查询
      *
      * @param id
      * @return
      */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ResponseModel<FireTeam> selectById(HttpServletRequest request, @PathVariable Long id) {
         return ResponseHelper.buildResponse(iFireTeamService.getById(id));
     }
 
-
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getList", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
-    public ResponseModel<Page<FireTeamVo>> getFirefighters(Integer pageNum, Integer pageSize, FireTeamListVo fireTeamList) {
-        //条件分页
-        List<FireTeamVo> list = iFireTeamService.getFireTeam(pageNum, pageSize, fireTeamList);
-        Map<String, Long> num = iFireTeamService.getFireTeamCount(pageNum, pageSize, fireTeamList);
-        Page<FireTeamVo> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
-        pageBean.setRecords(list);
-        return ResponseHelper.buildResponse(pageBean);
-    }
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/listByPage", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "卡片列表分页查询", notes = "卡片列表分页查询")
+    @RequestMapping(value = "/getList", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新列表分页查询")
     public ResponseModel<IPage<FireTeamCardDto>> getFireTeamByPage(@RequestParam Integer pageNum,
                                                                    @RequestParam Integer pageSize,
                                                                    FireTeamListDto fireTeamList) {
@@ -146,7 +129,7 @@ public class FireTeamController extends BaseController {
      * @return
      * @throws Exception
      */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/listTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "队伍树", notes = "队伍树")
     public ResponseModel<List<Menu>> listTree() throws Exception {
@@ -158,7 +141,6 @@ public class FireTeamController extends BaseController {
         return ResponseHelper.buildResponse(menus);
     }
 
-
     /**
      * 列表分页查询
      *
@@ -176,7 +158,7 @@ public class FireTeamController extends BaseController {
             try {
                 field.setAccessible(true);
                 Object o = field.get(fireTeam);
-                if (o != null) {
+                if (o != null && !"serialVersionUID".equals(field)) {
                     Class<?> type = field.getType();
                     String name = NameUtils.camel2Underline(field.getName());
                     if (type.equals(Integer.class)) {
@@ -206,20 +188,4 @@ public class FireTeamController extends BaseController {
         page = iFireTeamService.page(pageBean, fireTeamQueryWrapper);
         return page;
     }
-
-    /**
-     * 查询消防力量信息
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/list_fire_team", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "查询消防力量信息", notes = "查询消防力量信息")
-    public List<FireTeamVo> list() {
-        List<FireTeam> list = iFireTeamService.list();
-        return null;
-    }
-
-
-}
-
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -11,8 +11,6 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFireTeamService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -38,19 +36,6 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam,FireT
 	@Autowired
 	EquipFeignClient equipFeignClient;
 
-	@Override
-	public List<FireTeamVo> getFireTeam(int pageNum, int pageSize, FireTeamListVo par) {
-		// TODO Auto-generated method stub
-		return fireTeamMapper.getFireTeam( pageNum,  pageSize,  par) ;
-	}
-
-	@Override
-	public Map<String, Long> getFireTeamCount(int pageNum, int pageSize, FireTeamListVo par) {
-		// TODO Auto-generated method stub
-		return fireTeamMapper.getFireTeamCount( pageNum,  pageSize,  par) ;
-	}
-
-
 	/**
 	 * 获取监控大队列表
 	 *
@@ -60,6 +45,13 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam,FireT
 		return fireTeamMapper.listMonitorFireBrigade();
 	}
 
+	/**
+	 * 消防队伍分页查询
+	 *
+	 * @param page 分页对象
+	 * @param team 查询参数
+	 * @return
+	 */
 	public IPage<FireTeamCardDto> listFireTeamByPage(Page page, FireTeamListDto team) {
 		// 获取消防车辆列表
 		ResponseModel<Object> result = equipFeignClient.getFireCarListAll();