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-06-13 15:03:23 +08:00
parent 4865f255e8
commit 23f6007487
25 changed files with 237 additions and 67 deletions

6
electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java
View File

@ -99,16 +99,16 @@ public class AppController extends BaseController
/**
* 根据定位获取运营区详细信息 device not subscribed
* 根据定位获取运营区详细信息
*/
@GetMapping(value = "/area/info")
public AjaxResult areaInfo(String longitude,String latitude, String deptId)
public AjaxResult areaInfo(String longitude,String latitude, String deptId,String sn)
{
if(StrUtil.isBlank(longitude) || StrUtil.isBlank(latitude)){
logger.info("没有经纬度参数：【longitude={}】，【latitude={}】",longitude,latitude);
return error("请传经纬度参数"+"【longitude="+longitude+"】，【latitude="+latitude+"】");
}
EtOperatingArea area = etOperatingAreaService.getAreaInfoByLocation(longitude,latitude,deptId);
EtOperatingArea area = etOperatingAreaService.getAreaInfoByLocation(longitude,latitude,deptId,sn);
return success(area);
}

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

@ -165,7 +165,10 @@ public class ReceiveController {
device.setVoltage(divide.toString());//电压
// 根据电压计算续航里程
EtModel model = etModelService.selectEtModelByModelId(device.getModelId());
Integer remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance());
Integer remainingMileage = 0;
if(StrUtil.isNotBlank(device.getVoltage())){
remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance());
}
Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百
device.setRemainingMileage(remainingMileage);
device.setRemainingPower(electricQuantity.toString());

4
electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsArticleController.java
View File

@ -41,7 +41,7 @@ public class AsArticleController extends BaseController
public TableDataInfo list(EtArticle etArticle)
{
startPage();
List<EtArticle> list = asArticleService.selectAsArticleList(etArticle);
List<EtArticle> list = asArticleService.selectAsArticleListByIsolate(etArticle);
return getDataTable(list);
}
@ -53,7 +53,7 @@ public class AsArticleController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, EtArticle etArticle)
{
List<EtArticle> list = asArticleService.selectAsArticleList(etArticle);
List<EtArticle> list = asArticleService.selectAsArticleListByIsolate(etArticle);
ExcelUtil<EtArticle> util = new ExcelUtil<EtArticle>(EtArticle.class);
util.exportExcel(response, list, "文章数据");
}

6
electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java
View File

@ -78,6 +78,9 @@ public class AsDeviceController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody AsDevice asDevice)
{
if(!asDeviceService.checkSNUnique(asDevice)){
return error("新增车辆'" + asDevice.getDeviceName() + "'失败，SN已存在");
}
return toAjax(asDeviceService.insertAsDevice(asDevice));
}
@ -89,6 +92,9 @@ public class AsDeviceController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody AsDevice asDevice)
{
if(!asDeviceService.checkSNUnique(asDevice)){
return error("修改车辆'" + asDevice.getDeviceName() + "'失败，SN已存在");
}
return toAjax(asDeviceService.updateAsDevice(asDevice));
}

2
electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -109,7 +109,7 @@ public class SysUserController extends BaseController
List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
ajax.put("areas", etOperatingAreaService.selectAreaAll());
ajax.put("areas", etOperatingAreaService.selectEtOperatingAreaListWithisolate(new EtOperatingArea()));
if (StringUtils.isNotNull(userId))
{
SysUser sysUser = userService.selectUserById(userId);

11
electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/AsUser.java
View File

@ -109,6 +109,17 @@ public class AsUser extends BaseEntity
/** 是否认证：0-未认证；1-已认证 */
public String isAuthentication;
/** 小程序名称*/
public String appName;
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public String getIsAuthentication() {
return isAuthentication;
}

33
electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View File

@ -63,9 +63,18 @@ public class SysDept extends BaseEntity
/** 是否开启分账 */
private String isProfitSharing;
/** 是否使用创享电动车小程序 */
private String isUsePlatformApp;
/** 域名 */
private String domain;
/** appid */
private String appid;
/** 小程序名称 */
private String appName;
/** appSecret */
private String appSecret;
@ -91,6 +100,30 @@ public class SysDept extends BaseEntity
return platformServiceFee;
}
public String getIsUsePlatformApp() {
return isUsePlatformApp;
}
public void setIsUsePlatformApp(String isUsePlatformApp) {
this.isUsePlatformApp = isUsePlatformApp;
}
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public void setPlatformServiceFee(String platformServiceFee) {
this.platformServiceFee = platformServiceFee;
}

