更新 次密

gis_cms/src/main/java/com/gis/cms/controller/HotelController.java

@@ -17,7 +17,7 @@ import javax.validation.Valid;
 /**
  * Created by owen on 2022/3/24 0008 9:54
  */
-@Api(tags = "酒店管理")
+@Api(tags = "v0.1-酒店管理")
 @RestController
 @RequestMapping("cms/hotel")
 public class HotelController {
@@ -34,7 +34,7 @@ public class HotelController {
 
 
     @WebControllerLog(description = "领导管理-新增/编辑", addDb = true)
-    @ApiOperation(value = "新增/编辑")
+    @ApiOperation(value = "v0.1-新增/编辑")
     @PostMapping("save")
     public Result save(@Valid @RequestBody HotelDto param) {
         return entityService.saveEntity(param);
@@ -60,7 +60,7 @@ public class HotelController {
     }
 
 
-    @ApiOperation("房间数据-编辑")
+    @ApiOperation("v0.1-房间数据-编辑")
     @PostMapping("roomEdit")
     public Result<HotelEntity> roomEdit(@Valid @RequestBody RoomDto param) {
         return entityService.roomEdit(param);

gis_cms/src/main/java/com/gis/cms/controller/WebController.java

@@ -2,7 +2,6 @@ package com.gis.cms.controller;
 
 import com.gis.cms.entity.dto.HotelPageDto;
 import com.gis.cms.service.HotelService;
-import com.gis.common.base.exception.BaseRuntimeException;
 import com.gis.common.util.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,7 +13,7 @@ import javax.validation.Valid;
 /**
  * Created by owen on 2022/3/24 0008 9:54
  */
-@Api(tags = "展示端")
+@Api(tags = "v0.1-展示端")
 @RestController
 @RequestMapping("web")
 public class WebController {
@@ -30,21 +29,12 @@ public class WebController {
         return entityService.webSearch(param);
     }
 
-    @ApiOperation(value = "数据概览")
+    @ApiOperation(value = "v0.1-数据概览")
     @GetMapping("info")
     public Result info() {
         return entityService.info();
     }
 
-//    @ApiOperation(value = "隔离概览")
-//    @GetMapping("isolationInfo")
-//    public Result isolationInfo() {
-//
-//        System.out.println("1111111");
-//        BaseRuntimeException.isHas(true, null ,"测试错误");
-//
-//        return Result.success();
-//    }
 
     @ApiOperation(value = "详情")
     @GetMapping("detail/{id}")

gis_cms/src/main/java/com/gis/cms/entity/dto/HotelDto.java

@@ -38,7 +38,8 @@ public class HotelDto {
     @ApiModelProperty(value = "管理单位")
     private String unit;
 
-    @ApiModelProperty(value = "类型 > local:本土, import:入境, hold:待定")
+//    @ApiModelProperty(value = "类型 > local:本土, import:入境, hold:待定")
+    @ApiModelProperty(value = "用途 > 1:本土人员-密接, 2:本土人员-次密, 3:入境人员, 4:国内中高风险, 6:其他-海外中高风险, 7:其他-走私偷渡, 8:其他-转运司机, 9:待定")
     private String type;
 
     @ApiModelProperty(value = "备注")

gis_cms/src/main/java/com/gis/cms/entity/dto/RoomDto.java

@@ -23,4 +23,10 @@ public class RoomDto {
 
     @ApiModelProperty(value = "其他房间数")
     private Integer other;
+
+    @ApiModelProperty(value = "密接人数")
+    private Integer touch;
+
+    @ApiModelProperty(value = "次密人数数")
+    private Integer touchSecond;
 }

gis_cms/src/main/java/com/gis/cms/entity/po/HotelEntity.java

@@ -29,7 +29,8 @@ public class HotelEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "管理单位")
     private String unit;
 
-    @ApiModelProperty(value = "类型 > local:本土, import:入境, hold:待定")
+//    @ApiModelProperty(value = "用途 > local:本土, import:入境, hold:待定")
+    @ApiModelProperty(value = "用途 > 1:本土人员-密接, 2:本土人员-次密, 3:入境人员, 4:国内中高风险, 6:其他-海外中高风险, 7:其他-走私偷渡, 8:其他-转运司机, 9:待定")
     private String type;
 
     @ApiModelProperty(value = "酒店地址")
@@ -71,6 +72,14 @@ public class HotelEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "lat")
     private String lat;
 
+    @ApiModelProperty(value = "密接人数")
+    private Integer touch;
+
+    @ApiModelProperty(value = "次密人数数")
+    private Integer touchSecond;
+
+
+
 
 
 

gis_cms/src/main/java/com/gis/cms/service/impl/HotelServiceImpl.java

@@ -151,6 +151,8 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
         int emergencyStore = 0; //酒店应急储备
         int roomUsed = 0; //房间总入住数量
         int roomUsable = 0; //房间总空闲数量
+        int touch = 0; //密接人数
+        int touchSecond = 0; //次密人数数
 
         for (HotelEntity entity : list) {
             Integer status = entity.getStatus();
@@ -164,6 +166,8 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
 
             roomUsed = roomUsed + entity.getUsed();
             roomUsable = roomUsable + entity.getUsable();
+            touch = touch + entity.getTouch();
+            touchSecond = touchSecond + entity.getTouchSecond();
         }
         total = list.size();
 
@@ -174,6 +178,8 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
         map.put("emergencyStore", emergencyStore);
         map.put("roomUsed", roomUsed);
         map.put("roomUsable", roomUsable);
+        map.put("touch", roomUsable);
+        map.put("touchSecond", roomUsable);
 
 
         return Result.success(map);