fix(ys): 调整

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/dto/YsEmergencyCaseDto.java

@@ -41,10 +41,10 @@ public class YsEmergencyCaseDto  extends BaseDto {
     private String personCasualties;
 
     @ApiModelProperty(value = "灾情等级id")
-    private Integer disasterLevelId;
+    private String disasterLevelId;
 
     @ApiModelProperty(value = "灾情大类型id")
-    private Integer disasterTypeId;
+    private String disasterTypeId;
 
     @ApiModelProperty(value = "灾情结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -55,7 +55,7 @@ public class YsEmergencyCaseDto  extends BaseDto {
     private Date disasterStartTime;
 
     @ApiModelProperty(value = "灾情细分类型id")
-    private Integer disasterSubdivideId;
+    private String disasterSubdivideId;
 
     @ApiModelProperty(value = "视频信息")
     private JSONArray videoInfo;

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/dto/YsEmergencyUnitDto.java

@@ -28,7 +28,7 @@ public class YsEmergencyUnitDto  extends BaseDto {
     private String name;
 
     @ApiModelProperty(value = "关联消防队")
-    private Integer teamId;
+    private String teamId;
 
     @ApiModelProperty(value = "地址")
     private String address;

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/entity/YsEmergencyCase.java

@@ -57,13 +57,13 @@ public class YsEmergencyCase extends BaseEntity {
      * 灾情等级id
      */
 	@TableField("disaster_level_id")
-    private Integer disasterLevelId;
+    private String disasterLevelId;
 
     /**
      * 灾情大类型id
      */
 	@TableField("disaster_type_id")
-    private Integer disasterTypeId;
+    private String disasterTypeId;
 
     /**
      * 灾情结束时间
@@ -81,7 +81,7 @@ public class YsEmergencyCase extends BaseEntity {
      * 灾情细分类型id
      */
 	@TableField("disaster_subdivide_id")
-    private Integer disasterSubdivideId;
+    private String disasterSubdivideId;
 
     /**
      * 视频信息

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/entity/YsEmergencyUnit.java

@@ -33,7 +33,7 @@ public class YsEmergencyUnit extends BaseEntity {
      * 关联消防队
      */
 	@TableField("team_id")
-    private Integer teamId;
+    private String teamId;
 
     /**
      * 地址

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/vo/ExportYsEmergencyUnitVo.java

 package com.yeejoin.amos.boot.module.ys.api.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
 
 /**
  * 应急联动单位管理
@@ -31,7 +24,7 @@ public class ExportYsEmergencyUnitVo{
      * 关联消防队
      */
     @ExcelProperty(value = "关联消防队",index = 1)
-    private Integer teamId;
+    private String teamId;
 
     /**
      * 地址

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/vo/ImportYsEmergencyUnitVo.java

 package com.yeejoin.amos.boot.module.ys.api.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -20,7 +19,7 @@ public class ImportYsEmergencyUnitVo {
      * 关联消防队 .
      */
     @ExcelProperty(value = "关联消防队")
-    private Integer teamId;
+    private String teamId;
 
     /**
      * 地址 .

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyUnitController.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.ys.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyRehearsalDto;
 import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyUnitDto;
 import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyUnit;
 import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyUnitService;
@@ -170,7 +169,6 @@ public class YsEmergencyUnitController extends BaseController {
 	 *
 	 * @author chang xiangyua
 	 */
-	//TODO
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/export")
 	@ApiOperation(httpMethod = "GET", value = "联动单元列表数据导出", notes = "联动单元列表数据导出")
@@ -187,7 +185,6 @@ public class YsEmergencyUnitController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/import")
 	@ApiOperation(httpMethod = "POST", value = "联动单元列表数据导入", notes = "联动单元列表数据导入")
-	@CrossOrigin("*")
 	public ResponseModel<Object> expertDataImport(@RequestBody MultipartFile file) {
 		// 校验文件是否为空
 		if (file.isEmpty()) {

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/YsEmergencyUnitServiceImpl.java

@@ -6,24 +6,19 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.ys.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyUnitDto;
-import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyRehearsal;
 import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyUnit;
 import com.yeejoin.amos.boot.module.ys.api.mapper.YsEmergencyUnitMapper;
 import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyUnitService;
 import com.yeejoin.amos.boot.module.ys.api.vo.ExportYsEmergencyUnitVo;
 import com.yeejoin.amos.boot.module.ys.api.vo.ImportYsEmergencyUnitVo;
-import com.yeejoin.amos.boot.module.ys.api.vo.RehearsalImportVo;
-import com.yeejoin.amos.boot.module.ys.api.vo.RehearsalVo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -41,7 +36,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 应急联动单位管理服务实现类
@@ -143,15 +137,15 @@ public class YsEmergencyUnitServiceImpl extends BaseService<YsEmergencyUnitDto,
         queryWrapper.eq(YsEmergencyUnit::getIsDelete,Boolean.FALSE);
         //条件查询 -> 根据名称查询
         if(StringUtil.isNotEmpty(ysEmergencyUnitDto.getName())){
-            queryWrapper.eq(YsEmergencyUnit::getName,ysEmergencyUnitDto.getName());
+            queryWrapper.like(YsEmergencyUnit::getName,ysEmergencyUnitDto.getName());
         }
         //条件查询 -> 根据应急服务内容查询
         if(StringUtils.isNotEmpty(ysEmergencyUnitDto.getEmergencyService())){
-            queryWrapper.eq(YsEmergencyUnit::getEmergencyService,ysEmergencyUnitDto.getEmergencyService());
+            queryWrapper.like(YsEmergencyUnit::getEmergencyService,ysEmergencyUnitDto.getEmergencyService());
         }
         //条件查询 -> 根据关联消防队查询
-        if(ysEmergencyUnitDto.getTeamId()!=null){
-            queryWrapper.eq(YsEmergencyUnit::getTeamId,ysEmergencyUnitDto.getTeamId());
+        if (ysEmergencyUnitDto.getTeamId() != null) {
+            queryWrapper.like(YsEmergencyUnit::getTeamId,ysEmergencyUnitDto.getTeamId());
         }
         this.page(page, queryWrapper);
         //数据脱敏