4
electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@ -232,7 +232,7 @@ public class SysLoginService
throw new ServiceException("凭证无效");
}
phoneNumber = wxMaPhoneNumberInfo.getPhoneNumber();
user = asUserService.selectUserByPhone(phoneNumber);
user = asUserService.selectUserByWxopenid(openId);
if(ObjectUtils.isEmpty(user)){
AsUser asUser = new AsUser();
asUser.setUserName(phoneNumber);
@ -242,9 +242,11 @@ public class SysLoginService
asUser.setCreateTime(DateUtils.getNowDate());
asUser.setWxopenid(openId);
asUser.setAreaId(Long.parseLong(areaId));
asUser.setAppName(dept.getAppName());
int i = asUserService.insertUser(asUser);
user = asUser;
}else{
user.setAppName(dept.getAppName());
user.setAreaId(Long.parseLong(areaId));
int i = asUserService.updateUser(user);
}

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

@ -44,6 +44,11 @@ public class AsDevice extends BaseEntityPlus implements Serializable {
@Excel(name = "设备SN号")
private String sn;
/** 二维码文本 */
@Excel(name = "二维码文本")
@TableField(exist = false)
private String qrText;
/** 分区 */
@Excel(name = "分区id")
private Long areaId;

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

@ -48,6 +48,10 @@ public class EtOperatingArea extends BaseEntityPlus implements Serializable
// @TableField(exist = false)
private String boundaryStr;
/** 图片 */
@Excel(name = "图片")
private String picture;
/** 经度 */
@Excel(name = "经度")
private String longitude;

2
electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java
View File

@ -107,4 +107,6 @@ public interface AsDeviceMapper extends BaseMapper<AsDevice>
public int batchDisable(String[] sns);
AsDevice checkSNUnique(String sn);
}

10
electripper-system/src/main/java/com/ruoyi/system/service/IAsArticleService.java
View File

@ -28,6 +28,16 @@ public interface IAsArticleService
*/
public List<EtArticle> selectAsArticleList(EtArticle etArticle);
/**
* 查询文章列表（带数据隔离）
*
* @param etArticle 文章
* @return 文章集合
*/
public List<EtArticle> selectAsArticleListByIsolate(EtArticle etArticle);
/**
* 新增文章
*

5
electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java
View File

@ -246,6 +246,11 @@ public interface IAsDeviceService extends IService<AsDevice>
*/
boolean isOnline(String sn);
/**
* 判断是否重复
*/
boolean checkSNUnique(AsDevice asDevice);
// /**
// * 是否靠近运营区边界
// */

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

