From 66ca3c7a1abce80143a3bd5c1e197aa020c396b6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 二月 2025 15:26:08 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 4 ++
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 5 ++
server/services/src/main/java/com/doumee/core/constants/Constants.java | 1
server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java | 4 +-
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 59 ++++++++++++++++++++++++++++-
5 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 96913b0..191e1c1 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -44,6 +44,7 @@
//杞﹁締绫诲瀷鏁版嵁
public static final String BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
public static final String MINI_PROGRAMME_REALEASE ="MINI_PROGRAMME_REALEASE" ;
+ public static final int FOUR =4 ;
public static String REDIS_DEBUG_STR="test_";
public static final String AD = "AD";
public static String REPAIR = "REPAIR";
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java b/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
index f0cf8dd..f081d22 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
@@ -60,8 +60,8 @@
@ExcelColumn(name="鎺掑簭鐮侊紙鍗囧簭锛�")
private Integer sortnum;
- @ApiModelProperty(value = "绫诲瀷 0杞﹁締淇濅慨鍘熷洜 1寮哄埗杩樿溅鍘熷洜 2鏃堕暱鍑忓厤鍘熷洜 3鍗曡溅绫诲瀷", example = "1")
- @ExcelColumn(name="绫诲瀷 0杞﹁締淇濅慨鍘熷洜 1寮哄埗杩樿溅鍘熷洜 2鏃堕暱鍑忓厤鍘熷洜 3鍗曡溅绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷 0杞﹁締淇濅慨鍘熷洜 1寮哄埗杩樿溅鍘熷洜 2鏃堕暱鍑忓厤鍘熷洜 3鍗曡溅绫诲瀷 4鐢佃溅绫诲瀷", example = "1")
+ @ExcelColumn(name="绫诲瀷 0杞﹁締淇濅慨鍘熷洜 1寮哄埗杩樿溅鍘熷洜 2鏃堕暱鍑忓厤鍘熷洜 3鍗曡溅绫诲瀷 4鐢佃溅绫诲瀷")
@NotEmpty(message = "绫诲瀷鍙傛暟涓虹┖")
private Integer type;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
index d3ab0e0..aeda14f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -50,6 +50,10 @@
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
// @TableLogic
private Integer isdeleted;
+ @ApiModelProperty(value = "绔欑偣绫诲瀷 0鑷杞� 1鐢佃溅", example = "1")
+ @ExcelColumn(name="绔欑偣绫诲瀷 0鑷杞� 1鐢佃溅")
+// @TableLogic
+ private Integer type;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index 3397748..8cc0ddf 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -2,10 +2,14 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.StringTools;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.BaseParamMapper;
import com.doumee.dao.business.BikesMapper;
import com.doumee.dao.business.join.BikesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -23,13 +27,12 @@
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -43,6 +46,8 @@
@Autowired
private BikesMapper bikesMapper;
@Autowired
+ private BaseParamMapper baseParamMapper;
+ @Autowired
private BikesJoinMapper bikesJoinMapper;
@@ -51,6 +56,33 @@
@Override
public String create(Bikes bikes) {
+ if(StringUtils.isBlank(bikes.getParamId() )
+ ||StringUtils.isBlank(bikes.getCode())
+ ||StringUtils.isBlank(bikes.getDeviceSn())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(baseParamMapper.selectCount(new QueryWrapper<BaseParam>().lambda().eq(BaseParam::getIsdeleted,Constants.ZERO)
+ .eq(BaseParam::getType,Constants.FOUR)) ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭數杞︾被鍨嬶紒");
+ }
+ QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Bikes::getCode,bikes.getCode())
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getType,Constants.ONE);
+ Integer count = bikesMapper.selectCount(wrapper);
+ if (count > 0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杞︾墝鍙峰彿宸插瓨鍦�");
+ }
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ bikes.setId(UUID.randomUUID().toString());
+ bikes.setCreateDate(new Date());
+ bikes.setCreator(user.getId());
+ bikes.setEditDate(bikes.getCreateDate());
+ bikes.setEditor(user.getId());
+ bikes.setStatus(Constants.ZERO);
+ bikes.setIsdeleted(Constants.ZERO);
+ bikes.setType(Constants.ONE);//鍙兘鏂板鐢佃溅鏁版嵁
bikesMapper.insert(bikes);
return bikes.getId();
}
@@ -76,6 +108,27 @@
@Override
public void updateById(Bikes bikes) {
+ QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Bikes::getCode,bikes.getCode())
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .ne(Bikes::getId,bikes.getId())
+ .eq(Bikes::getType,Constants.ONE);
+ Integer count = bikesMapper.selectCount(wrapper);
+ if (count > 0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杞︾墝鍙峰彿宸插瓨鍦�");
+ }
+ if(StringUtils.isNotBlank(bikes.getParamId()) &&
+ baseParamMapper.selectCount(new QueryWrapper<BaseParam>().lambda().eq(BaseParam::getIsdeleted,Constants.ZERO)
+ .eq(BaseParam::getType,Constants.FOUR)) ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭數杞︾被鍨嬶紒");
+ }
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ bikes.setEditDate(new Date());
+ bikes.setEditor(user.getId());
+ bikes.setStatus(Constants.ZERO);
+ bikes.setIsdeleted(Constants.ZERO);
+ bikes.setType(null);//鍙兘鏂板鐢佃溅鏁版嵁
bikesMapper.updateById(bikes);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index 6aed1e4..b3343fe 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -66,7 +66,8 @@
QueryWrapper<Sites> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Sites::getCode,sites.getCode());
+ .eq(Sites::getCode,sites.getCode())
+ .eq(Sites::getIsdeleted,Constants.ZERO);
Integer count = sitesMapper.selectCount(wrapper);
if (count > 0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绔欑偣缂栧彿宸插瓨鍦�");
@@ -81,6 +82,7 @@
insert.setInfo(sites.getInfo());
insert.setName(sites.getName());
insert.setCode(sites.getCode());
+ insert.setElectronicFence(sites.getElectronicFence());
insert.setStatus(Constants.ZERO);
insert.setLockNum(sites.getLockNum());
insert.setIp(sites.getIp());
@@ -123,6 +125,7 @@
update.setEditor(principal.getId());
update.setName(sites.getName());
update.setLockNum(sites.getLockNum());
+ update.setElectronicFence(sites.getElectronicFence());
update.setIp(sites.getIp());
update.setNeedNotice(sites.getNeedNotice());
sitesMapper.updateById(update);
--
Gitblit v1.9.3