qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 数据隔离

Browse Source
This commit is contained in:
邱贞招 2024-05-31 21:52:08 +08:00
parent da8521bb6d
commit a48b7ccf12
25 changed files with 260 additions and 118 deletions

1
electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
View File

@ -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”的维修人员

7
electripper-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
View File

@ -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 "";
}

54
electripper-common/src/main/java/com/ruoyi/common/core/domain/BaseEntityPlus.java Normal file
View File

@ -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<String, Object> params;
public String getSearchValue()
{
return searchValue;
}
public void setSearchValue(String searchValue)
{
this.searchValue = searchValue;
}
public Map<String, Object> getParams()
{
if (params == null)
{
params = new HashMap<>();
}
return params;
}
public void setParams(Map<String, Object> params)
{
this.params = params;
}
}

6
electripper-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
View File

@ -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) + ")");
}
}
}

3
electripper-system/src/main/java/com/ruoyi/system/domain/AsDevice.java
View File

@ -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 */

4
electripper-system/src/main/java/com/ruoyi/system/domain/EtAdminOrder.java
View File

@ -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;

3
electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java
View File

@ -26,6 +26,9 @@ public class EtCapitalFlow extends BaseEntity
@Excel(name = "区域")
private Long areaId;
@Excel(name = "区域名称")
private String areaName;
/** 关联订单号 */
@Excel(name = "关联订单号")
private String orderNo;

4
electripper-system/src/main/java/com/ruoyi/system/domain/EtFault.java
View File

@ -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;

3
electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java
View File

@ -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;

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleClassifyServiceImpl.java
View File