@ -95,7 +95,7 @@ public interface IEtOperatingAreaService extends IService<EtOperatingArea>
* @param deptId 运营商id
* @return 结果
*/
EtOperatingArea getAreaInfoByLocation(String longitude, String latitude,String deptId);
EtOperatingArea getAreaInfoByLocation(String longitude, String latitude,String deptId,String sn);
/**
* 根据部门ID获取运营区选择框列表

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

@ -51,6 +51,22 @@ public class AsArticleServiceImpl implements IAsArticleService
*/
@Override
@DataScope(deptAlias = "d")
public List<EtArticle> selectAsArticleListByIsolate(EtArticle etArticle)
{
List<EtArticle> etArticles = asArticleMapper.selectAsArticleList(etArticle);
for (EtArticle etArticle1 : etArticles) {
etArticle.setFormatCreateTime(DateUtils.getYYYY_MM_DD(etArticle1.getCreateTime()));
}
return etArticles;
}
/**
* 查询文章列表
*
* @param etArticle 文章 隔离
* @return 文章
*/
@Override
public List<EtArticle> selectAsArticleList(EtArticle etArticle)
{
List<EtArticle> etArticles = asArticleMapper.selectAsArticleList(etArticle);

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

@ -11,9 +11,13 @@ import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.constant.IotConstants;
import com.ruoyi.common.constant.ServiceConstants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.CommonUtil;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.map.GeoUtils;
import com.ruoyi.common.utils.onenet.IotUtil;
@ -88,6 +92,9 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
@Autowired
private ScheduledExecutorService scheduledExecutorService;
@Autowired
private IWxPayService wxPayService;
@Value(value = "${iot.iotUrl}")
private String iotUrl;
@ -147,8 +154,12 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
if(ObjectUtil.isNotNull(model)){
asDevice.setModel(model.getModel());
}
asDevice.setLocation(CommonUtil.getAddressByGeo(asDevice.getLongitude() + ","+asDevice.getLatitude()));
asDevice.setRemainingMileage(CommonUtil.getRemainingMileage(asDevice.getVoltage(),model.getFullVoltage(),model.getLowVoltage(),model.getFullEndurance()));
if(StrUtil.isNotBlank(asDevice.getLongitude()) && StrUtil.isNotBlank(asDevice.getLatitude())){
asDevice.setLocation(CommonUtil.getAddressByGeo(asDevice.getLongitude() + ","+asDevice.getLatitude()));
}
if(StrUtil.isNotBlank(asDevice.getVoltage())){
asDevice.setRemainingMileage(CommonUtil.getRemainingMileage(asDevice.getVoltage(),model.getFullVoltage(),model.getLowVoltage(),model.getFullEndurance()));
}
//正在进行中的订单
EtOrder order = new EtOrder();
order.setType(ServiceConstants.ORDER_TYPE_RIDING);
@ -220,6 +231,9 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
String typeName = sysDictDataService.selectDictLabel("as_device_status", status);
asDevice1.setStatusStr(typeName);
}
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
asDevice1.setQrText(sysDept.getDomain()+"?sn="+asDevice1.getSn());
//https://dianche.chuantewulian.cn?sn=https://dche.ccttiot.com?sn=3000900
}
return asDevices;
}
@ -1384,6 +1398,20 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
return false;
}
/**
* 检查SN是否唯一
*/
@Override
public boolean checkSNUnique(AsDevice asDevice) {
Long deviceId = StringUtils.isNull(asDevice.getDeviceId()) ? -1L : asDevice.getDeviceId();
AsDevice info = asDeviceMapper.checkSNUnique(asDevice.getSn());
if (StringUtils.isNotNull(info) && info.getDeviceId().longValue() != deviceId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
/**
* 判断是否靠近边界

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

@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.ServiceConstants;
@ -131,7 +132,9 @@ public class EtFaultServiceImpl implements IEtFaultService
throw new ServiceException("该设备不存在");
}
//解析地址，将地址保存数据库
etFault.setAddress(CommonUtil.getAddressByGeo(asDevice.getLongitude() + ","+asDevice.getLatitude()));
if(StrUtil.isNotBlank(asDevice.getLongitude()) && StrUtil.isNotBlank(asDevice.getLatitude())){
etFault.setAddress(CommonUtil.getAddressByGeo(asDevice.getLongitude() + ","+asDevice.getLatitude()));
}
etFault.setAreaId(asDevice.getAreaId());
etFault.setCreateTime(DateUtils.getNowDate());
setType(etFault);

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

@ -19,6 +19,7 @@ import com.ruoyi.common.utils.map.GeoUtils;
import com.ruoyi.system.domain.AsDevice;
import com.ruoyi.system.domain.EtAreaRule;
import com.ruoyi.system.domain.SysStudent;
import com.ruoyi.system.mapper.AsDeviceMapper;
import com.ruoyi.system.mapper.EtAreaRuleMapper;
import com.ruoyi.system.mapper.SysStudentMapper;
import com.ruoyi.system.service.IAsDeviceService;
@ -63,6 +64,9 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl<EtOperatingAreaMappe
@Resource
private IEtOperatingAreaService etOperatingAreaService;
@Resource
private AsDeviceMapper asDeviceMapper;
/**
* 查询运营区
@ -245,61 +249,69 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl<EtOperatingAreaMappe
* @param longitude 经度
* @param latitude 纬度
* @param deptId 运营商
* @param sn 设备sn
* @return 结果
*/
@Override
public EtOperatingArea getAreaInfoByLocation(String longitude, String latitude,String deptId) {
double lon = Double.parseDouble(longitude);
double lat = Double.parseDouble(latitude);
EtOperatingArea area1 = new EtOperatingArea();
area1.setDeptId(Long.parseLong(deptId));
List<EtOperatingArea> etOperatingAreas = etOperatingAreaService.selectEtOperatingAreaList(area1);
EtOperatingArea area = null;
for(EtOperatingArea etOperatingArea:etOperatingAreas){
String boundary = etOperatingArea.getBoundary();
if(StrUtil.isNotBlank(boundary)){
Geometry geometry = GeoUtils.fromWkt(boundary);
Boolean inCircle = GeoUtils.isInCircle(longitude, latitude, geometry);
if(inCircle){
area = etOperatingArea;
break;
public EtOperatingArea getAreaInfoByLocation(String longitude, String latitude,String deptId,String sn) {
AsDevice device = asDeviceMapper.selectAsDeviceBySn(sn);
if(StrUtil.isNotBlank(sn) && ObjectUtil.isNotNull(device)){
return dao.selectById(device.getAreaId());
}else{
double lon = Double.parseDouble(longitude);
double lat = Double.parseDouble(latitude);
//如果是创享小程序，根据‘是否使用创享电动车小程序’查询出所有为是的运营商下所有的运营区
EtOperatingArea area1 = new EtOperatingArea();
area1.setDeptId(Long.parseLong(deptId));
List<EtOperatingArea> etOperatingAreas = etOperatingAreaService.selectEtOperatingAreaList(area1);
EtOperatingArea area = null;
for(EtOperatingArea etOperatingArea:etOperatingAreas){
String boundary = etOperatingArea.getBoundary();
if(StrUtil.isNotBlank(boundary)){
Geometry geometry = GeoUtils.fromWkt(boundary);
Boolean inCircle = GeoUtils.isInCircle(longitude, latitude, geometry);
if(inCircle){
area = etOperatingArea;
break;
}
}
}
}
if(ObjectUtil.isNotNull(area)){
/** 在运营区内直接返回*/
log.info("在【{}】运营区内",area.getAreaName());
return area;
}else{
/** 不在任何运营区内，获取到最近一个运营区*/
log.info("不在任何运营区内,获取到最近一个运营区");
EtOperatingArea closestArea = null;
double minDistance = Double.MAX_VALUE;
GeometryFactory geometryFactory = new GeometryFactory();
Coordinate coordinate = new Coordinate(lon, lat);
Point point = geometryFactory.createPoint(coordinate);
if(ObjectUtil.isNotNull(etOperatingAreas) && etOperatingAreas.size()>0){
for(EtOperatingArea etOperatingArea:etOperatingAreas){
Geometry geometry = GeoUtils.fromWkt(etOperatingArea.getBoundary());
if (geometry.contains(point)) {
return etOperatingArea;
}else{
// 获取多边形的外边界
Coordinate[] coordinates = geometry.getCoordinates();
for (Coordinate coord : coordinates) {
double distance = GeoUtils.calculateDistance(lat, lon, coord.y, coord.x);
if (distance < minDistance) {
minDistance = distance;
closestArea = etOperatingArea;
if(ObjectUtil.isNotNull(area)){
/** 在运营区内直接返回*/
log.info("在【{}】运营区内",area.getAreaName());
return area;
}else{
/** 不在任何运营区内，获取到最近一个运营区*/
log.info("不在任何运营区内,获取到最近一个运营区");
EtOperatingArea closestArea = null;
double minDistance = Double.MAX_VALUE;
GeometryFactory geometryFactory = new GeometryFactory();
Coordinate coordinate = new Coordinate(lon, lat);
Point point = geometryFactory.createPoint(coordinate);
if(ObjectUtil.isNotNull(etOperatingAreas) && etOperatingAreas.size()>0){
for(EtOperatingArea etOperatingArea:etOperatingAreas){
Geometry geometry = GeoUtils.fromWkt(etOperatingArea.getBoundary());
if (geometry.contains(point)) {
return etOperatingArea;
}else{
// 获取多边形的外边界
Coordinate[] coordinates = geometry.getCoordinates();
for (Coordinate coord : coordinates) {
double distance = GeoUtils.calculateDistance(lat, lon, coord.y, coord.x);
if (distance < minDistance) {
minDistance = distance;
closestArea = etOperatingArea;
}
}
}
}
}else{
throw new ServiceException("没有找到任何运营区");
}
}else{
throw new ServiceException("没有找到任何运营区");
return closestArea;
}
return closestArea;
}
}
/**

13
electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.ServiceConstants;
@ -248,6 +249,11 @@ public class SysDeptServiceImpl implements ISysDeptService
throw new ServiceException("部门停用，不允许新增");
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
if (dept.getIsUsePlatformApp().equals("true")) {
SysDept platform = deptMapper.selectDeptById(100L);
dept.setAppid(platform.getAppid());
dept.setAppSecret(platform.getAppSecret());
}
int i = deptMapper.insertDept(dept);
Long[] areaIds = dept.getAreaIds();
if (StringUtils.isNotNull(areaIds)){
@ -284,6 +290,11 @@ public class SysDeptServiceImpl implements ISysDeptService
dept.setAncestors(newAncestors);
updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
}
if (StrUtil.isNotBlank(dept.getIsUsePlatformApp()) && dept.getIsUsePlatformApp().equals("true")) {
SysDept platform = deptMapper.selectDeptById(100L);
dept.setAppid(platform.getAppid());
dept.setAppSecret(platform.getAppSecret());
}
int result = deptMapper.updateDept(dept);
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
&& !StringUtils.equals("0", dept.getAncestors()))
@ -300,7 +311,7 @@ public class SysDeptServiceImpl implements ISysDeptService
}
// 添加运营商账号并添加运营商角色
// createOperator(dept);
if("true".equals(dept.getIsProfitSharing()) && StringUtils.isNotEmpty(dept.getMerchantId()) && dept.getParentId() != 0L){
if("true".equals(dept.getIsProfitSharing()) && StringUtils.isNotEmpty(dept.getMerchantId()) && dept.getParentId() != 0L && !dept.getMerchantId().equals("1656437344")){
// 删除分账接收方
DeleteReceiverResponse deleteReceiverResponse = wxPayService.deleteReceiver(dept.getMerchantId(),dept.getDeptId(),ServiceConstants.PROFITSHARING_TYPE_PLATFORM);
log.info("删除分账接收方响应:【{}】", JSON.toJSON(deleteReceiverResponse));

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

@ -12,7 +12,6 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.domain.EtAreaDept;
import com.ruoyi.system.domain.EtOperatingArea;
import com.ruoyi.system.domain.EtOrder;
import com.ruoyi.system.domain.vo.AttachVo;
import com.ruoyi.system.mapper.EtAreaDeptMapper;
@ -22,8 +21,6 @@ import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.IWxPayService;
import com.wechat.pay.java.core.Config;
import com.wechat.pay.java.core.RSAAutoCertificateConfig;
import com.wechat.pay.java.core.notification.NotificationParser;
import com.wechat.pay.java.core.notification.RequestParam;
import com.wechat.pay.java.service.payments.jsapi.JsapiService;
import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
import com.wechat.pay.java.service.payments.jsapi.model.*;
@ -40,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.List;

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

@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="areaId != null and areaId != ''"> and a.area_id = #{areaId}</if>
<if test="tag != null and tag != ''"> and a.tag = #{tag}</if>
<!-- 数据范围过滤 -->
${params.dataScope}
order by a.create_time desc

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

@ -127,6 +127,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</select>
<select id="checkSNUnique" resultMap="AsDeviceResult">
select device_id, sn, device_name from et_device where sn = #{sn} limit 1
</select>
<insert id="insertAsDevice" parameterType="AsDevice" useGeneratedKeys="true" keyProperty="deviceId">
insert into et_device
<trim prefix="(" suffix=")" suffixOverrides=",">

8
electripper-system/src/main/resources/mapper/system/AsUserMapper.xml
View File

@ -33,20 +33,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sysUserId" column="sys_user_id" />
<result property="areaId" column="area_id" />
<result property="isAuthentication" column="is_authentication" />
<result property="appName" column="app_name" />
</resultMap>
<sql id="selectUserVo">
select u.user_id, u.user_name, u.real_name, u.id_card, u.nick_name, u.email, u.avatar,
u.phonenumber, u.balance, u.birthday, u.password, u.pay_password, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.wxopenid,
u.is_sign,u.role,u.sys_user_id,u.area_id,u.is_authentication
u.is_sign,u.role,u.sys_user_id,u.area_id,u.is_authentication,u.app_name
from et_user u
</sql>
<select id="selectUserList" parameterType="AsUser" resultMap="AsUserResult">
select u.user_id, u.nick_name, u.user_name, u.real_name,u.email, u.avatar, u.phonenumber, u.balance,
u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
u.wxopenid,u.is_sign,u.role,u.sys_user_id,u.area_id,u.is_authentication from et_user u
u.wxopenid,u.is_sign,u.role,u.sys_user_id,u.area_id,u.is_authentication,u.app_name from et_user u
where u.del_flag = '0'
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
@ -166,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sysUserId != null and sysUserId != ''">sys_user_id,</if>
<if test="areaId != null">area_id,</if>
<if test="isAuthentication != null">is_authentication,</if>
<if test="appName != null">app_name,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@ -188,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sysUserId != null and sysUserId != ''">#{sysUserId},</if>
<if test="areaId != null">#{areaId},</if>
<if test="isAuthentication != null">#{isAuthentication},</if>
<if test="appName != null">#{appName},</if>
sysdate()
)
</insert>
@ -216,6 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sysUserId != null">sys_user_id = #{sysUserId},</if>
<if test="areaId != null">area_id = #{areaId},</if>
<if test="isAuthentication != null">is_authentication = #{isAuthentication},</if>
<if test="appName != null">app_name = #{appName},</if>
update_time = sysdate()
</set>
where user_id = #{userId}

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

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="areaName" column="area_name" />
<result property="boundary" column="boundary" />
<result property="boundaryStr" column="boundary_str" />
<result property="picture" column="picture" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="createBy" column="create_by" />
@ -46,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectEtOperatingAreaVo">
select area_id, area_name, AsText(boundary) boundary,
boundary_str, longitude, latitude, create_by, create_time,
boundary_str, picture, longitude, latitude, create_by, create_time,
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, cast(agreement as char) as agreement, deposit,
@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEtOperatingAreaList" parameterType="EtOperatingArea" resultMap="EtOperatingAreaResult">
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.boundary_str, a.picture, 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,

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

@ -18,7 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="parentName" column="parent_name" />
<result property="platformServiceFee" column="platform_service_fee" />
<result property="isProfitSharing" column="is_profit_sharing" />
<result property="isUsePlatformApp" column="is_use_platform_app" />
<result property="domain" column="domain" />
<result property="appid" column="appid" />
<result property="appName" column="app_name" />
<result property="appSecret" column="app_secret" />
<result property="merchantId" column="merchant_id" />
<result property="apiV3Key" column="api_v3_key" />
@ -35,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectDeptVo">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name,
d.order_num, d.leader, d.phone, d.email, d.status,
d.del_flag,d.platform_service_fee, d.is_profit_sharing, d.appid, d.app_secret,
d.del_flag,d.platform_service_fee, d.is_profit_sharing, d.domain, d.is_use_platform_app, d.appid, d.app_name, d.app_secret,
d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,
d.create_by, d.create_time
from sys_dept d
@ -73,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.is_profit_sharing, d.appid, d.app_secret,
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.is_profit_sharing,d.domain,d.is_use_platform_app, d.appid, d.app_name,d.app_secret,
d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
@ -121,7 +124,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="platformServiceFee != null and platformServiceFee != ''">platform_service_fee,</if>
<if test="isProfitSharing != null and isProfitSharing != ''">is_profit_sharing,</if>
<if test="isUsePlatformApp != null and isUsePlatformApp != ''">is_use_platform_app,</if>
<if test="domain != null and domain != ''">domain,</if>
<if test="appid != null and appid != ''">appid,</if>
<if test="appName != null and appName != ''">app_name,</if>
<if test="appSecret != null and appSecret != ''">app_secret,</if>
<if test="merchantId != null and merchantId != ''">merchant_id,</if>
<if test="apiV3Key != null and apiV3Key != ''">api_v3_key,</if>
@ -143,7 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="platformServiceFee != null and platformServiceFee != ''">#{platformServiceFee},</if>
<if test="isProfitSharing != null and isProfitSharing != ''">#{isProfitSharing},</if>
<if test="isUsePlatformApp != null and isUsePlatformApp != ''">#{isUsePlatformApp},</if>
<if test="domain != null and domain != ''">#{domain},</if>
<if test="appid != null and appid != ''">#{appid},</if>
<if test="appName != null and appName != ''">#{appName},</if>
<if test="appSecret != null and appSecret != ''">#{appSecret},</if>
<if test="merchantId != null and merchantId != ''">#{merchantId},</if>
<if test="apiV3Key != null and apiV3Key != ''">#{apiV3Key},</if>
@ -169,7 +178,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="platformServiceFee != null and platformServiceFee != ''">platform_service_fee = #{platformServiceFee},</if>
<if test="isProfitSharing != null and isProfitSharing != ''">is_profit_sharing = #{isProfitSharing},</if>
<if test="isUsePlatformApp != null and isUsePlatformApp != ''">is_use_platform_app = #{isUsePlatformApp},</if>
<if test="domain != null and domain != ''">domain = #{domain},</if>
<if test="appid != null and appid != ''">appid = #{appid},</if>
<if test="appName != null and appName != ''">app_name = #{appName},</if>
<if test="appSecret != null and appSecret != ''">app_secret = #{appSecret},</if>
<if test="merchantId != null and merchantId != ''">merchant_id = #{merchantId},</if>
<if test="apiV3Key != null and apiV3Key != ''">api_v3_key = #{apiV3Key},</if>