修改表名、实体类

This commit is contained in:
Lemon
2023-07-07 14:26:31 +08:00
parent 7a7117f089
commit 19704bcf9e
10 changed files with 178 additions and 174 deletions

View File

@@ -9,7 +9,7 @@ import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.JWTUtils;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.IDockingPlatformConfigService; import com.jsowell.pile.service.IThirdPartyPlatformConfigService;
import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.lianlian.common.CommonResult;
import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.lianlian.service.LianLianService;
@@ -38,7 +38,7 @@ public class LianLianController extends BaseController {
private LianLianService lianLianService; private LianLianService lianLianService;
@Autowired @Autowired
private IDockingPlatformConfigService dockingPlatformConfigService; private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService;
/** /**
* 推送充电站信息 notification_stationInfo * 推送充电站信息 notification_stationInfo

View File

@@ -17,8 +17,8 @@ import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.enums.BusinessType; import com.jsowell.common.enums.BusinessType;
import com.jsowell.pile.domain.DockingPlatformConfig; import com.jsowell.pile.domain.ThirdPartyPlatformConfig;
import com.jsowell.pile.service.IDockingPlatformConfigService; import com.jsowell.pile.service.IThirdPartyPlatformConfigService;
import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.core.page.TableDataInfo;
@@ -30,18 +30,18 @@ import com.jsowell.common.core.page.TableDataInfo;
*/ */
@RestController @RestController
@RequestMapping("/pile/config") @RequestMapping("/pile/config")
public class DockingPlatformConfigController extends BaseController { public class ThirdPartyPlatformConfigController extends BaseController {
@Autowired @Autowired
private IDockingPlatformConfigService dockingPlatformConfigService; private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService;
/** /**
* 查询对接平台配置信息列表 * 查询对接平台配置信息列表
*/ */
@PreAuthorize("@ss.hasPermi('pile:config:list')") @PreAuthorize("@ss.hasPermi('pile:config:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(DockingPlatformConfig dockingPlatformConfig) { public TableDataInfo list(ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
startPage(); startPage();
List<DockingPlatformConfig> list = dockingPlatformConfigService.selectDockingPlatformConfigList(dockingPlatformConfig); List<ThirdPartyPlatformConfig> list = thirdPartyPlatformConfigService.selectThirdPartyPlatformConfigList(thirdPartyPlatformConfig);
return getDataTable(list); return getDataTable(list);
} }
@@ -51,9 +51,9 @@ public class DockingPlatformConfigController extends BaseController {
@PreAuthorize("@ss.hasPermi('pile:config:export')") @PreAuthorize("@ss.hasPermi('pile:config:export')")
@Log(title = "对接平台配置信息", businessType = BusinessType.EXPORT) @Log(title = "对接平台配置信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, DockingPlatformConfig dockingPlatformConfig) { public void export(HttpServletResponse response, ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
List<DockingPlatformConfig> list = dockingPlatformConfigService.selectDockingPlatformConfigList(dockingPlatformConfig); List<ThirdPartyPlatformConfig> list = thirdPartyPlatformConfigService.selectThirdPartyPlatformConfigList(thirdPartyPlatformConfig);
ExcelUtil<DockingPlatformConfig> util = new ExcelUtil<DockingPlatformConfig>(DockingPlatformConfig.class); ExcelUtil<ThirdPartyPlatformConfig> util = new ExcelUtil<ThirdPartyPlatformConfig>(ThirdPartyPlatformConfig.class);
util.exportExcel(response, list, "对接平台配置信息数据"); util.exportExcel(response, list, "对接平台配置信息数据");
} }
@@ -63,7 +63,7 @@ public class DockingPlatformConfigController extends BaseController {
@PreAuthorize("@ss.hasPermi('pile:config:query')") @PreAuthorize("@ss.hasPermi('pile:config:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id) { public AjaxResult getInfo(@PathVariable("id") Integer id) {
return AjaxResult.success(dockingPlatformConfigService.selectDockingPlatformConfigById(id)); return AjaxResult.success(thirdPartyPlatformConfigService.selectThirdPartyPlatformConfigById(id));
} }
/** /**
@@ -72,8 +72,8 @@ public class DockingPlatformConfigController extends BaseController {
@PreAuthorize("@ss.hasPermi('pile:config:add')") @PreAuthorize("@ss.hasPermi('pile:config:add')")
@Log(title = "对接平台配置信息", businessType = BusinessType.INSERT) @Log(title = "对接平台配置信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody DockingPlatformConfig dockingPlatformConfig) { public AjaxResult add(@RequestBody ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
return toAjax(dockingPlatformConfigService.insertDockingPlatformConfig(dockingPlatformConfig)); return toAjax(thirdPartyPlatformConfigService.insertThirdPartyPlatformConfig(thirdPartyPlatformConfig));
} }
/** /**
@@ -82,8 +82,8 @@ public class DockingPlatformConfigController extends BaseController {
@PreAuthorize("@ss.hasPermi('pile:config:edit')") @PreAuthorize("@ss.hasPermi('pile:config:edit')")
@Log(title = "对接平台配置信息", businessType = BusinessType.UPDATE) @Log(title = "对接平台配置信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody DockingPlatformConfig dockingPlatformConfig) { public AjaxResult edit(@RequestBody ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
return toAjax(dockingPlatformConfigService.updateDockingPlatformConfig(dockingPlatformConfig)); return toAjax(thirdPartyPlatformConfigService.updateThirdPartyPlatformConfig(thirdPartyPlatformConfig));
} }
/** /**
@@ -93,6 +93,6 @@ public class DockingPlatformConfigController extends BaseController {
@Log(title = "对接平台配置信息", businessType = BusinessType.DELETE) @Log(title = "对接平台配置信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Integer[] ids) { public AjaxResult remove(@PathVariable Integer[] ids) {
return toAjax(dockingPlatformConfigService.deleteDockingPlatformConfigByIds(ids)); return toAjax(thirdPartyPlatformConfigService.deleteThirdPartyPlatformConfigByIds(ids));
} }
} }

View File

@@ -6,12 +6,14 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
/** /**
* 对接平台配置信息对象 docking_platform_config * 对接平台我方密钥配置信息对象
*
* thirdparty_platform_config
* *
* @author jsowell * @author jsowell
* @date 2023-05-27 * @date 2023-05-27
*/ */
public class DockingPlatformConfig extends BaseEntity public class ThirdPartyPlatformConfig extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

View File

@@ -6,7 +6,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
/** /**
* 第三方平台配置对象 thirdparty_setting_info * 第三方平台配置对象
* (第三方平台的密钥信息)
* thirdparty_setting_info
* *
* @author jsowell * @author jsowell
* @date 2023-05-24 * @date 2023-05-24

View File

@@ -1,6 +1,6 @@
package com.jsowell.pile.mapper; package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.DockingPlatformConfig; import com.jsowell.pile.domain.ThirdPartyPlatformConfig;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@@ -12,38 +12,38 @@ import java.util.List;
* @date 2023-05-27 * @date 2023-05-27
*/ */
@Repository @Repository
public interface DockingPlatformConfigMapper { public interface ThirdPartyPlatformConfigMapper {
/** /**
* 查询对接平台配置信息 * 查询对接平台配置信息
* *
* @param id 对接平台配置信息主键 * @param id 对接平台配置信息主键
* @return 对接平台配置信息 * @return 对接平台配置信息
*/ */
public DockingPlatformConfig selectDockingPlatformConfigById(Integer id); public ThirdPartyPlatformConfig selectThirdPartyPlatformConfigById(Integer id);
/** /**
* 查询对接平台配置信息列表 * 查询对接平台配置信息列表
* *
* @param dockingPlatformConfig 对接平台配置信息 * @param thirdPartyPlatformConfig 对接平台配置信息
* @return 对接平台配置信息集合 * @return 对接平台配置信息集合
*/ */
public List<DockingPlatformConfig> selectDockingPlatformConfigList(DockingPlatformConfig dockingPlatformConfig); public List<ThirdPartyPlatformConfig> selectThirdPartyPlatformConfigList(ThirdPartyPlatformConfig thirdPartyPlatformConfig);
/** /**
* 新增对接平台配置信息 * 新增对接平台配置信息
* *
* @param dockingPlatformConfig 对接平台配置信息 * @param thirdPartyPlatformConfig 对接平台配置信息
* @return 结果 * @return 结果
*/ */
public int insertDockingPlatformConfig(DockingPlatformConfig dockingPlatformConfig); public int insertThirdPartyPlatformConfig(ThirdPartyPlatformConfig thirdPartyPlatformConfig);
/** /**
* 修改对接平台配置信息 * 修改对接平台配置信息
* *
* @param dockingPlatformConfig 对接平台配置信息 * @param thirdPartyPlatformConfig 对接平台配置信息
* @return 结果 * @return 结果
*/ */
public int updateDockingPlatformConfig(DockingPlatformConfig dockingPlatformConfig); public int updateThirdPartyPlatformConfig(ThirdPartyPlatformConfig thirdPartyPlatformConfig);
/** /**
* 删除对接平台配置信息 * 删除对接平台配置信息
@@ -51,7 +51,7 @@ public interface DockingPlatformConfigMapper {
* @param id 对接平台配置信息主键 * @param id 对接平台配置信息主键
* @return 结果 * @return 结果
*/ */
public int deleteDockingPlatformConfigById(Integer id); public int deleteThirdPartyPlatformConfigById(Integer id);
/** /**
* 批量删除对接平台配置信息 * 批量删除对接平台配置信息
@@ -59,7 +59,7 @@ public interface DockingPlatformConfigMapper {
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteDockingPlatformConfigByIds(Integer[] ids); public int deleteThirdPartyPlatformConfigByIds(Integer[] ids);
/** /**
* 通过operatorId查询配置信息 * 通过operatorId查询配置信息
@@ -67,5 +67,5 @@ public interface DockingPlatformConfigMapper {
* @param operatorId * @param operatorId
* @return * @return
*/ */
DockingPlatformConfig getInfoByOperatorId(String operatorId); ThirdPartyPlatformConfig getInfoByOperatorId(String operatorId);
} }

View File

@@ -1,7 +1,7 @@
package com.jsowell.pile.service; package com.jsowell.pile.service;
import java.util.List; import java.util.List;
import com.jsowell.pile.domain.DockingPlatformConfig; import com.jsowell.pile.domain.ThirdPartyPlatformConfig;
/** /**
* 对接平台配置信息Service接口 * 对接平台配置信息Service接口
@@ -9,7 +9,7 @@ import com.jsowell.pile.domain.DockingPlatformConfig;
* @author jsowell * @author jsowell
* @date 2023-05-27 * @date 2023-05-27
*/ */
public interface IDockingPlatformConfigService public interface IThirdPartyPlatformConfigService
{ {
/** /**
* 查询对接平台配置信息 * 查询对接平台配置信息
@@ -17,31 +17,31 @@ public interface IDockingPlatformConfigService
* @param id 对接平台配置信息主键 * @param id 对接平台配置信息主键
* @return 对接平台配置信息 * @return 对接平台配置信息
*/ */
public DockingPlatformConfig selectDockingPlatformConfigById(Integer id); public ThirdPartyPlatformConfig selectThirdPartyPlatformConfigById(Integer id);
/** /**
* 查询对接平台配置信息列表 * 查询对接平台配置信息列表
* *
* @param dockingPlatformConfig 对接平台配置信息 * @param thirdPartyPlatformConfig 对接平台配置信息
* @return 对接平台配置信息集合 * @return 对接平台配置信息集合
*/ */
public List<DockingPlatformConfig> selectDockingPlatformConfigList(DockingPlatformConfig dockingPlatformConfig); public List<ThirdPartyPlatformConfig> selectThirdPartyPlatformConfigList(ThirdPartyPlatformConfig thirdPartyPlatformConfig);
/** /**
* 新增对接平台配置信息 * 新增对接平台配置信息
* *
* @param dockingPlatformConfig 对接平台配置信息 * @param thirdPartyPlatformConfig 对接平台配置信息
* @return 结果 * @return 结果
*/ */
public int insertDockingPlatformConfig(DockingPlatformConfig dockingPlatformConfig); public int insertThirdPartyPlatformConfig(ThirdPartyPlatformConfig thirdPartyPlatformConfig);
/** /**
* 修改对接平台配置信息 * 修改对接平台配置信息
* *
* @param dockingPlatformConfig 对接平台配置信息 * @param thirdPartyPlatformConfig 对接平台配置信息
* @return 结果 * @return 结果
*/ */
public int updateDockingPlatformConfig(DockingPlatformConfig dockingPlatformConfig); public int updateThirdPartyPlatformConfig(ThirdPartyPlatformConfig thirdPartyPlatformConfig);
/** /**
* 批量删除对接平台配置信息 * 批量删除对接平台配置信息
@@ -49,7 +49,7 @@ public interface IDockingPlatformConfigService
* @param ids 需要删除的对接平台配置信息主键集合 * @param ids 需要删除的对接平台配置信息主键集合
* @return 结果 * @return 结果
*/ */
public int deleteDockingPlatformConfigByIds(Integer[] ids); public int deleteThirdPartyPlatformConfigByIds(Integer[] ids);
/** /**
* 删除对接平台配置信息信息 * 删除对接平台配置信息信息
@@ -57,12 +57,12 @@ public interface IDockingPlatformConfigService
* @param id 对接平台配置信息主键 * @param id 对接平台配置信息主键
* @return 结果 * @return 结果
*/ */
public int deleteDockingPlatformConfigById(Integer id); public int deleteThirdPartyPlatformConfigById(Integer id);
/** /**
* 通过operatorId查询配置信息 * 通过operatorId查询配置信息
* @param operatorId * @param operatorId
* @return * @return
*/ */
DockingPlatformConfig getInfoByOperatorId(String operatorId); ThirdPartyPlatformConfig getInfoByOperatorId(String operatorId);
} }

View File

@@ -1,101 +0,0 @@
package com.jsowell.pile.service.impl;
import java.util.List;
import com.jsowell.common.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jsowell.pile.mapper.DockingPlatformConfigMapper;
import com.jsowell.pile.domain.DockingPlatformConfig;
import com.jsowell.pile.service.IDockingPlatformConfigService;
/**
* 对接平台配置信息Service业务层处理
*
* @author jsowell
* @date 2023-05-27
*/
@Service
public class DockingPlatformConfigServiceImpl implements IDockingPlatformConfigService {
@Autowired
private DockingPlatformConfigMapper dockingPlatformConfigMapper;
/**
* 查询对接平台配置信息
*
* @param id 对接平台配置信息主键
* @return 对接平台配置信息
*/
@Override
public DockingPlatformConfig selectDockingPlatformConfigById(Integer id) {
return dockingPlatformConfigMapper.selectDockingPlatformConfigById(id);
}
/**
* 查询对接平台配置信息列表
*
* @param dockingPlatformConfig 对接平台配置信息
* @return 对接平台配置信息
*/
@Override
public List<DockingPlatformConfig> selectDockingPlatformConfigList(DockingPlatformConfig dockingPlatformConfig) {
return dockingPlatformConfigMapper.selectDockingPlatformConfigList(dockingPlatformConfig);
}
/**
* 新增对接平台配置信息
*
* @param dockingPlatformConfig 对接平台配置信息
* @return 结果
*/
@Override
public int insertDockingPlatformConfig(DockingPlatformConfig dockingPlatformConfig) {
dockingPlatformConfig.setCreateTime(DateUtils.getNowDate());
return dockingPlatformConfigMapper.insertDockingPlatformConfig(dockingPlatformConfig);
}
/**
* 修改对接平台配置信息
*
* @param dockingPlatformConfig 对接平台配置信息
* @return 结果
*/
@Override
public int updateDockingPlatformConfig(DockingPlatformConfig dockingPlatformConfig) {
dockingPlatformConfig.setUpdateTime(DateUtils.getNowDate());
return dockingPlatformConfigMapper.updateDockingPlatformConfig(dockingPlatformConfig);
}
/**
* 批量删除对接平台配置信息
*
* @param ids 需要删除的对接平台配置信息主键
* @return 结果
*/
@Override
public int deleteDockingPlatformConfigByIds(Integer[] ids) {
return dockingPlatformConfigMapper.deleteDockingPlatformConfigByIds(ids);
}
/**
* 删除对接平台配置信息信息
*
* @param id 对接平台配置信息主键
* @return 结果
*/
@Override
public int deleteDockingPlatformConfigById(Integer id) {
return dockingPlatformConfigMapper.deleteDockingPlatformConfigById(id);
}
/**
* 通过operatorId查询配置信息
*
* @param operatorId
* @return
*/
@Override
public DockingPlatformConfig getInfoByOperatorId(String operatorId) {
return dockingPlatformConfigMapper.getInfoByOperatorId(operatorId);
}
}

View File

@@ -0,0 +1,101 @@
package com.jsowell.pile.service.impl;
import java.util.List;
import com.jsowell.common.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jsowell.pile.mapper.ThirdPartyPlatformConfigMapper;
import com.jsowell.pile.domain.ThirdPartyPlatformConfig;
import com.jsowell.pile.service.IThirdPartyPlatformConfigService;
/**
* 对接平台配置信息Service业务层处理
*
* @author jsowell
* @date 2023-05-27
*/
@Service
public class ThirdPartyPlatformConfigServiceImpl implements IThirdPartyPlatformConfigService {
@Autowired
private ThirdPartyPlatformConfigMapper thirdPartyPlatformConfigMapper;
/**
* 查询对接平台配置信息
*
* @param id 对接平台配置信息主键
* @return 对接平台配置信息
*/
@Override
public ThirdPartyPlatformConfig selectThirdPartyPlatformConfigById(Integer id) {
return thirdPartyPlatformConfigMapper.selectThirdPartyPlatformConfigById(id);
}
/**
* 查询对接平台配置信息列表
*
* @param thirdPartyPlatformConfig 对接平台配置信息
* @return 对接平台配置信息
*/
@Override
public List<ThirdPartyPlatformConfig> selectThirdPartyPlatformConfigList(ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
return thirdPartyPlatformConfigMapper.selectThirdPartyPlatformConfigList(thirdPartyPlatformConfig);
}
/**
* 新增对接平台配置信息
*
* @param thirdPartyPlatformConfig 对接平台配置信息
* @return 结果
*/
@Override
public int insertThirdPartyPlatformConfig(ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
thirdPartyPlatformConfig.setCreateTime(DateUtils.getNowDate());
return thirdPartyPlatformConfigMapper.insertThirdPartyPlatformConfig(thirdPartyPlatformConfig);
}
/**
* 修改对接平台配置信息
*
* @param thirdPartyPlatformConfig 对接平台配置信息
* @return 结果
*/
@Override
public int updateThirdPartyPlatformConfig(ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
thirdPartyPlatformConfig.setUpdateTime(DateUtils.getNowDate());
return thirdPartyPlatformConfigMapper.updateThirdPartyPlatformConfig(thirdPartyPlatformConfig);
}
/**
* 批量删除对接平台配置信息
*
* @param ids 需要删除的对接平台配置信息主键
* @return 结果
*/
@Override
public int deleteThirdPartyPlatformConfigByIds(Integer[] ids) {
return thirdPartyPlatformConfigMapper.deleteThirdPartyPlatformConfigByIds(ids);
}
/**
* 删除对接平台配置信息信息
*
* @param id 对接平台配置信息主键
* @return 结果
*/
@Override
public int deleteThirdPartyPlatformConfigById(Integer id) {
return thirdPartyPlatformConfigMapper.deleteThirdPartyPlatformConfigById(id);
}
/**
* 通过operatorId查询配置信息
*
* @param operatorId
* @return
*/
@Override
public ThirdPartyPlatformConfig getInfoByOperatorId(String operatorId) {
return thirdPartyPlatformConfigMapper.getInfoByOperatorId(operatorId);
}
}

View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsowell.pile.mapper.DockingPlatformConfigMapper"> <mapper namespace="com.jsowell.pile.mapper.ThirdPartyPlatformConfigMapper">
<resultMap type="com.jsowell.pile.domain.DockingPlatformConfig" id="DockingPlatformConfigResult"> <resultMap type="com.jsowell.pile.domain.ThirdPartyPlatformConfig" id="ThirdPartyPlatformConfigResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="name" column="name" /> <result property="name" column="name" />
<result property="operatorId" column="operator_id" /> <result property="operatorId" column="operator_id" />
@@ -19,8 +19,8 @@
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
</resultMap> </resultMap>
<sql id="selectDockingPlatformConfigVo"> <sql id="selectThirdPartyPlatformConfigVo">
select id, name, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag from docking_platform_config select id, name, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag from thirdparty_platform_config
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@@ -28,8 +28,8 @@
id, name, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag id, name, operator_id, operator_secret, sign_secret, data_secret, data_secret_IV, create_time, create_by, update_time, update_by, del_flag
</sql> </sql>
<select id="selectDockingPlatformConfigList" parameterType="com.jsowell.pile.domain.DockingPlatformConfig" resultMap="DockingPlatformConfigResult"> <select id="selectThirdPartyPlatformConfigList" parameterType="com.jsowell.pile.domain.ThirdPartyPlatformConfig" resultMap="ThirdPartyPlatformConfigResult">
<include refid="selectDockingPlatformConfigVo"/> <include refid="selectThirdPartyPlatformConfigVo"/>
<where> <where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="operatorId != null and operatorId != ''"> and operator_id = #{operatorId}</if> <if test="operatorId != null and operatorId != ''"> and operator_id = #{operatorId}</if>
@@ -40,13 +40,13 @@
</where> </where>
</select> </select>
<select id="selectDockingPlatformConfigById" parameterType="Integer" resultMap="DockingPlatformConfigResult"> <select id="selectThirdPartyPlatformConfigById" parameterType="Integer" resultMap="ThirdPartyPlatformConfigResult">
<include refid="selectDockingPlatformConfigVo"/> <include refid="selectThirdPartyPlatformConfigVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertDockingPlatformConfig" parameterType="com.jsowell.pile.domain.DockingPlatformConfig" useGeneratedKeys="true" keyProperty="id"> <insert id="insertThirdPartyPlatformConfig" parameterType="com.jsowell.pile.domain.ThirdPartyPlatformConfig" useGeneratedKeys="true" keyProperty="id">
insert into docking_platform_config insert into thirdparty_platform_config
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if> <if test="name != null">name,</if>
<if test="operatorId != null">operator_id,</if> <if test="operatorId != null">operator_id,</if>
@@ -75,8 +75,8 @@
</trim> </trim>
</insert> </insert>
<update id="updateDockingPlatformConfig" parameterType="com.jsowell.pile.domain.DockingPlatformConfig"> <update id="updateThirdPartyPlatformConfig" parameterType="com.jsowell.pile.domain.ThirdPartyPlatformConfig">
update docking_platform_config update thirdparty_platform_config
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if> <if test="name != null">name = #{name},</if>
<if test="operatorId != null">operator_id = #{operatorId},</if> <if test="operatorId != null">operator_id = #{operatorId},</if>
@@ -93,20 +93,20 @@
where id = #{id} where id = #{id}
</update> </update>
<delete id="deleteDockingPlatformConfigById" parameterType="Integer"> <delete id="deleteThirdPartyPlatformConfigById" parameterType="Integer">
delete from docking_platform_config where id = #{id} delete from thirdparty_platform_config where id = #{id}
</delete> </delete>
<delete id="deleteDockingPlatformConfigByIds" parameterType="String"> <delete id="deleteThirdPartyPlatformConfigByIds" parameterType="String">
delete from docking_platform_config where id in delete from thirdparty_platform_config where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<select id="getInfoByOperatorId" resultMap="DockingPlatformConfigResult"> <select id="getInfoByOperatorId" resultMap="ThirdPartyPlatformConfigResult">
select <include refid="Base_Column_List"/> select <include refid="Base_Column_List"/>
from docking_platform_config from thirdparty_platform_config
where operator_id = #{operatorId,jdbcType=VARCHAR} where operator_id = #{operatorId,jdbcType=VARCHAR}
</select> </select>
</mapper> </mapper>

View File

@@ -90,7 +90,7 @@ public class LianLianServiceImpl implements LianLianService {
private IThirdPartySettingInfoService thirdPartySettingInfoService; private IThirdPartySettingInfoService thirdPartySettingInfoService;
@Autowired @Autowired
private IDockingPlatformConfigService dockingPlatformConfigService; private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService;
@Autowired @Autowired
private IStationSettingRelationService stationSettingRelationService; private IStationSettingRelationService stationSettingRelationService;
@@ -232,7 +232,7 @@ public class LianLianServiceImpl implements LianLianService {
// 未查到数据 // 未查到数据
return null; return null;
} }
DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorId()); ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorId());
if (configInfo == null) { if (configInfo == null) {
return null; return null;
} }
@@ -317,7 +317,7 @@ public class LianLianServiceImpl implements LianLianService {
List<String> stationIds = dto.getStationIds(); List<String> stationIds = dto.getStationIds();
List<StationStatusInfo> StationStatusInfos = new ArrayList<>(); List<StationStatusInfo> StationStatusInfos = new ArrayList<>();
List<Object> ConnectorStatusInfos = new ArrayList<>(); List<Object> ConnectorStatusInfos = new ArrayList<>();
DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorId()); ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorId());
if (configInfo == null) { if (configInfo == null) {
return null; return null;
} }
@@ -407,7 +407,7 @@ public class LianLianServiceImpl implements LianLianService {
*/ */
@Override @Override
public Map<String, String> query_station_stats(QueryStationInfoDTO dto) { public Map<String, String> query_station_stats(QueryStationInfoDTO dto) {
DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorId()); ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorId());
if (configInfo == null) { if (configInfo == null) {
return null; return null;
} }
@@ -518,7 +518,7 @@ public class LianLianServiceImpl implements LianLianService {
vo.setFailReasonMsg("未查到该桩的数据"); vo.setFailReasonMsg("未查到该桩的数据");
return null; return null;
} }
DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID());
if (configInfo == null) { if (configInfo == null) {
return null; return null;
} }
@@ -570,7 +570,7 @@ public class LianLianServiceImpl implements LianLianService {
// 平台已存在订单 // 平台已存在订单
return null; return null;
} }
DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID());
if (configInfo == null) { if (configInfo == null) {
return null; return null;
} }
@@ -632,7 +632,7 @@ public class LianLianServiceImpl implements LianLianService {
if (orderInfo == null) { if (orderInfo == null) {
return null; return null;
} }
DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID());
if (configInfo == null) { if (configInfo == null) {
return null; return null;
} }
@@ -702,7 +702,7 @@ public class LianLianServiceImpl implements LianLianService {
if (orderInfo == null) { if (orderInfo == null) {
return null; return null;
} }
DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID());
if (configInfo == null) { if (configInfo == null) {
return null; return null;
} }
@@ -1214,7 +1214,7 @@ public class LianLianServiceImpl implements LianLianService {
return null; return null;
} }
// 通过operatorID 查出 operatorSecret // 通过operatorID 查出 operatorSecret
DockingPlatformConfig platformConfig = dockingPlatformConfigService.getInfoByOperatorId(dto.getOperatorId()); ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorId());
if (platformConfig == null) { if (platformConfig == null) {
return null; return null;
} }
@@ -1419,7 +1419,7 @@ public class LianLianServiceImpl implements LianLianService {
public Map<String, String> generateToken(CommonParamsDTO dto) throws UnsupportedEncodingException { public Map<String, String> generateToken(CommonParamsDTO dto) throws UnsupportedEncodingException {
String operatorID = dto.getOperatorID(); String operatorID = dto.getOperatorID();
// 通过operatorID 查出 operatorSecret // 通过operatorID 查出 operatorSecret
DockingPlatformConfig platformConfig = dockingPlatformConfigService.getInfoByOperatorId(operatorID); ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorID);
if (platformConfig == null) { if (platformConfig == null) {
return null; return null;
} }
@@ -1479,7 +1479,7 @@ public class LianLianServiceImpl implements LianLianService {
public Map<String, String> checkoutSign(CommonParamsDTO dto){ public Map<String, String> checkoutSign(CommonParamsDTO dto){
String operatorID = dto.getOperatorID(); String operatorID = dto.getOperatorID();
// 通过operatorID 查出 operatorSecret // 通过operatorID 查出 operatorSecret
DockingPlatformConfig platformConfig = dockingPlatformConfigService.getInfoByOperatorId(operatorID); ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorID);
if (platformConfig == null) { if (platformConfig == null) {
return null; return null;
} }