@ -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<AsArticleClassify> selectClassifyList(AsArticleClassify classify)
{
return articleClassifyMapper.selectClassifyList(classify);

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleServiceImpl.java
View File

@ -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<EtArticle> selectAsArticleList(EtArticle etArticle)
{
List<EtArticle> etArticles = asArticleMapper.selectAsArticleList(etArticle);

22
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -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<AsDeviceMapper, AsDevice> 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<AsDeviceMapper, AsDevice> i
* @return 设备
*/
@Override
@DataScope(deptAlias = "d")
public List<AsDevice> selectAsDeviceList(AsDevice asDevice)
{
List<AsDevice> asDevices = asDeviceMapper.selectAsDeviceList(asDevice);
@ -769,6 +771,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> 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<AsDeviceMapper, AsDevice> 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<AsDeviceMapper, AsDevice> 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){

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java
View File

@ -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<EtAdminOrder> selectEtAdminOrderList(EtAdminOrder etAdminOrder)
{
List<EtAdminOrder> etAdminOrders = etAdminOrderMapper.selectEtAdminOrderList(etAdminOrder);

3
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java
View File

@ -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<EtCapitalFlow> selectEtCapitalFlowList(EtCapitalFlow etCapitalFlow)
{
return etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow);

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFaultServiceImpl.java
View File

@ -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<EtFault> selectEtFaultList(EtFault etFault)
{
List<EtFault> etFaults = etFaultMapper.selectEtFaultList(etFault);

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java
View File

@ -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<EtOperatingAreaMappe
* @param etOperatingArea 运营区
* @return 运营区
*/
@DataScope(deptAlias = "d")
@Override
public List<EtOperatingArea> selectEtOperatingAreaList(EtOperatingArea etOperatingArea)
{

4
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -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<EtOrder> selectEtOrderList(EtOrder etOrder)
{
String[] statusList = etOrder.getStatusList();

22
electripper-system/src/main/resources/mapper/system/AsArticleClassifyMapper.xml
View File

@ -20,36 +20,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectClassifyVo">
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
</sql>
<select id="selectClassifyList" parameterType="AsArticleClassify" resultMap="AsArticleClassifyResult">
<include refid="selectClassifyVo"/>
where d.del_flag = '0'
where ac.del_flag = '0'
<if test="classifyId != null and classifyId != 0">
AND classify_id = #{classifyId}
AND ac.classify_id = #{classifyId}
</if>
<if test="parentId != null and parentId != 0">
AND parent_id = #{parentId}
AND ac.parent_id = #{parentId}
</if>
<if test="classifyName != null and classifyName != ''">
AND classify_name like concat('%', #{classifyName}, '%')
AND ac.classify_name like concat('%', #{classifyName}, '%')
</if>
<if test="status != null and status != ''">
AND status = #{status}
AND ac.status = #{status}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
order by d.parent_id, d.order_num
order by ac.parent_id, ac.order_num
</select>
<select id="selectClassifyById" parameterType="Long" resultMap="AsArticleClassifyResult">
select d.classify_id, d.parent_id, d.ancestors, d.classify_name, d.order_num, d.status,
(select classify_name from et_article_classify where classify_id = d.parent_id) parent_name
select ac.classify_id, ac.parent_id, ac.ancestors, ac.classify_name, ac.order_num, ac.status,
(select classify_name from et_article_classify where classify_id = ac.parent_id) parent_name
from et_article_classify d
where d.classify_id = #{classifyId}
where ac.classify_id = #{classifyId}
</select>
<select id="checkClassifyExistArticle" parameterType="Long" resultType="int">

16
electripper-system/src/main/resources/mapper/system/AsArticleMapper.xml
View File

@ -37,13 +37,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectAsArticleList" parameterType="EtArticle" resultMap="AsArticleResult">
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
<where>
<if test="classifyId != null and classifyId != ''"> and a.classify_id = #{classifyId}</if>
<if test="title != null and title != ''"> and a.title like concat('%', #{title}, '%')</if>
<if test="isHot != null and isHot != ''"> and a.is_hot = #{isHot}</if>
</where>
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
<if test="classifyId != null and classifyId != ''"> and a.classify_id = #{classifyId}</if>
<if test="title != null and title != ''"> and a.title like concat('%', #{title}, '%')</if>
<if test="isHot != null and isHot != ''"> and a.is_hot = #{isHot}</if>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc
</select>

30
electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml
View File

@ -37,18 +37,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectAsDeviceList" parameterType="AsDevice" resultMap="AsDeviceResult">
<include refid="selectAsDeviceVo"/>
<where>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="mac != null and mac != ''"> and mac = #{mac}</if>
<if test="sn != null and sn != ''"> and sn = #{sn}</if>
<if test="vehicleNum != null and vehicleNum != ''"> and vehicle_num = #{vehicleNum}</if>
<if test="areaId != null and areaId != ''"> and area_id = #{areaId}</if>
<if test="modelId != null and modelId != ''"> and model_id = #{modelId}</if>
<if test="onlineStatus != null and onlineStatus != ''"> and online_status = #{onlineStatus}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="lockStatus != null and lockStatus != ''"> and lock_status = #{lockStatus}</if>
</where>
select de.device_id, de.picture, de.device_name, de.mac, de.sn, de.model_id, de.vehicle_num, de.area_id,
de.activation_time, de.online_status, de.create_by, de.create_time, de.update_by,
de.update_time, de.last_time, de.remark, de.status, de.lock_status, de.location,
de.remaining_power, de.voltage, de.qrcode, de.longitude, de.latitude, de.is_area_out_outage from et_device de
inner join et_area_dept ad on ad.area_id = de.area_id
inner join sys_dept d on d.dept_id = ad.dept_id
where 1 = 1
<if test="deviceName != null and deviceName != ''"> and de.device_name like concat('%', #{deviceName}, '%')</if>
<if test="mac != null and mac != ''"> and de.mac = #{mac}</if>
<if test="sn != null and sn != ''"> and de.sn = #{sn}</if>
<if test="vehicleNum != null and vehicleNum != ''"> and de.vehicle_num = #{vehicleNum}</if>
<if test="areaId != null and areaId != ''"> and de.area_id = #{areaId}</if>
<if test="modelId != null and modelId != ''"> and de.model_id = #{modelId}</if>
<if test="onlineStatus != null and onlineStatus != ''"> and de.online_status = #{onlineStatus}</if>
<if test="status != null and status != ''"> and de.status = #{status}</if>
<if test="lockStatus != null and lockStatus != ''"> and de.lock_status = #{lockStatus}</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectAsDeviceByDeviceId" parameterType="Long" resultMap="AsDeviceResult">

48
electripper-system/src/main/resources/mapper/system/EtAdminOrderMapper.xml
View File

@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deviceMac" column="device_mac" />
<result property="sn" column="sn" />
<result property="adminId" column="admin_id" />
<result property="areaId" column="area_id" />
<result property="beforeElectric" column="before_electric" />
<result property="afterElectric" column="after_electric" />
<result property="openTime" column="open_time" />
@ -27,29 +28,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEtAdminOrderVo">
select id, order_no, device_mac, sn, admin_id, before_electric, after_electric, open_time, close_time, type, fault_id, repair_type, status, is_success, is_effective, address, complete_time, create_time, remark from et_admin_order
select id, order_no, area_id, device_mac, sn, admin_id, before_electric, after_electric, open_time, close_time, type, fault_id, repair_type, status, is_success, is_effective, address, complete_time, create_time, remark from et_admin_order
</sql>
<select id="selectEtAdminOrderList" parameterType="EtAdminOrder" resultMap="EtAdminOrderResult">
<include refid="selectEtAdminOrderVo"/>
<where>
<if test="orderNo != null and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
<if test="deviceMac != null and deviceMac != ''"> and device_mac like concat('%', #{deviceMac}, '%')</if>
<if test="sn != null and sn != ''"> and sn like concat('%', #{sn}, '%')</if>
<if test="adminId != null "> and admin_id = #{adminId}</if>
<if test="beforeElectric != null "> and before_electric = #{beforeElectric}</if>
<if test="afterElectric != null "> and after_electric = #{afterElectric}</if>
<if test="openTime != null "> and open_time = #{openTime}</if>
<if test="closeTime != null "> and close_time = #{closeTime}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="faultId != null and faultId != ''"> and fault_id = #{faultId}</if>
<if test="repairType != null and repairType != ''"> and repair_type = #{repairType}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="isSuccess != null and isSuccess != ''"> and is_success = #{isSuccess}</if>
<if test="isEffective != null and isEffective != ''"> and is_effective = #{isEffective}</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="completeTime != null "> and complete_time = #{completeTime}</if>
</where>
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
<if test="orderNo != null and orderNo != ''"> and ao.order_no like concat('%', #{orderNo}, '%')</if>
<if test="deviceMac != null and deviceMac != ''"> and ao.device_mac like concat('%', #{deviceMac}, '%')</if>
<if test="sn != null and sn != ''"> and ao.sn like concat('%', #{sn}, '%')</if>
<if test="adminId != null "> and ao.admin_id = #{adminId}</if>
<if test="beforeElectric != null "> and ao.before_electric = #{beforeElectric}</if>
<if test="afterElectric != null "> and ao.after_electric = #{afterElectric}</if>
<if test="openTime != null "> and ao.open_time = #{openTime}</if>
<if test="closeTime != null "> and ao.close_time = #{closeTime}</if>
<if test="type != null and type != ''"> and ao.type = #{type}</if>
<if test="faultId != null and faultId != ''"> and ao.fault_id = #{faultId}</if>
<if test="repairType != null and repairType != ''"> and ao.repair_type = #{repairType}</if>
<if test="status != null and status != ''"> and ao.status = #{status}</if>
<if test="isSuccess != null and isSuccess != ''"> and ao.is_success = #{isSuccess}</if>
<if test="isEffective != null and isEffective != ''"> and ao.is_effective = #{isEffective}</if>
<if test="address != null and address != ''"> and ao.address = #{address}</if>
<if test="completeTime != null "> and ao.complete_time = #{completeTime}</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectEtAdminOrderById" parameterType="Long" resultMap="EtAdminOrderResult">
@ -75,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceMac != null">device_mac,</if>
<if test="sn != null">sn,</if>
<if test="adminId != null">admin_id,</if>
<if test="areaId != null">area_id,</if>
<if test="beforeElectric != null">before_electric,</if>
<if test="afterElectric != null">after_electric,</if>
<if test="openTime != null">open_time,</if>
@ -95,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceMac != null">#{deviceMac},</if>
<if test="sn != null">#{sn},</if>
<if test="adminId != null">#{adminId},</if>
<if test="areaId != null">#{areaId},</if>
<if test="beforeElectric != null">#{beforeElectric},</if>
<if test="afterElectric != null">#{afterElectric},</if>
<if test="openTime != null">#{openTime},</if>
@ -118,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceMac != null">device_mac = #{deviceMac},</if>
<if test="sn != null">sn = #{sn},</if>
<if test="adminId != null">admin_id = #{adminId},</if>
<if test="areaId != null">area_id = #{areaId},</if>
<if test="beforeElectric != null">before_electric = #{beforeElectric},</if>
<if test="afterElectric != null">after_electric = #{afterElectric},</if>
<if test="openTime != null">open_time = #{openTime},</if>

34
electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
View File

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="EtCapitalFlow" id="EtCapitalFlowResult">
<result property="flowId" column="flow_id" />
<result property="areaId" column="area_id" />
<result property="areaName" column="area_name" />
<result property="orderNo" column="order_no" />
<result property="outTradeNo" column="out_trade_no" />
<result property="type" column="type" />
@ -25,20 +26,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectEtCapitalFlowList" parameterType="EtCapitalFlow" resultMap="EtCapitalFlowResult">
<include refid="selectEtCapitalFlowVo"/>
<where>
<if test="areaId != null "> and area_id = #{areaId}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="outTradeNo != null and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
<if test="amount != null "> and amount = #{amount}</if>
<if test="handlingCharge != null "> and handling_charge = #{handlingCharge}</if>
<if test="operatorDividend != null "> and operator_dividend = #{operatorDividend}</if>
<if test="operatorBalance != null "> and operator_balance = #{operatorBalance}</if>
<if test="partnerDividend != null "> and partner_dividend = #{partnerDividend}</if>
<if test="payType != null and payType != ''"> and pay_type = #{payType}</if>
</where>
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
<if test="areaId != null "> and cf.area_id = #{areaId}</if>
<if test="orderNo != null and orderNo != ''"> and cf.order_no = #{orderNo}</if>
<if test="outTradeNo != null and outTradeNo != ''"> and cf.out_trade_no = #{outTradeNo}</if>
<if test="type != null and type != ''"> and cf.type = #{type}</if>
<if test="busType != null and busType != ''"> and cf.bus_type = #{busType}</if>
<if test="amount != null "> and cf.amount = #{amount}</if>
<if test="handlingCharge != null "> and cf.handling_charge = #{handlingCharge}</if>
<if test="operatorDividend != null "> and cf.operator_dividend = #{operatorDividend}</if>
<if test="operatorBalance != null "> and cf.operator_balance = #{operatorBalance}</if>
<if test="partnerDividend != null "> and cf.partner_dividend = #{partnerDividend}</if>
<if test="payType != null and payType != ''"> and cf.pay_type = #{payType}</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectEtCapitalFlowByFlowId" parameterType="Long" resultMap="EtCapitalFlowResult">

21
electripper-system/src/main/resources/mapper/system/EtFaultMapper.xml
View File

@ -14,19 +14,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="detail" column="detail" />
<result property="orderId" column="order_id" />
<result property="status" column="status" />
<result property="areaId" column="area_id" />
</resultMap>
<sql id="selectEtFaultVo">
select fault_id, user_id, device_mac, type, create_time, picture, detail, order_id, status from et_fault
select fault_id, areaId, user_id, device_mac, type, create_time, picture, detail, order_id, status from et_fault
</sql>
<select id="selectEtFaultList" parameterType="EtFault" resultMap="EtFaultResult">
<include refid="selectEtFaultVo"/>
<where>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
</where>
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
<if test="userId != null "> and f.user_id = #{userId}</if>
<if test="type != null and type != ''"> and f.type = #{type}</if>
<if test="status != null and status != ''"> and f.status = #{status}</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectEtFaultByFaultId" parameterType="Long" resultMap="EtFaultResult">
@ -39,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="faultId != null">fault_id,</if>
<if test="userId != null">user_id,</if>
<if test="areaId != null">area_id,</if>
<if test="deviceMac != null">device_mac,</if>
<if test="type != null">type,</if>
<if test="createTime != null">create_time,</if>
@ -50,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="faultId != null">#{faultId},</if>
<if test="userId != null">#{userId},</if>
<if test="areaId != null">#{areaId},</if>
<if test="deviceMac != null">#{deviceMac},</if>
<if test="type != null">#{type},</if>
<if test="createTime != null">#{createTime},</if>
@ -64,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update et_fault
<trim prefix="SET" suffixOverrides=",">
<if test="userId != null">user_id = #{userId},</if>
<if test="areaId != null">area_id = #{areaId},</if>
<if test="deviceMac != null">device_mac = #{deviceMac},</if>
<if test="type != null">type = #{type},</if>
<if test="createTime != null">create_time = #{createTime},</if>

20
electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml
View File

@ -48,14 +48,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
contact, phone, status, area_time, service_phone, slogan, province,city,
county, area_out_outage, parking_out_dispatch, area_out_dispatch,
no_riding_outage, authentication, msg_switch, undercharge, error, agreement, deposit,
outage, appointment_service_fee, dispatch_fee, vehicle_management_fee, timeout_minutes, auto_replacement_order, area_time_start, area_time_end from et_operating_area
outage, appointment_service_fee, dispatch_fee, vehicle_management_fee, timeout_minutes,
auto_replacement_order, area_time_start, area_time_end from et_operating_area
</sql>
<select id="selectEtOperatingAreaList" parameterType="EtOperatingArea" resultMap="EtOperatingAreaResult">
<include refid="selectEtOperatingAreaVo"/>
<where>
<if test="areaName != null and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
</where>
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
<if test="areaName != null and areaName != ''"> and a.area_name like concat('%', #{areaName}, '%')</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectEtOperatingAreaByAreaId" parameterType="Long" resultMap="EtOperatingAreaResult">

63
electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
View File

@ -87,36 +87,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
et_operating_area oa ON o.area_id = oa.area_id
LEFT JOIN
et_user u ON u.user_id = o.user_id
<where>
<if test="orderNo != null and orderNo != ''"> and o.order_no like concat('%', #{orderNo}, '%')</if>
<if test="area != null and area != ''"> and oa.area_name like concat('%', #{area}, '%')</if>
<if test="userName != null and userName != ''"> and u.user_name like concat('%', #{userName}, '%')</if>
<if test="phonenumber != null and phonenumber != ''"> and u.phonenumber like concat('%', #{phonenumber}, '%')</if>
<if test="userId != null and userId != ''"> and u.user_id = #{userId}</if>
<if test="deviceMac != null and deviceMac != ''"> and o.device_mac like concat('%', #{deviceMac}, '%')</if>
<if test="sn != null and sn != ''"> and o.sn like concat('%', #{sn}, '%')</if>
<if test="type != null and type != ''"> and o.type = #{type}</if>
<if test="status != null and status != ''"> and o.status = #{status}</if>
<if test="paid != null and paid != ''"> and o.paid = #{paid}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
<if test="statusList != null">
AND o.status IN
<foreach item="item" index="index" collection="statusList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
inner join et_area_dept ad on ad.area_id = oa.area_id
inner join sys_dept d on d.dept_id = ad.dept_id
where 1 = 1
<if test="orderNo != null and orderNo != ''"> and o.order_no like concat('%', #{orderNo}, '%')</if>
<if test="area != null and area != ''"> and oa.area_name like concat('%', #{area}, '%')</if>
<if test="userName != null and userName != ''"> and u.user_name like concat('%', #{userName}, '%')</if>
<if test="phonenumber != null and phonenumber != ''"> and u.phonenumber like concat('%', #{phonenumber}, '%')</if>
<if test="userId != null and userId != ''"> and u.user_id = #{userId}</if>
<if test="deviceMac != null and deviceMac != ''"> and o.device_mac like concat('%', #{deviceMac}, '%')</if>
<if test="sn != null and sn != ''"> and o.sn like concat('%', #{sn}, '%')</if>
<if test="type != null and type != ''"> and o.type = #{type}</if>
<if test="status != null and status != ''"> and o.status = #{status}</if>
<if test="paid != null and paid != ''"> and o.paid = #{paid}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
<if test="statusList != null">
AND o.status IN
<foreach item="item" index="index" collection="statusList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectEtOrderByOrderId" parameterType="Long" resultMap="EtOrderResult">