diff --git a/src/main/java/com/org/system/entity/SysUser.java b/src/main/java/com/org/system/entity/SysUser.java index 2c33704..7d5b414 100644 --- a/src/main/java/com/org/system/entity/SysUser.java +++ b/src/main/java/com/org/system/entity/SysUser.java @@ -17,7 +17,7 @@ import java.util.Date; @Data public class SysUser extends BaseEntity { - public static final String DEFAULT_PASSWORD = "Aqpx123456"; + public static final String DEFAULT_PASSWORD = "123456"; /** 用户ID **/ @TableId(type = IdType.AUTO) diff --git a/src/main/java/com/org/web/data/controller/DataController.java b/src/main/java/com/org/web/data/controller/DataController.java index 36de72f..619b8eb 100644 --- a/src/main/java/com/org/web/data/controller/DataController.java +++ b/src/main/java/com/org/web/data/controller/DataController.java @@ -5,7 +5,6 @@ import com.org.utils.AjaxResult; import com.org.web.data.service.DataService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,7 +18,7 @@ public class DataController extends BaseController { DataService dataService; @PostMapping("/statistics") - @PreAuthorize("@ss.hasPermi('data:statistics')") +// @PreAuthorize("@ss.hasPermi('data:statistics')") public AjaxResult statistics() { return AjaxResult.success(dataService.queryDataStatistics()); } diff --git a/src/main/java/com/org/web/data/mapper/DataMapper.java b/src/main/java/com/org/web/data/mapper/DataMapper.java index 477b362..a39e8b8 100644 --- a/src/main/java/com/org/web/data/mapper/DataMapper.java +++ b/src/main/java/com/org/web/data/mapper/DataMapper.java @@ -220,7 +220,7 @@ public interface DataMapper extends BaseMapper { // 房源入住情况 - @Select("select '床位' as name, " + + @Select("select '供养床位' as name, " + " (select count(1) " + " from bc_room_bed a " + " left join bc_room b on a.room_id = b.id " + @@ -236,7 +236,7 @@ public interface DataMapper extends BaseMapper { "union " + - "select '房间' as name, " + + "select '供养房间' as name, " + " (select count(1) " + " from bc_room " + " where is_delete = 0 " + diff --git a/src/main/java/com/org/web/data/service/DataService.java b/src/main/java/com/org/web/data/service/DataService.java index dca6a7c..8001a4a 100644 --- a/src/main/java/com/org/web/data/service/DataService.java +++ b/src/main/java/com/org/web/data/service/DataService.java @@ -38,7 +38,21 @@ public class DataService extends ServiceImpl { List villageRankList = baseMapper.listVillageRank(); + // 修改value总数->剩余数 List roomCountList = baseMapper.listRoomCount(); + + // 供养床位 + DataStatisticsItem gycw = new DataStatisticsItem(); + if (roomCountList != null && !roomCountList.isEmpty()) { + gycw.setName("供养床位"); + gycw.setId(1); + gycw.setValue(roomCountList.get(0).getValue()); // 床位总数 + } + + for (DataStatisticsItem item : roomCountList) { + item.setValue(item.getValue() - item.getValue2()); + } + List roomTypeList = baseMapper.listRoomType(); List villageCountList = baseMapper.listVillageCount(); @@ -61,6 +75,8 @@ public class DataService extends ServiceImpl { dataStatistics.setRoomCountList(roomCountList); + + roomTypeList.add(gycw); dataStatistics.setRoomTypeList(roomTypeList); dataStatistics.setVillageCountList(villageCountList);