From a48b7ccf12d7539a9b34084b9ca95f4ff442551e Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 31 May 2024 21:52:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=95=B0=E6=8D=AE=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/receive/ReceiveController.java | 1 + .../ruoyi/common/annotation/DataScope.java | 7 ++- .../common/core/domain/BaseEntityPlus.java | 54 ++++++++++++++++ .../framework/aspectj/DataScopeAspect.java | 6 ++ .../com/ruoyi/system/domain/AsDevice.java | 3 +- .../com/ruoyi/system/domain/EtAdminOrder.java | 4 ++ .../ruoyi/system/domain/EtCapitalFlow.java | 3 + .../java/com/ruoyi/system/domain/EtFault.java | 4 ++ .../ruoyi/system/domain/EtOperatingArea.java | 3 +- .../impl/AsArticleClassifyServiceImpl.java | 2 + .../service/impl/AsArticleServiceImpl.java | 2 + .../service/impl/AsDeviceServiceImpl.java | 22 ++++--- .../service/impl/EtAdminOrderServiceImpl.java | 2 + .../impl/EtCapitalFlowServiceImpl.java | 3 + .../service/impl/EtFaultServiceImpl.java | 2 + .../impl/EtOperatingAreaServiceImpl.java | 2 + .../service/impl/EtOrderServiceImpl.java | 4 +- .../mapper/system/AsArticleClassifyMapper.xml | 22 +++---- .../mapper/system/AsArticleMapper.xml | 16 +++-- .../mapper/system/AsDeviceMapper.xml | 30 +++++---- .../mapper/system/EtAdminOrderMapper.xml | 48 ++++++++------ .../mapper/system/EtCapitalFlowMapper.xml | 34 +++++----- .../resources/mapper/system/EtFaultMapper.xml | 21 ++++--- .../mapper/system/EtOperatingAreaMapper.xml | 20 ++++-- .../resources/mapper/system/EtOrderMapper.xml | 63 ++++++++++--------- 25 files changed, 260 insertions(+), 118 deletions(-) create mode 100644 electripper-common/src/main/java/com/ruoyi/common/core/domain/BaseEntityPlus.java diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java index 4da45a9..f09e623 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java @@ -204,6 +204,7 @@ public class ReceiveController { adminOrder.setSn(device.getSn()); adminOrder.setBeforeElectric(Integer.parseInt(device.getRemainingPower())); adminOrder.setOrderNo(IdUtils.randomUUID2()); + adminOrder.setAreaId(area.getAreaId()); adminOrder.setStatus(ServiceConstants.REPLACEMENT_ELECTRICITY_STATUS_UNDER_WAY); adminOrder.setIsEffective(ServiceConstants.REPLACEMENT_ELECTRICITY_IS_EFFECTIVE_YES); SysUser sysUser = sysUserService.selectUserByUserName("wx");//获取用户名为“wx”的维修人员 diff --git a/electripper-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/electripper-common/src/main/java/com/ruoyi/common/annotation/DataScope.java index be49c80..c167e97 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/electripper-common/src/main/java/com/ruoyi/common/annotation/DataScope.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 数据权限过滤注解 - * + * * @author ruoyi */ @Target(ElementType.METHOD) @@ -30,4 +30,9 @@ public @interface DataScope * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@ss获取，多个权限用逗号分隔开来 */ public String permission() default ""; + + /** + * 运营区表的别名 + */ + String areaAlias() default ""; } diff --git a/electripper-common/src/main/java/com/ruoyi/common/core/domain/BaseEntityPlus.java b/electripper-common/src/main/java/com/ruoyi/common/core/domain/BaseEntityPlus.java new file mode 100644 index 0000000..1623cf6 --- /dev/null +++ b/electripper-common/src/main/java/com/ruoyi/common/core/domain/BaseEntityPlus.java @@ -0,0 +1,54 @@ +package com.ruoyi.common.core.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * Entity基类（mybatis-plus） + * + * @author ruoyi + */ +public class BaseEntityPlus implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 搜索值 */ + @JsonIgnore + @TableField(exist = false) + private String searchValue; + + /** 请求参数 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params; + + public String getSearchValue() + { + return searchValue; + } + + public void setSearchValue(String searchValue) + { + this.searchValue = searchValue; + } + + + public Map getParams() + { + if (params == null) + { + params = new HashMap<>(); + } + return params; + } + + public void setParams(Map params) + { + this.params = params; + } +} diff --git a/electripper-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/electripper-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index 1bc2f69..2104531 100644 --- a/electripper-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/electripper-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -2,6 +2,9 @@ package com.ruoyi.framework.aspectj; import java.util.ArrayList; import java.util.List; + +import cn.hutool.core.util.StrUtil; +import com.ruoyi.common.core.domain.BaseEntityPlus; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; @@ -155,6 +158,9 @@ public class DataScopeAspect { BaseEntity baseEntity = (BaseEntity) params; baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); + }else if(StringUtils.isNotNull(params) && params instanceof BaseEntityPlus){ + BaseEntityPlus baseEntity = (BaseEntityPlus) params; + baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); } } } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java b/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java index 863d880..5636536 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntityPlus; import lombok.Data; import java.io.Serializable; @@ -20,7 +21,7 @@ import java.util.List; */ @Data @TableName(value = "et_device") -public class AsDevice implements Serializable{ +public class AsDevice extends BaseEntityPlus implements Serializable { private static final long serialVersionUID = 1L; /** id */ diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtAdminOrder.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtAdminOrder.java index a57c837..ac4b38c 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtAdminOrder.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtAdminOrder.java @@ -31,6 +31,10 @@ public class EtAdminOrder extends BaseEntity @Excel(name = "设备mac") private String deviceMac; + /** 区域id */ + @Excel(name = "区域id") + private Long areaId; + /** 设备sn */ @Excel(name = "设备sn") private String sn; diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java index 8a9c426..604e2ab 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java @@ -26,6 +26,9 @@ public class EtCapitalFlow extends BaseEntity @Excel(name = "区域") private Long areaId; + @Excel(name = "区域名称") + private String areaName; + /** 关联订单号 */ @Excel(name = "关联订单号") private String orderNo; diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtFault.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtFault.java index 22024ab..6955541 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtFault.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtFault.java @@ -24,6 +24,10 @@ public class EtFault extends BaseEntity @Excel(name = "用户ID") private Long userId; + /** 区域id */ + @Excel(name = "区域id") + private Long areaId; + /** 用户名称 */ @Excel(name = "用户名称") private String userName; diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java index 954adb6..a82014b 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntityPlus; import com.ruoyi.common.mybatis.MyGeometryTypeHandler; import lombok.Data; @@ -21,7 +22,7 @@ import java.util.Date; */ @Data @TableName(value = "et_operating_area") -public class EtOperatingArea implements Serializable +public class EtOperatingArea extends BaseEntityPlus implements Serializable { private static final long serialVersionUID = 1L; diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleClassifyServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleClassifyServiceImpl.java index 0e456ff..b50100a 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleClassifyServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleClassifyServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.AsArticleClassify; @@ -37,6 +38,7 @@ public class AsArticleClassifyServiceImpl implements IAsArticleClassifyService * @return 分类信息集合 */ @Override + @DataScope(deptAlias = "d") public List selectClassifyList(AsArticleClassify classify) { return articleClassifyMapper.selectClassifyList(classify); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleServiceImpl.java index 97c8f7e..f90f6d1 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.system.domain.EtArticle; import com.ruoyi.system.mapper.AsArticleMapper; @@ -49,6 +50,7 @@ public class AsArticleServiceImpl implements IAsArticleService * @return 文章 */ @Override + @DataScope(deptAlias = "d") public List selectAsArticleList(EtArticle etArticle) { List etArticles = asArticleMapper.selectAsArticleList(etArticle); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index aea11a2..f1feb2a 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.constant.ServiceConstants; @@ -129,7 +130,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i public AsDevice selectAsDeviceBySn(String sn) { AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); if (ObjectUtil.isNull(asDevice)) { - throw new ServiceException("设备不存在"); + throw new ServiceException("设备不存在："+ sn); } Long areaId = asDevice.getAreaId(); EtOperatingArea etOperatingArea; @@ -164,6 +165,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i * @return 设备 */ @Override + @DataScope(deptAlias = "d") public List selectAsDeviceList(AsDevice asDevice) { List asDevices = asDeviceMapper.selectAsDeviceList(asDevice); @@ -769,6 +771,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i int delay = 60 * area.getTimeoutMinutes(); //定时取消预约 scheduledExecutorService.schedule(() -> { + log.error("【车辆超时预约】系统自动取消"); //订单更新最后预约时间，并结束订单，做超出预约时间标记 order.setStatus(ServiceConstants.ORDER_STATUS_CANCEL_APPOINTMENT); order.setAppointmentEndTime(new Date()); @@ -780,7 +783,15 @@ public class AsDeviceServiceImpl extends ServiceImpl i order.setTotalFee(fee); int update = etOrderService.updateEtOrder(order); if(update==0){ - throw new ServiceException("【车辆预约】:更新订单状态失败"); + throw new ServiceException("【车辆超时预约】:更新订单状态失败"); + } + // 改变车辆状态 + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); + int device = asDeviceMapper.updateAsDevice(asDevice); + if(device==0){ + log.error("【车辆超时预约】更新车辆状态失败"); + throw new ServiceException("【车辆超时预约】更新车辆状态失败"); } }, delay, TimeUnit.SECONDS); return orderResponse; @@ -802,13 +813,6 @@ public class AsDeviceServiceImpl extends ServiceImpl i //1.发送开锁命令并更新车辆状态 String token = Token.getToken(); sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_CLOSE,"取消预约关锁"); -// //间隔1秒 -// try { -// Thread.sleep(500); -// } catch (InterruptedException ex) { -// ex.printStackTrace(); -// } -// sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_PLAY8,"取消预约关锁播报"); /** 5.记录行程*/ int tripLog = tripLogService.tripLog(order.getOrderNo(),order.getSn(),ServiceConstants.TRIP_LOG_TYPE_UNLOCK_RIDE); if(tripLog==0){ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java index 23c63f9..44fe954 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl; import java.util.List; import cn.hutool.core.util.ObjectUtil; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.core.domain.entity.AsUser; import com.ruoyi.common.core.domain.entity.SysUser; @@ -85,6 +86,7 @@ public class EtAdminOrderServiceImpl implements IEtAdminOrderService * @return 系统工单 */ @Override + @DataScope(deptAlias = "d") public List selectEtAdminOrderList(EtAdminOrder etAdminOrder) { List etAdminOrders = etAdminOrderMapper.selectEtAdminOrderList(etAdminOrder); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java index eee94bd..17dc2b7 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,6 +52,7 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService * @return 资金流水 */ @Override + @DataScope(deptAlias = "d") public List selectEtCapitalFlowList(EtCapitalFlow etCapitalFlow) { return etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFaultServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFaultServiceImpl.java index c796305..385c12f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFaultServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFaultServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson2.JSON; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.core.domain.entity.AsUser; import com.ruoyi.common.core.domain.entity.SysUser; @@ -101,6 +102,7 @@ public class EtFaultServiceImpl implements IEtFaultService * @return 故障上报 */ @Override + @DataScope(deptAlias = "d") public List selectEtFaultList(EtFault etFault) { List etFaults = etFaultMapper.selectEtFaultList(etFault); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java index a9b495d..9b96409 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.AsUser; import com.ruoyi.common.core.domain.entity.SysDictType; @@ -79,6 +80,7 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl selectEtOperatingAreaList(EtOperatingArea etOperatingArea) { diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java index 58b61ae..5313596 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.constant.ServiceConstants; @@ -189,7 +190,7 @@ public class EtOrderServiceImpl implements IEtOrderService /** * 查询订单列表 * 车型 - * 品牌商 + * 品牌商 * 运营商 * 满电电压 Full voltage * 亏电电压 Low voltage @@ -200,6 +201,7 @@ public class EtOrderServiceImpl implements IEtOrderService * @return 订单 已结束 */ @Override + @DataScope(deptAlias = "d") public List selectEtOrderList(EtOrder etOrder) { String[] statusList = etOrder.getStatusList(); diff --git a/electripper-system/src/main/resources/mapper/system/AsArticleClassifyMapper.xml b/electripper-system/src/main/resources/mapper/system/AsArticleClassifyMapper.xml index 0e5eeae..d8a4885 100644 --- a/electripper-system/src/main/resources/mapper/system/AsArticleClassifyMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/AsArticleClassifyMapper.xml @@ -20,36 +20,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.classify_id, d.parent_id, d.ancestors, d.classify_name, d.order_num, d.status, d.del_flag, d.create_by, d.create_time - from et_article_classify d + select ac.classify_id, ac.parent_id, ac.ancestors, ac.classify_name, ac.order_num, ac.status, ac.del_flag, ac.create_by, ac.create_time + from et_article_classify ac - select a.article_id, a.classify_id, a.title, a.logo, a.master_picture, a.tag,a.is_hot, a.introduction, a.content, a.author, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, ac.classify_name from et_article a + select a.article_id, a.area_id, a.classify_id, a.title, a.logo, a.master_picture, a.tag,a.is_hot, a.introduction, a.content, a.author, + a.create_by, a.create_time, a.update_by, a.update_time, a.remark, ac.classify_name from et_article a left join et_article_classify ac on ac.classify_id = a.classify_id - - and a.classify_id = #{classifyId} - and a.title like concat('%', #{title}, '%') - and a.is_hot = #{isHot} - + inner join et_area_dept ad on ad.area_id = a.area_id + inner join sys_dept d on d.dept_id = ad.dept_id + where 1 = 1 + and a.classify_id = #{classifyId} + and a.title like concat('%', #{title}, '%') + and a.is_hot = #{isHot} + + ${params.dataScope} order by a.create_time desc diff --git a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml index b1a5c2c..6c02894 100644 --- a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml @@ -37,18 +37,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - and order_no like concat('%', #{orderNo}, '%') - and device_mac like concat('%', #{deviceMac}, '%') - and sn like concat('%', #{sn}, '%') - and admin_id = #{adminId} - and before_electric = #{beforeElectric} - and after_electric = #{afterElectric} - and open_time = #{openTime} - and close_time = #{closeTime} - and type = #{type} - and fault_id = #{faultId} - and repair_type = #{repairType} - and status = #{status} - and is_success = #{isSuccess} - and is_effective = #{isEffective} - and address = #{address} - and complete_time = #{completeTime} - + select ao.id, ao.area_id, ao.order_no, ao.device_mac, ao.sn, ao.admin_id, ao.before_electric, ao.after_electric, ao.open_time, ao.close_time, ao.type, + ao.fault_id, ao.repair_type, ao.status, ao.is_success, ao.is_effective, ao.address, ao.complete_time, ao.create_time, ao.remark from et_admin_order ao + inner join et_area_dept ad on ad.area_id = ao.area_id + inner join sys_dept d on d.dept_id = ad.dept_id + where 1 = 1 + and ao.order_no like concat('%', #{orderNo}, '%') + and ao.device_mac like concat('%', #{deviceMac}, '%') + and ao.sn like concat('%', #{sn}, '%') + and ao.admin_id = #{adminId} + and ao.before_electric = #{beforeElectric} + and ao.after_electric = #{afterElectric} + and ao.open_time = #{openTime} + and ao.close_time = #{closeTime} + and ao.type = #{type} + and ao.fault_id = #{faultId} + and ao.repair_type = #{repairType} + and ao.status = #{status} + and ao.is_success = #{isSuccess} + and ao.is_effective = #{isEffective} + and ao.address = #{address} + and ao.complete_time = #{completeTime} + + ${params.dataScope} - - - and area_id = #{areaId} - and order_no = #{orderNo} - and out_trade_no = #{outTradeNo} - and type = #{type} - and bus_type = #{busType} - and amount = #{amount} - and handling_charge = #{handlingCharge} - and operator_dividend = #{operatorDividend} - and operator_balance = #{operatorBalance} - and partner_dividend = #{partnerDividend} - and pay_type = #{payType} - + select cf.flow_id, cf.area_id, cf.order_no, cf.out_trade_no, cf.type, cf.bus_type, cf.amount, cf.handling_charge, + cf.operator_dividend, cf.operator_balance, cf.partner_dividend, cf.pay_type, cf.create_time,a.area_name from et_capital_flow cf + inner join et_operating_area a on a.area_id = cf.area_id + inner join et_area_dept ad on ad.area_id = cf.area_id + inner join sys_dept d on d.dept_id = ad.dept_id + where 1 = 1 + and cf.area_id = #{areaId} + and cf.order_no = #{orderNo} + and cf.out_trade_no = #{outTradeNo} + and cf.type = #{type} + and cf.bus_type = #{busType} + and cf.amount = #{amount} + and cf.handling_charge = #{handlingCharge} + and cf.operator_dividend = #{operatorDividend} + and cf.operator_balance = #{operatorBalance} + and cf.partner_dividend = #{partnerDividend} + and cf.pay_type = #{payType} + + ${params.dataScope} - - - and user_id = #{userId} - and type = #{type} - and status = #{status} - + select f.fault_id, f.area_id, f.user_id, f.device_mac, f.type, f.create_time, f.picture, f.detail, f.order_id, f.status from et_fault f + inner join et_area_dept ad on ad.area_id = f.area_id + inner join sys_dept d on d.dept_id = ad.dept_id + where 1 = 1 + and f.user_id = #{userId} + and f.type = #{type} + and f.status = #{status} + + ${params.dataScope} - - - and area_name like concat('%', #{areaName}, '%') - + select a.area_id, a.area_name, AsText(a.boundary) boundary, + a.boundary_str, a.longitude, a.latitude, a.create_by, a.create_time, + a.contact, a.phone, a.status, a.area_time, a.service_phone, a.slogan, a.province, a.city, + a.county, a.area_out_outage, a.parking_out_dispatch, a.area_out_dispatch, + a.no_riding_outage, a.authentication, a.msg_switch, a.undercharge, a.error, a.agreement, a.deposit, + a.outage, a.appointment_service_fee, a.dispatch_fee, a.vehicle_management_fee, a.timeout_minutes, + a.auto_replacement_order, a.area_time_start, a.area_time_end from et_operating_area a + inner join et_area_dept ad on ad.area_id = a.area_id + inner join sys_dept d on d.dept_id = ad.dept_id + where 1 = 1 + and a.area_name like concat('%', #{areaName}, '%') + + ${params.dataScope}