From 095d19dff25e37c8abf3cf197a4bdac6a2b3ecd5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 02 七月 2025 09:37:45 +0800
Subject: [PATCH] 代码初始化
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java | 10 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 59 +++++++++++++++++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 21 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 51 ++++++++++++----
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 16 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 2
7 files changed, 136 insertions(+), 24 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 2ae528e..9bfa4ef 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -157,6 +157,7 @@
public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX";
public static final String PRESSURE_LEVEL_UNIT = "PRESSURE_LEVEL_UNIT";
public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;
+ public static final String OUT_HY_LOT_TOTAL ="OUT_HY_LOT_TOTAL" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index cc3026f..912117f 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1733,11 +1733,22 @@
}
public static Date getFirstThisYearDate() {
try {
- return sdfShort.parse( getNowShortDate().substring(0, 4) + "0101");
+ return sdfLong.parse( getNowShortDate().substring(0, 4) + "-01-01");
} catch (Exception e) {
return null;
}
}
+
+ public static Date getFirstThisMonthDate() {
+ try {
+ return sdfLong.parse( getNowFormateDate().substring(0, 7) + "-01");
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+
+
public static String getFirstDayCurrentMonth() {
try {
return getDateLong(new Date()).substring(0, 7) + "-01";
@@ -2931,8 +2942,9 @@
// Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
// System.out.println(DateUtil.afterMinutesDate(-5));
+ System.out.println(DateUtil.getFirstThisMonthDate());
- System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
+// System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
// System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
// List<Date> list =getThisMonthDateList();
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
index 8d08491..01a7327 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
@@ -2,6 +2,8 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
+import com.doumee.service.business.VisitsService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
@@ -30,6 +32,9 @@
@Autowired
private BoardService boardService;
+ @Autowired
+ private VisitsService visitsService;
+
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
@@ -39,11 +44,16 @@
}
+ /**
+ *
+ * @param type 0/null = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾
+ * @return
+ */
@LoginNoRequired
@ApiOperation("鎶ヨ淇℃伅")
@GetMapping("/alarmData")
- public ApiResponse<AlarmDataVO> alarmDataSumByCate() {
- AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate();
+ public ApiResponse<AlarmDataVO> alarmDataSumByCate(Integer type) {
+ AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate(type);
return ApiResponse.success(alarmDataVO);
}
@LoginNoRequired
@@ -88,6 +98,13 @@
return ApiResponse.success(list);
}
+ @LoginNoRequired
+ @ApiOperation("瀹炴椂鍦ㄥ満浜哄憳鍒嗗竷")
+ @GetMapping("/inParkUser")
+ public ApiResponse<PCWorkPlatformDataVO> inParkUser() {
+ PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(Constants.ONE,null);
+ return ApiResponse.success(pcWorkPlatformDataVO);
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
index d5e11a8..57a7bfc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
@@ -5,6 +5,7 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
/**
* 瀹夐槻绠℃帶澶у睆
@@ -21,9 +22,18 @@
@ApiModelProperty(value = "鍓╀綑杞︿綅鏁伴噺")
private int freeParkingLot;
+
@ApiModelProperty(value = "杞︿綅浣跨敤鐜�")
private BigDecimal parkingUseRate;
+
+ @ApiModelProperty(value = "澶栧崗璐ц繍杞︿綅鎬绘暟")
+ private int outHyLotTotal;
+
+ @ApiModelProperty(value = "鍦ㄥ洯杞﹁締淇℃伅鍒楄〃")
+ private List<Map<String,Object>> inParkCarList;
+
+
@ApiModelProperty(value = "鍛樺伐杞﹁締")
private int internalCarTotal;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 9ae0415..d35604c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -870,7 +870,6 @@
hiddenDangerDataVO.setCateList(cateGeneralDataList);
}
//鍏ㄩ儴闅愭偅鍖哄煙閮ㄩ棬鏁版嵁
-
List<HiddenDangerCompanyVO> hiddenDangerCompanyVOList = hiddenDangerAllList.stream().
filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7)))
.map(i->new HiddenDangerCompanyVO(i.getAreaName(),i.getAreaCompanyId())).collect(Collectors.toList());
@@ -889,7 +888,8 @@
if(optionalCompany.isPresent()){
GeneralDataVO generalDataVO = new GeneralDataVO();
Company company = optionalCompany.get();
- Integer total = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))&&Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size();
+ Integer total = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").
+ equals(nowDate.substring(0,7))&&Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size();
generalDataVO.setName(company.getName());
generalDataVO.setTotal(total);
generalDataVO.setCategoryName(hiddenDangerCompanyVO.getCategoryName());
@@ -898,19 +898,44 @@
}
hiddenDangerDataVO.setDepartmentList(companyGeneralDataList);
}
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerDataVO.getDepartmentList())){
- List<GeneralDataVO> topList = hiddenDangerDataVO.getDepartmentList();
- Collections.sort(topList, new Comparator<GeneralDataVO>() {
- @Override
- public int compare(GeneralDataVO o1, GeneralDataVO o2) {
- // 杩斿洖鍊间负int绫诲瀷锛屽ぇ浜�0琛ㄧず姝ｅ簭锛屽皬浜�0琛ㄧず閫嗗簭
- return o2.getTotal() - o1.getTotal();
- }
- });
- hiddenDangerDataVO.setDepartmentSortList(topList);
- }
+// if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerDataVO.getDepartmentList())){
+// List<GeneralDataVO> topList = hiddenDangerDataVO.getDepartmentList();
+// Collections.sort(topList, new Comparator<GeneralDataVO>() {
+// @Override
+// public int compare(GeneralDataVO o1, GeneralDataVO o2) {
+// // 杩斿洖鍊间负int绫诲瀷锛屽ぇ浜�0琛ㄧず姝ｅ簭锛屽皬浜�0琛ㄧず閫嗗簭
+// return o2.getTotal() - o1.getTotal();
+// }
+// });
+// hiddenDangerDataVO.setDepartmentSortList(topList);
+// }
+
}
+
+ List<Map<String,Object>> mapList = hiddenDangerMapper.selectJoinMaps(new MPJLambdaWrapper<HiddenDanger>()
+ .select(" t1.name as cateName,t2.name as companyName , count(1) total ")
+ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
+ .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
+ .eq(HiddenDanger::getIsdeleted,Constants.ZERO)
+ .apply(" DATE_FORMAT(t.CREATE_DATE, '%Y%M') = DATE_FORMAT(now(), '%Y%M') ")
+ .groupBy("t1.name , t2.name")
+ .orderByDesc(" count(1) ")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(mapList)){
+ List<GeneralDataVO> topList = new ArrayList<>();
+ for (Map<String,Object> map:mapList) {
+ GeneralDataVO generalDataVO = new GeneralDataVO();
+ generalDataVO.setTotal(Integer.valueOf(map.get("total").toString()));
+ generalDataVO.setName(map.get("companyName").toString());
+ generalDataVO.setCategoryName(map.get("cateName").toString());
+ topList.add(generalDataVO);
+ }
+ hiddenDangerDataVO.setDepartmentSortList(topList);
+ }
+
+
+
return hiddenDangerDataVO;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index d4c376b..5bbc2d2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -93,7 +93,8 @@
private TmsService tmsService;
@Autowired
private PlatformDeviceMapper platformDeviceMapper;
-
+ @Autowired
+ private CategoryMapper categoryMapper;
@Value("${debug_model}")
private Boolean isDebug;
/**
@@ -620,6 +621,9 @@
if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
}
+ if(Objects.nonNull(response.getData().getList())){
+ return data;
+ }
for(FindHomeAlarmInfoPageResponse r : response.getData().getList()){
AlarmEventDataVO t = new AlarmEventDataVO();
BeanUtils.copyProperties(r,t);
@@ -1000,13 +1004,21 @@
/**
* 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅淇℃伅闆嗗悎
- *
+ * @param type 0/null = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾
* @return
*
*/
@Override
- public AlarmDataVO alarmDataSumByCate(){
- AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(Utils.Date.getStart(new Date()))
+ public AlarmDataVO alarmDataSumByCate(Integer type){
+ Date startDate = Utils.Date.getStart(new Date());
+ if(Objects.nonNull(type)){
+ if(Constants.equalsInteger(type,Constants.TWO)){
+ startDate = Utils.Date.getStart(DateUtil.getFirstThisYearDate());
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ startDate = Utils.Date.getStart(DateUtil.getFirstThisMonthDate());
+ }
+ }
+ AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(startDate)
,(DateUtil.getPlusTime2(new Date())));
return alarmDataVO;
}
@@ -2052,7 +2064,7 @@
data.setInParkCarTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
);
- //鍦ㄥ洯杞﹁締
+ //褰撳墠鍦ㄥ洯璐ц溅鍙告満鎬绘暟
data.setInParkCarUserTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)).count()
);
@@ -2087,8 +2099,44 @@
&&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.wxysCar)).count()
);
data.setVideoPluginUrl(getVideoUrl());
+
+ data.setOutHyLotTotal(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.OUT_HY_LOT_TOTAL).getCode()));
+
+
+ data.setInParkCarList(this.getInParkCars(data));
+
return data;
}
+
+
+ public List<Map<String,Object>> getInParkCars(SecurityBoardVO securityBoardVO){
+ List<Map<String,Object>> mapList = categoryMapper.selectJoinMaps(new MPJLambdaWrapper<Category>()
+ .select(Category::getName)
+ .select(" ( select count(1) from retention r where r.isdeleted = 0 and r.CATEGORY_PARENT_ID = t.id and r.TYPE = 3 ) as total ")
+ .eq(Category::getType,Constants.ONE)
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ .isNull(Category::getParentId)
+ .groupBy(Category::getName)
+
+ );
+ if(CollectionUtils.isEmpty(mapList)){
+ mapList = new ArrayList<>();
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("name","鏈煡杞﹁締");
+ map.put("total", retentionMapper.selectCount(
+ new MPJLambdaWrapper<Retention>()
+ .eq(Retention::getIsdeleted,Constants.ZERO)
+ .isNull(Retention::getCategoryId)
+ .eq(Retention::getCarType,Constants.SIX)
+ )
+ );
+ mapList.add(map);
+ return mapList;
+
+ }
+
+
private String getVideoUrl() {
return systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe";
@@ -3102,7 +3150,6 @@
}
}
return r ;
-
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index e0da371..a7713db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -75,7 +75,7 @@
List<AlarmEventDataVO> fightingAdminAlertList();
- AlarmDataVO alarmDataSumByCate();
+ AlarmDataVO alarmDataSumByCate(Integer type);
List<AlarmDataVO> fightingAlarmHandleData();
--
Gitblit v1.9.3