From cac8f41a47915de2a30a8784fe1fc35c364e86df Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 10 十月 2023 18:27:08 +0800
Subject: [PATCH] #pgsql 运营监控
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 38 +++++
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 143 ++++++++++----------
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairQuery.java | 30 ++++
server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java | 8
server/services/src/main/java/com/doumee/dao/business/model/Multifile.java | 5
server/services/src/main/java/com/doumee/dao/business/web/request/SitesMonitorDTO.java | 37 +++++
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 2
server/services/src/main/java/com/doumee/dao/business/SitesMapper.java | 18 ++
server/services/src/main/java/com/doumee/dao/business/join/BikeRepairJoinMapper.java | 12 +
server/services/src/main/java/com/doumee/core/constants/Constants.java | 1
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 1
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairProblemDTO.java | 23 +++
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java | 41 +++++
server/services/src/main/java/com/doumee/service/business/BikeRepairService.java | 16 +
14 files changed, 295 insertions(+), 80 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java b/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java
index fab238d..974f15c 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java
@@ -7,6 +7,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BikeRepair;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
+import com.doumee.dao.business.web.request.BikeRepairQuery;
import com.doumee.service.business.BikeRepairService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -70,15 +72,15 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:bikerepair:query")
- public ApiResponse<PageData<BikeRepair>> findPage (@RequestBody PageWrap<BikeRepair> pageWrap) {
+ public ApiResponse<PageData<BikeRepairDTO>> findPage (@RequestBody PageWrap<BikeRepairQuery> pageWrap) {
return ApiResponse.success(bikeRepairService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:bikerepair:exportExcel")
- public void exportExcel (@RequestBody PageWrap<BikeRepair> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(BikeRepair.class).export(bikeRepairService.findPage(pageWrap).getRecords(), "杞﹁締闂涓婃姤淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<BikeRepairQuery> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(BikeRepairDTO.class).export(bikeRepairService.findPage(pageWrap).getRecords(), "杞﹁締闂涓婃姤淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
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 dab6d7a..3f9acf4 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
@@ -27,6 +27,7 @@
public static final String IMG_DIR = "IMG_DIR";
public static final String FILE_DIR ="FILE_DIR" ;
public static final String PRIVATE_KEY = "PRIVATE_KEY";
+ public static final String PROJECT_FILE = "PROJECT_FILE";
public static String REDIS_DEBUG_STR="test_";
public interface MqttTopic{
//寮�閿�
diff --git a/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java b/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java
index 6ec68e6..0fbb35b 100644
--- a/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java
+++ b/server/services/src/main/java/com/doumee/dao/business/SitesMapper.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Sites;
+import com.doumee.dao.business.web.request.SitesMonitorDTO;
+import org.apache.ibatis.annotations.Select;
/**
* @author 姹熻箘韫�
@@ -9,4 +11,20 @@
*/
public interface SitesMapper extends BaseMapper<Sites> {
+
+ /**
+ * @return
+ */
+ @Select("SELECT \n" +
+ "sites.id,\n" +
+ "sites.name as name,\n" +
+ "sites.code as code,\n" +
+ "count(l.id) as lid,\n" +
+ "count(l.bike_code ) as lbikeCount\n" +
+ "from \n" +
+ "sites sites\n" +
+ "LEFT JOIN locks l on sites.id = l.site_id\n" +
+ "GROUP BY sites.id ")
+ SitesMonitorDTO getSitesMonitorDTO();
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/join/BikeRepairJoinMapper.java b/server/services/src/main/java/com/doumee/dao/business/join/BikeRepairJoinMapper.java
new file mode 100644
index 0000000..5b27da4
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/join/BikeRepairJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.BikeRepair;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface BikeRepairJoinMapper extends MPJJoinMapper<BikeRepair> {
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
index fd2beb8..f1c469f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -72,6 +72,11 @@
@ExcelColumn(name="鏂囦欢鍦板潃")
private String fileurl;
+ @ApiModelProperty(value = "鏂囦欢鍦板潃")
+ @ExcelColumn(name="鏂囦欢鍦板潃")
+ @TableField(exist = false)
+ private String fileurlfull;
+
@ApiModelProperty(value = "鎺掑簭鐮�")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
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 a87698f..1189cd1 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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -44,6 +45,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
new file mode 100644
index 0000000..c06d25c
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
@@ -0,0 +1,41 @@
+package com.doumee.dao.business.web.request;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+
+@Data
+@ApiModel("杞﹁締闂涓婃姤淇℃伅鍒楄〃")
+public class BikeRepairDTO {
+
+ @ApiModelProperty(value = "鐢ㄦ埛")
+ private String openid;
+
+ @ApiModelProperty(value = "杞﹁締绫诲瀷")
+ private String bikeTypeName;
+
+ @ApiModelProperty(value = "杞﹁締缂栧彿")
+ private String bikeCode;
+
+ @ApiModelProperty(value = "鑱旂郴浜�")
+ private String linkname;
+
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String linkphone;
+
+ @ApiModelProperty(value = "闂绫诲瀷")
+ private String problemName;
+
+ @ApiModelProperty(value = "鏄惁澶勭悊")
+ private Integer status;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿寮�濮�")
+ private Date createDate;
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairProblemDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairProblemDTO.java
new file mode 100644
index 0000000..eef81de
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairProblemDTO.java
@@ -0,0 +1,23 @@
+package com.doumee.dao.business.web.request;
+
+import com.doumee.dao.business.model.Multifile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("杞﹁締闂涓婃姤闂鎻忚堪")
+public class BikeRepairProblemDTO {
+
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婃姤闂")
+ private String param;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ private List<Multifile> list;
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairQuery.java b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairQuery.java
new file mode 100644
index 0000000..c91c118
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairQuery.java
@@ -0,0 +1,30 @@
+package com.doumee.dao.business.web.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("鑷杞︿笂鎶ユ煡璇�")
+public class BikeRepairQuery {
+
+ @ApiModelProperty(value = "鐢ㄦ埛")
+ private String openid;
+
+ @ApiModelProperty(value = "杞﹁締缂栧彿")
+ private String bikeId;
+
+ @ApiModelProperty(value = "鏄惁澶勭悊")
+ private Integer status;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿寮�濮�")
+ private Date createDateStart;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿缁撴潫")
+ private Date createDateEnd;
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/SitesMonitorDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/SitesMonitorDTO.java
new file mode 100644
index 0000000..e0b4ff6
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/SitesMonitorDTO.java
@@ -0,0 +1,37 @@
+package com.doumee.dao.business.web.request;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("绔欑偣缁熻")
+public class SitesMonitorDTO {
+
+
+
+ @ApiModelProperty(value = "鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "缂栧彿")
+ private String code;
+
+ @ApiModelProperty(value = "閿佹鍣ㄦ暟")
+ private Integer localCount;
+
+ @ApiModelProperty(value = "鍦ㄦ灦杞﹁締鏁�")
+ private Integer bikeCount;
+
+ @ApiModelProperty(value = "婊℃灦鐜�")
+ private BigDecimal rate;
+
+
+
+
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java b/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
index 00053a9..c5efe34 100644
--- a/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
+++ b/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
@@ -3,6 +3,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BikeRepair;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
+import com.doumee.dao.business.web.request.BikeRepairProblemDTO;
+import com.doumee.dao.business.web.request.BikeRepairQuery;
import com.doumee.dao.business.web.request.RepairRequest;
import java.util.List;
@@ -16,7 +19,7 @@
/**
* 鍒涘缓
- *
+ *
* @param bikeRepair 瀹炰綋瀵硅薄
* @return String
*/
@@ -80,14 +83,21 @@
* @return List<BikeRepair>
*/
List<BikeRepair> findList(BikeRepair bikeRepair);
-
+
/**
* 鍒嗛〉鏌ヨ
*
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<BikeRepair>
*/
- PageData<BikeRepair> findPage(PageWrap<BikeRepair> pageWrap);
+ PageData<BikeRepairDTO> findPage(PageWrap<BikeRepairQuery> pageWrap);
+
+ /**
+ *
+ * 鑾峰彇涓婃姤浜虹殑淇濅慨淇℃伅
+ * @return BikeRepairProblemDTO
+ */
+ BikeRepairProblemDTO getBikeRepairProblemDTO(String id);
/**
* 鏉′欢缁熻
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 2406bd9..e75b451 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -1,4 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.google.common.collect.Lists;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
@@ -6,18 +8,23 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BikeRepairMapper;
import com.doumee.dao.business.MultifileMapper;
-import com.doumee.dao.business.model.BikeRepair;
-import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.business.join.BikeRepairJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
+import com.doumee.dao.business.web.request.BikeRepairProblemDTO;
+import com.doumee.dao.business.web.request.BikeRepairQuery;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.service.business.BikeRepairService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
@@ -33,6 +40,12 @@
@Autowired
private BikeRepairMapper bikeRepairMapper;
+
+ @Autowired
+ private BikeRepairJoinMapper bikeRepairJoinMapper;
+
+ @Autowired
+ SystemDictDataBiz systemDictDataBiz;
@Autowired
private MultifileMapper multifileMapper;
@@ -93,83 +106,69 @@
QueryWrapper<BikeRepair> wrapper = new QueryWrapper<>(bikeRepair);
return bikeRepairMapper.selectList(wrapper);
}
-
+
@Override
- public PageData<BikeRepair> findPage(PageWrap<BikeRepair> pageWrap) {
+ public PageData<BikeRepairDTO> findPage(PageWrap<BikeRepairQuery> pageWrap) {
IPage<BikeRepair> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<BikeRepair> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(BikeRepair::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(BikeRepair::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(BikeRepair::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(BikeRepair::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(BikeRepair::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(BikeRepair::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(BikeRepair::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(BikeRepair::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getBinkeId() != null) {
- queryWrapper.lambda().eq(BikeRepair::getBinkeId, pageWrap.getModel().getBinkeId());
- }
- if (pageWrap.getModel().getLongitude() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLongitude, pageWrap.getModel().getLongitude());
- }
- if (pageWrap.getModel().getLatitude() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLatitude, pageWrap.getModel().getLatitude());
- }
- if (pageWrap.getModel().getAddr() != null) {
- queryWrapper.lambda().eq(BikeRepair::getAddr, pageWrap.getModel().getAddr());
- }
- if (pageWrap.getModel().getParamId() != null) {
- queryWrapper.lambda().eq(BikeRepair::getParamId, pageWrap.getModel().getParamId());
- }
- if (pageWrap.getModel().getParam() != null) {
- queryWrapper.lambda().eq(BikeRepair::getParam, pageWrap.getModel().getParam());
+ if (pageWrap.getModel().getCreateDateStart() != null
+ && pageWrap.getModel().getCreateDateEnd() != null) {
+ queryWrapper.ge(BikeRepair::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()));
+ queryWrapper.le(BikeRepair::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()));
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(BikeRepair::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(BikeRepair::getStatus, pageWrap.getModel().getStatus());
}
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(BikeRepair::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
+ .leftJoin(Bikes.class,Bikes::getId,BikeRepair::getBinkeId)
+ .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
+ .leftJoin("base_param bpp on b.param_id = bp.id and bp.type = 1");
+ queryWrapper.selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
+ .selectAs(BikeRepair::getLinkname,BikeRepairDTO::getLinkname)
+ .selectAs(BikeRepair::getLinkphone,BikeRepairDTO::getLinkphone)
+ .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
+ .selectAs(BikeRepair::getCreateDate,BikeRepairDTO::getCreateDate)
+ .selectAs(BikeRepair::getStatus,BikeRepairDTO::getStatus)
+ .selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName)
+ .select("bpp.name as problemName");
+ queryWrapper.like(!StringUtils.isEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
+ .like(!StringUtils.isEmpty(pageWrap.getModel().getBikeId()),Bikes::getId,pageWrap.getModel().getBikeId())
+ .eq(!StringUtils.isEmpty(pageWrap.getModel().getStatus()),BikeRepair::getStatus,pageWrap.getModel().getStatus())
+ .ge(Objects.nonNull(pageWrap.getModel().getCreateDateStart()),
+ BikeRepair::getCreateDate,
+ Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
+ .le(Objects.nonNull(pageWrap.getModel().getCreateDateEnd()),
+ BikeRepair::getCreateDate,
+ Utils.Date.getStart(pageWrap.getModel().getCreateDateEnd()));
+ return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper));
+ }
+
+ @Override
+ public BikeRepairProblemDTO getBikeRepairProblemDTO(String id) {
+ BikeRepairProblemDTO bikeRepairProblemDTO = new BikeRepairProblemDTO();
+
+ BikeRepair bikeRepair = bikeRepairMapper.selectById(id);
+ bikeRepairProblemDTO.setParam(bikeRepair.getParam());
+
+// multifileMapper.multifile);
+ QueryWrapper<Multifile> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Multifile::getObjId,id)
+ .eq(Multifile::getObjType,Constants.ZERO)
+ .eq(Multifile::getIsdeleted,Constants.ZERO);
+ List<Multifile> multifiles = multifileMapper.selectList(wrapper);
+ //TODO 闇�瑕佷慨鏀�
+ String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode();
+ String projectFile = systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECT_FILE).getCode();
+ if (!CollectionUtils.isEmpty(multifiles)){
+ multifiles.forEach(s->{
+ s.setFileurlfull(path+projectFile+s.getFileurl());
+ });
+ bikeRepairProblemDTO.setList(multifiles);
}
- if (pageWrap.getModel().getLinkname() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLinkname, pageWrap.getModel().getLinkname());
- }
- if (pageWrap.getModel().getLinkphone() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLinkphone, pageWrap.getModel().getLinkphone());
- }
- if (pageWrap.getModel().getDealUser() != null) {
- queryWrapper.lambda().eq(BikeRepair::getDealUser, pageWrap.getModel().getDealUser());
- }
- if (pageWrap.getModel().getDealDate() != null) {
- queryWrapper.lambda().ge(BikeRepair::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
- queryWrapper.lambda().le(BikeRepair::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
- }
- if (pageWrap.getModel().getDealInfo() != null) {
- queryWrapper.lambda().eq(BikeRepair::getDealInfo, pageWrap.getModel().getDealInfo());
- }
- if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(BikeRepair::getContent, pageWrap.getModel().getContent());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(bikeRepairMapper.selectPage(page, queryWrapper));
+
+ return null;
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index e2c3aaf..bd46ad9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -593,6 +593,7 @@
Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
if (durationSum > pricingRule.getMemberRides().getBaseTime()){
BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
+ //TODO 鍙栬瘉
BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())).divide(new BigDecimal(pricingRule.getMemberRides().getUnitTime())).setScale(0,BigDecimal.ROUND_CEILING));
ridesDetailResponse.setAmount(basePrice.add(multiply));
}else {
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 95be646..24230ce 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
@@ -1,5 +1,9 @@
package com.doumee.service.business.impl;
+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.Utils;
@@ -10,10 +14,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.Date;
import java.util.List;
/**
@@ -29,6 +35,27 @@
@Override
public String create(Sites sites) {
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ QueryWrapper<Sites> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Sites::getCode,sites.getCode());
+ Integer count = sitesMapper.selectCount(wrapper);
+ if (count > 0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绔欑偣缂栧彿宸插瓨鍦�");
+ }
+ Sites insert = new Sites();
+ insert.setCreateDate(new Date());
+ insert.setCreator(principal.getId());
+ insert.setEditDate(new Date());
+ insert.setEditor(principal.getId());
+ insert.setIsdeleted(Constants.ZERO);
+ insert.setInfo(sites.getInfo());
+ insert.setName(sites.getName());
+ insert.setCode(sites.getCode());
+ insert.setStatus(sites.getStatus());
+ insert.setLockNum(sites.getLockNum());
+ insert.setIp(sites.getIp());
sitesMapper.insert(sites);
return sites.getId();
}
@@ -54,7 +81,14 @@
@Override
public void updateById(Sites sites) {
- sitesMapper.updateById(sites);
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Sites update = new Sites();
+ update.setCreateDate(new Date());
+ update.setEditor(principal.getId());
+ update.setName(sites.getName());
+ update.setLockNum(sites.getLockNum());
+ update.setIp(sites.getIp());
+ sitesMapper.updateById(update);
}
@Override
@@ -83,7 +117,7 @@
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
return sitesMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Sites> findPage(PageWrap<Sites> pageWrap) {
IPage<Sites> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
--
Gitblit v1.9.3