From f80fb683f62639ec7848cc82d37e8313c7ffdb0c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 二月 2025 16:55:12 +0800
Subject: [PATCH] jtt808初始化
---
server/platform/src/main/java/com/doumee/api/business/LocksController.java | 6 +++---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 4 +++-
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 33 ++++++++++++++++++++++-----------
server/platform/src/main/java/com/doumee/api/business/BikesController.java | 3 ++-
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java | 13 +++++++------
5 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/BikesController.java b/server/platform/src/main/java/com/doumee/api/business/BikesController.java
index bcb848f..8fb4b3d 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BikesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BikesController.java
@@ -78,7 +78,8 @@
@PostMapping("/pageCurrent")
@RequiresPermissions("business:bikes:query")
public ApiResponse<PageData<Bikes>> pageCurrent (@RequestBody PageWrap<Bikes> pageWrap) {
- return ApiResponse.success(bikesService.findJoinPage(pageWrap));
+ PageData<Bikes> list = bikesService.findJoinPage(pageWrap);
+ return ApiResponse.success(list);
}
@ApiOperation("瀵煎嚭Excel")
diff --git a/server/platform/src/main/java/com/doumee/api/business/LocksController.java b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
index 9a0c88f..dc1dab7 100644
--- a/server/platform/src/main/java/com/doumee/api/business/LocksController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
@@ -102,7 +102,7 @@
@ApiOperation("瀵煎嚭鐢佃溅灏忕▼搴忕爜")
@PostMapping("/exportEbikeImages")
@RequiresPermissions("business:locks:exportExcel")
- public void exportEbikeImages(@RequestParam String bikeid,HttpServletResponse response) {
+ public void exportEbikeImages(@RequestParam(required = false) String bikeid,HttpServletResponse response) {
locksService.exportEbikeImages(bikeid,response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -128,12 +128,12 @@
}
@ApiOperation("鑾峰彇鐢佃溅灏忕▼搴忎簩缁寸爜")
@GetMapping("/findBikeBase")
- public ApiResponse<Bikes> findBikeBase(@RequestParam String bikeId,@RequestParam Integer fouce){
+ public ApiResponse<Bikes> findBikeBase(@RequestParam String bikeId,@RequestParam(required = false) Integer fouce){
return ApiResponse.success(locksService.findBikeBase(bikeId,fouce));
}
@ApiOperation("鑾峰彇鎵�鏈夌數杞﹀皬绋嬪簭鐮�")
@GetMapping("/findAllBikeBase")
- public ApiResponse<List<Bikes>> findAllBikeBase( @RequestParam Integer fouce){
+ public ApiResponse<List<Bikes>> findAllBikeBase( @RequestParam(required = false) Integer fouce){
return ApiResponse.success(locksService.findAllBikeBase( fouce));
}
}
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 e441663..76469d4 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
@@ -31,6 +31,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -84,7 +85,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杞︾墝鍙峰彿宸插瓨鍦�");
}
LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- bikes.setId(UUID.randomUUID().toString());
+ bikes.setId(UUID.randomUUID().toString().replace("-",""));
bikes.setCreateDate(new Date());
bikes.setCreator(user.getId());
bikes.setEditDate(bikes.getCreateDate());
@@ -117,6 +118,10 @@
@Override
public void updateById(Bikes bikes) {
+ Bikes model =bikesMapper.selectById(bikes.getId());
+ if (model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Bikes::getCode,bikes.getCode())
@@ -132,13 +137,19 @@
.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);
+ bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda()
+ .set(Bikes::getEditDate,new Date())
+ .set(Bikes::getEditor,user.getId())
+ .set(StringUtils.isNotBlank(bikes.getCode()),Bikes::getCode,bikes.getCode())
+ .set(!StringUtils.equals( model.getCode(),bikes.getCode()),Bikes::getImgurl,null)
+ .set(StringUtils.isNotBlank(bikes.getDeviceSn()),Bikes::getDeviceSn,bikes.getDeviceSn())
+ .set(StringUtils.isNotBlank(bikes.getParamId()),Bikes::getParamId,bikes.getParamId())
+ .set(Bikes::getStatus, Constants.ZERO)
+ .set(Bikes::getIsdeleted, Constants.ZERO)
+ .eq(Bikes::getId,bikes.getId())
+ );
}
@Override
@@ -210,14 +221,14 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getDeviceSn()), Bikes::getDeviceSn,pageWrap.getModel().getDeviceSn())
.eq( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
.eq( Bikes::getType,Constants.formatIntegerNum(pageWrap.getModel().getType()))//榛樿鏌ヨ鑷杞�
- .ne(Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
- .ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
+ .ne(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
+ .ne(Constants.formatIntegerNum(pageWrap.getModel().getType())==0, Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
.and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,
s->s.isNull(Bikes::getCode)
.or(b->b.eq(Bikes::getCode,"")))
.and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,s->s
- .isNotNull(Bikes::getCode)
- .and(b->b.ne(Bikes::getCode,"")));
+ .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,Bikes::getCode)
+ .and(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,b->b.ne(Bikes::getCode,"")));
if(pageWrap.getModel().getLowVoltage()!=null){
double low = 0;
try {
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
index e933d41..59f4148 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -177,7 +177,7 @@
systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
String code = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
String prePath = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.IMG_DIR).getCode();
- bikesList.forEach(bikes-> {
+ for(Bikes bikes : bikesList){
if (Constants.equalsInteger(force,Constants.ONE) || StringUtils.isBlank(bikes.getImgurl())){
try {
wxMiniUtilService.generateEbikeWXMiniCode(bikes, WxMiniConfig.wxMaService.getAccessToken(),prePath,code);
@@ -188,11 +188,12 @@
bikes.setEditDate(new Date());
bikesMapper.updateById(bikes);
}
- if (StringUtils.isNotBlank(bikes.getImgurl())){
- bikes.setImgurl(fullPath+bikes.getImgurl());
- }
}
- });
+ if (StringUtils.isNotBlank(bikes.getImgurl())){
+ bikes.setImgurl(fullPath+bikes.getImgurl());
+ }
+ }
+
}
return bikesList;
@@ -321,7 +322,7 @@
}
String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IMG_DIR).getCode()+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode();
for(Bikes l : bikesList){
- if(StringUtils.isNotBlank(l.getInfo())){
+ if(StringUtils.isNotBlank(l.getImgurl())){
File file = new File(path + l.getImgurl());
if(file!=null && file.isFile()){
fileList.add(file);
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 78d5dbc..16858f4 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
@@ -175,6 +175,7 @@
return ;
}
sites.setIsdeleted(Constants.ZERO);
+ sites.setType(Constants.ZERO);
sites.setStatus(Constants.ZERO);
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
wrapper.lambda().orderByDesc(Sites::getLastLinkDate);
@@ -183,7 +184,8 @@
for(Sites site : siteList){
//鏃堕棿鏌ヨ繃閫氫俊寮傚父闃堝��
if(Constants.formatIntegerNum(site.getNeedNotice()) == Constants.ZERO
- && System.currentTimeMillis()-site.getLastLinkDate().getTime() > second*1000){
+ &&(site.getLastLinkDate() == null
+ || System.currentTimeMillis()-site.getLastLinkDate().getTime() > second*1000)){
errorList.add(site);
}
}
--
Gitblit v1.9.3