袁野 2 weeks ago
parent 240e455a7f
commit 0d53478356
  1. 1
      bweb/src/main/java/com/bweb/config/SysConfig.java
  2. 26
      bweb/src/main/java/com/bweb/controller/BsUserController.java
  3. 19
      bweb/src/main/java/com/bweb/controller/SecRoleController.java
  4. 7
      bweb/src/main/java/com/bweb/controller/SecUserController.java
  5. 1
      bweb/src/main/java/com/bweb/controller/item/EnItemSegmentsController.java
  6. 33
      bweb/src/main/java/com/bweb/controller/item/EnOilManagementController.java
  7. 5
      bweb/src/main/java/com/bweb/controller/item/EnServiceCompanyDeviceController.java
  8. 90
      bweb/src/main/java/com/bweb/controller/order/EnOrderController.java
  9. 10
      bweb/src/main/resources/prod/application.yml
  10. 3
      bweb/src/main/resources/prod/config.properties
  11. 78
      service/src/main/java/com/hfkj/common/utils/SignatureUtil.java
  12. 3
      service/src/main/java/com/hfkj/config/CommonSysConfig.java
  13. 27
      service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java
  14. 14
      service/src/main/java/com/hfkj/dao/EnOilManagementSqlProvider.java
  15. 19
      service/src/main/java/com/hfkj/dao/EnOrderOilMapper.java
  16. 28
      service/src/main/java/com/hfkj/dao/EnOrderOilSqlProvider.java
  17. 37
      service/src/main/java/com/hfkj/dao/EnServiceCompanyDeviceMapper.java
  18. 14
      service/src/main/java/com/hfkj/dao/EnServiceCompanyDeviceSqlProvider.java
  19. 13
      service/src/main/java/com/hfkj/dao/SecRoleMapper.java
  20. 14
      service/src/main/java/com/hfkj/dao/SecRoleSqlProvider.java
  21. 18
      service/src/main/java/com/hfkj/dao/SecUserMapper.java
  22. 14
      service/src/main/java/com/hfkj/dao/SecUserSqlProvider.java
  23. 18
      service/src/main/java/com/hfkj/entity/EnOilManagement.java
  24. 70
      service/src/main/java/com/hfkj/entity/EnOilManagementExample.java
  25. 34
      service/src/main/java/com/hfkj/entity/EnOrderOil.java
  26. 140
      service/src/main/java/com/hfkj/entity/EnOrderOilExample.java
  27. 16
      service/src/main/java/com/hfkj/entity/EnServiceCompanyDevice.java
  28. 70
      service/src/main/java/com/hfkj/entity/EnServiceCompanyDeviceExample.java
  29. 13
      service/src/main/java/com/hfkj/entity/SecRole.java
  30. 60
      service/src/main/java/com/hfkj/entity/SecRoleExample.java
  31. 15
      service/src/main/java/com/hfkj/entity/SecUser.java
  32. 60
      service/src/main/java/com/hfkj/entity/SecUserExample.java
  33. 3
      service/src/main/java/com/hfkj/service/impl/SecRoleServiceImpl.java
  34. 3
      service/src/main/java/com/hfkj/service/impl/SecUserServiceImpl.java
  35. 4
      service/src/main/java/com/hfkj/service/item/impl/EnItemSegmentsServiceImpl.java
  36. 1
      service/src/main/java/com/hfkj/service/item/impl/EnItemServiceImpl.java
  37. 5
      service/src/main/java/com/hfkj/service/item/impl/EnOilDepotsServiceImpl.java
  38. 3
      service/src/main/java/com/hfkj/service/item/impl/EnOilManagementServiceImpl.java
  39. 3
      service/src/main/java/com/hfkj/service/item/impl/EnSerCompanySgRelServiceImpl.java
  40. 3
      service/src/main/java/com/hfkj/service/item/impl/EnSerOilDepotsSgRelServiceImpl.java
  41. 5
      service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyDeviceServiceImpl.java
  42. 3
      service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyServiceImpl.java
  43. 5
      service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyCarServiceImpl.java
  44. 3
      service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java
  45. 3
      service/src/main/java/com/hfkj/service/order/impl/EnOrderOilServiceImpl.java
  46. 2
      service/src/main/resources/prod/commonConfig.properties

@ -14,4 +14,5 @@ public class SysConfig {
private String fileUrl;
}

@ -7,6 +7,8 @@ import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.common.utils.SignatureUtil;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.BsUser;
import com.hfkj.model.ResponseData;
import com.hfkj.service.user.BsUserService;
@ -15,6 +17,7 @@ import com.hfkj.sysenum.SecUserStatusEnum;
import com.hfkj.sysenum.UserStatusEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
@ -113,5 +116,28 @@ public class BsUserController {
}
}
@RequestMapping(value="/phgSignLogin",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "普惠go加密登陆")
public ResponseData phgSignLogin(@RequestBody JSONObject body) {
try {
if (body == null || StringUtils.isBlank(body.getString("phone"))) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
Map<String , Object> map = new HashMap<>();
map.put("phone", body.getString("phone"));
map.put("appid" , CommonSysConst.getSysConfig().getPhgAppid());
map.put("sign" , SignatureUtil.createSign(map , CommonSysConst.getSysConfig().getPhgSecret()));
return ResponseMsgUtil.success(map);
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -6,9 +6,11 @@ import com.github.pagehelper.PageInfo;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.SecRole;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.service.SecRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -34,7 +36,8 @@ import java.util.Map;
public class SecRoleController {
Logger log = LoggerFactory.getLogger(SecUserController.class);
@Resource
private UserCenter userCenter;
@Resource
private SecRoleService secRoleService;
@ -54,8 +57,10 @@ public class SecRoleController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
} else {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
secRole = new SecRole();
secRole.setStatus(1);
secRole.setCreateTimeUserId(sessionModel.getAccount().getId());
}
secRole.setRoleName(body.getRoleName());
secRole.setRoleDesc(body.getRoleDesc());
@ -111,9 +116,14 @@ public class SecRoleController {
@RequestParam(value = "pageNum" , required = true) Integer pageNum,
@RequestParam(value = "pageSize" , required = true) Integer pageSize) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
Map<String,Object> param = new HashMap<>();
param.put("roleName", roleName);
param.put("createTimeUserId", sessionModel.getAccount().getId());
PageHelper.startPage(pageNum, pageSize);
return ResponseMsgUtil.success(new PageInfo<>(secRoleService.getList(param)));
@ -128,8 +138,13 @@ public class SecRoleController {
@ApiOperation(value = "查询全部角色")
public ResponseData queryAllRole() {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
Map<String,Object> param = new HashMap<>();
param.put("createTimeUserId", sessionModel.getAccount().getId());
return ResponseMsgUtil.success(secRoleService.getList(new HashMap<>()));
return ResponseMsgUtil.success(secRoleService.getList(param));
} catch (Exception e) {
log.error("error!",e);

@ -80,6 +80,7 @@ public class SecUserController {
secUser.setObjectType(sessionModel.getAccount().getObjectType());
secUser.setObjectId(sessionModel.getAccount().getObjectId());
secUser.setStatus(SecUserStatusEnum.status1.getCode());
secUser.setCreateTimeUserId(sessionModel.getAccount().getId());
// 校验重复登录账户
if (secUserService.getDetailByLoginName(body.getString("loginName")) != null) {
@ -224,12 +225,16 @@ public class SecUserController {
@RequestParam(value = "pageNum", required = true) Integer pageNum,
@RequestParam(value = "pageSize", required = true) Integer pageSize) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
Map<String,Object> param = new HashMap<>();
param.put("userName", userName);
param.put("loginName", loginName);
param.put("telephone", telephone);
param.put("objectType", objectType);
param.put("createTimeUserId", sessionModel.getAccount().getId());
param.put("status", status);
PageHelper.startPage(pageNum, pageSize);

@ -260,7 +260,6 @@ public class EnItemSegmentsController {
param.put("segmentName", segmentName);
param.put("person", person);
param.put("status", status);
param.put("createUser", sessionModel.getAccount().getId());
PageHelper.startPage(pageNum, pageSize);
return ResponseMsgUtil.success(new PageInfo<>(enItemSegmentsService.getList(param)));

@ -13,6 +13,7 @@ import com.hfkj.entity.EnOilManagement;
import com.hfkj.entity.EnTransportCompanyCar;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.service.item.EnOilDepotsService;
import com.hfkj.service.item.EnOilManagementService;
import com.hfkj.service.item.EnTransportCompanyCarService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
@ -42,6 +43,9 @@ public class EnOilManagementController {
private UserCenter userCenter;
@Resource
private EnOilManagementService enOilManagementService;
@Resource
private EnOilDepotsService enOilDepotsService;
@Resource
private EnTransportCompanyCarService enTransportCompanyCarService;
@ -67,13 +71,30 @@ public class EnOilManagementController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
// 查询最新数据
EnOilDepots enOilDepots = enOilDepotsService.queryDetail(sessionModel.getAccount().getObjectId());
// 当前库存
BigDecimal currentStock = enOilDepots.getCurrentStock();
// 变更后库存
BigDecimal changeStock = BigDecimal.ZERO;
// 当类型为出库
if (body.getType() == 1) {
if ( body.getTransportCarId() == null
if (
body.getTransportCarId() == null ||
StringUtils.isBlank(body.getSignImg())
){
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
changeStock = currentStock.subtract(body.getNum());
body.setBeforeNum(currentStock);
body.setChangeNum(changeStock);
EnTransportCompanyCar enTransportCompanyCar = enTransportCompanyCarService.queryDetail(body.getTransportCarId());
body.setTransportCarNo(enTransportCompanyCar.getCarNo());
}
@ -85,8 +106,18 @@ public class EnOilManagementController {
){
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
changeStock = currentStock.add(body.getNum());
body.setBeforeNum(currentStock);
body.setChangeNum(changeStock);
}
enOilDepots.setCurrentStock(changeStock);
enOilDepots.setUpdateTime(new Date());
enOilDepotsService.update(enOilDepots);
body.setUpdateTime(new Date());
body.setCreateTime(new Date());
body.setCreateUser(sessionModel.getAccount().getId());

@ -47,6 +47,7 @@ public class EnServiceCompanyDeviceController {
try {
if (body == null
|| body.getDeviceType() == null
|| StringUtils.isBlank(body.getDeviceName())
|| StringUtils.isBlank(body.getCredentialsImg())
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
@ -85,6 +86,7 @@ public class EnServiceCompanyDeviceController {
if (body == null
|| body.getId() == null
|| body.getDeviceType() == null
|| StringUtils.isBlank(body.getDeviceName())
|| StringUtils.isBlank(body.getCredentialsImg())
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
@ -109,6 +111,7 @@ public class EnServiceCompanyDeviceController {
}
enServiceCompanyDevice.setDeviceType(body.getDeviceType());
enServiceCompanyDevice.setDeviceName(body.getDeviceName());
enServiceCompanyDevice.setCredentialsImg(body.getCredentialsImg());
enServiceCompanyDevice.setUpdateTime(new Date());
enServiceCompanyDevice.setUpdateUser(sessionModel.getAccount().getId());
@ -176,6 +179,7 @@ public class EnServiceCompanyDeviceController {
@ApiOperation(value = "查询项目列表")
public ResponseData queryList(@RequestParam(value = "companyId" , required = false) Long companyId,
@RequestParam(value = "deviceNo" , required = false) String deviceNo,
@RequestParam(value = "deviceName" , required = false) String deviceName,
@RequestParam(value = "status" , required = false) Integer status,
@RequestParam(value = "deviceType" , required = false) Integer deviceType,
@RequestParam(value = "pageNum" , required = true) Integer pageNum,
@ -189,6 +193,7 @@ public class EnServiceCompanyDeviceController {
Map<String,Object> param = new HashMap<>();
param.put("companyId", companyId);
param.put("deviceNo", deviceNo);
param.put("deviceName", deviceName);
param.put("deviceType", deviceType);
param.put("status", status);
param.put("createUser", sessionModel.getAccount().getId());

@ -531,8 +531,12 @@ public class EnOrderController {
// 定义加油订单
EnOrderOil enOrderOil = new EnOrderOil();
enOrderOil.setOrderNo(enOrder.getOrderNo());
enOrderOil.setCarId(enCar.getId());
enOrderOil.setCardNo(enCar.getCarNo());
enOrderOil.setServiceCompanyDeviceCode(companyDevice.getDeviceNo());
enOrderOil.setServiceCompanyDeviceId(companyDevice.getId());
enOrderOil.setServiceCompanyDeviceName(companyDevice.getDeviceName());
enOrderOil.setServiceCompanyDeviceImg(companyDevice.getCredentialsImg());
enOrderOil.setTransportCompanyId(enTransportCompany.getId());
enOrderOil.setTransportCompanyName(enTransportCompany.getName());
enOrderOil.setItemId(enItem.getId());
@ -555,5 +559,91 @@ public class EnOrderController {
}
}
@RequestMapping(value="/getOrderOilList",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询加油订单")
public ResponseData getOrderOilList(@RequestParam(value = "segmentId" , required = false) Long segmentId,
@RequestParam(value = "segmentName" , required = false) String segmentName,
@RequestParam(value = "serviceCompanyDeviceCode" , required = false) String serviceCompanyDeviceCode,
@RequestParam(value = "deviceCode" , required = false) String deviceCode,
@RequestParam(value = "carNo" , required = false) String carNo,
@RequestParam(value = "thirdOrderNo" , required = false) String thirdOrderNo,
@RequestParam(value = "oilType" , required = false) Integer oilType,
@RequestParam(value = "status" , required = false) Integer status,
@RequestParam(value = "orderNo" , required = false) String orderNo,
@RequestParam(value = "pageNum" , required = true) Integer pageNum,
@RequestParam(value = "pageSize" , required = true) Integer pageSize) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
Map<String,Object> param = new HashMap<>();
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type5.getCode())) {
param.put("transportCompanyId", sessionModel.getAccount().getObjectId());
}
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type6.getCode())) {
param.put("carId", sessionModel.getAccount().getObjectId());
}
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type4.getCode())) {
param.put("companyId", sessionModel.getAccount().getId());
}
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type2.getCode())) {
param.put("itemId", sessionModel.getAccount().getId());
}
param.put("segmentId", segmentId);
param.put("segmentName", segmentName);
param.put("serviceCompanyDeviceCode", serviceCompanyDeviceCode);
param.put("deviceCode", deviceCode);
param.put("thirdOrderNo", thirdOrderNo);
param.put("carNo", carNo);
param.put("oilType", oilType);
param.put("orderNo", orderNo);
param.put("status", status);
PageHelper.startPage(pageNum, pageSize);
return ResponseMsgUtil.success(new PageInfo<>(enOrderOilService.getList(param)));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/addSign",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "添加签名")
public ResponseData addSign(@RequestParam(value = "orderOilId" , required = true) Long orderOilId,
@RequestParam(value = "signImg" , required = true) String signImg) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type6.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
EnOrderOil enOrderOil = enOrderOilService.queryDetail(orderOilId);
if (enOrderOil == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单不存在");
}
enOrderOil.setSignImg(signImg);
enOrderOil.setStatus(4);
enOrderOil.setUpdateTime(new Date());
enOrderOilService.update(enOrderOil);
return ResponseMsgUtil.success("成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -1,5 +1,5 @@
server:
port: 9702
port: 9402
servlet:
context-path: /brest
@ -9,9 +9,9 @@ debug: false
#datasource数据源设置
spring:
datasource:
url: jdbc:mysql://192.168.0.63:21100/phg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: phg
password: HUfukeji123456!@#
url: jdbc:mysql://192.168.0.63:21100/en?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: en
password: HF123456.
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
filters: stat
@ -29,7 +29,7 @@ spring:
maxOpenPreparedStatements: 20
redis:
database: 1
database: 3
host: 127.0.0.1
port: 36379
password: HF123456.Redis

@ -1 +1,2 @@
fileUrl=/home/project/phg/filesystem
fileUrl=/home/project/en-server/filesystem

@ -0,0 +1,78 @@
package com.hfkj.common.utils;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
public class SignatureUtil {
/**
* 参数签名
* @param param 参数
* @param key 秘钥
* @return
* @throws Exception
*/
public static String createSign(Object param, String key) throws Exception {
Map map = JSONObject.parseObject(JSONObject.toJSONString(param), Map.class);
return md5Encode(paramSort(map, key).getBytes());
}
/**
* 验证签名
* @param checkSign 需验证的签名字符串
* @param param 参数
* @param key 秘钥
* @return
* @throws Exception
*/
public static Boolean checkSign(String checkSign,Object param, String key) throws Exception {
Map map = JSONObject.parseObject(JSONObject.toJSONString(param), Map.class);
// 去除签名
map.remove("sign");
if (checkSign.equals(createSign(map, key))) {
return true;
}
return false;
}
/**
* 参数排序
* @param param
* @return
*/
public static String paramSort(final Map<String, Object> param, String key) {
Set<String> keySet = param.keySet();
String[] keyArray = keySet.toArray(new String[keySet.size()]);
Arrays.sort(keyArray);
StringBuilder sb = new StringBuilder();
for (String k : keyArray) {
if (StringUtils.isBlank(sb.toString())) {
sb.append(k).append("=").append(param.get(k));
} else {
sb.append("&").append(k).append("=").append(param.get(k));
}
}
sb.append("&key=").append(key);
return sb.toString();
}
/**
* MD5加密
* @param data
* @return
* @throws Exception
*/
public static String md5Encode(byte[] data) throws Exception {
// 初始化MessageDigest
MessageDigest md = MessageDigest.getInstance("MD5");
// 执行摘要信息
byte[] digest = md.digest(data);
// 将摘要信息转换为32位的十六进制字符串
return new String(new HexBinaryAdapter().marshal(digest));
}
}

@ -38,4 +38,7 @@ public class CommonSysConfig {
*/
private String huiPayPreorderNotifyUrl;
private String phgAppid;
private String phgSecret;
}

@ -43,20 +43,20 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
"transport_car_no, oil_type, ",
"supplier, num, before_num, ",
"change_num, remark, ",
"img, `status`, create_user, ",
"create_user_name, create_time, ",
"update_user, update_user_name, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"img, sign_img, `status`, ",
"create_user, create_user_name, ",
"create_time, update_user, ",
"update_user_name, update_time, ",
"ext_1, ext_2, ext_3)",
"values (#{type,jdbcType=INTEGER}, #{transportCarId,jdbcType=BIGINT}, ",
"#{transportCarNo,jdbcType=VARCHAR}, #{oilType,jdbcType=INTEGER}, ",
"#{supplier,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, #{beforeNum,jdbcType=DECIMAL}, ",
"#{changeNum,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, ",
"#{img,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createUser,jdbcType=BIGINT}, ",
"#{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateUser,jdbcType=BIGINT}, #{updateUserName,jdbcType=VARCHAR}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"#{img,jdbcType=VARCHAR}, #{signImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{createUser,jdbcType=BIGINT}, #{createUserName,jdbcType=VARCHAR}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, ",
"#{updateUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(EnOilManagement record);
@ -78,6 +78,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
@Result(column="change_num", property="changeNum", jdbcType=JdbcType.DECIMAL),
@Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR),
@Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
@Result(column="sign_img", property="signImg", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT),
@Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR),
@ -94,8 +95,8 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
@Select({
"select",
"id, `type`, transport_car_id, transport_car_no, oil_type, supplier, num, before_num, ",
"change_num, remark, img, `status`, create_user, create_user_name, create_time, ",
"update_user, update_user_name, update_time, ext_1, ext_2, ext_3",
"change_num, remark, img, sign_img, `status`, create_user, create_user_name, ",
"create_time, update_user, update_user_name, update_time, ext_1, ext_2, ext_3",
"from en_oil_management",
"where id = #{id,jdbcType=BIGINT}"
})
@ -111,6 +112,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
@Result(column="change_num", property="changeNum", jdbcType=JdbcType.DECIMAL),
@Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR),
@Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
@Result(column="sign_img", property="signImg", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT),
@Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR),
@ -145,6 +147,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
"change_num = #{changeNum,jdbcType=DECIMAL},",
"remark = #{remark,jdbcType=VARCHAR},",
"img = #{img,jdbcType=VARCHAR},",
"sign_img = #{signImg,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"create_user = #{createUser,jdbcType=BIGINT},",
"create_user_name = #{createUserName,jdbcType=VARCHAR},",

@ -68,6 +68,10 @@ public class EnOilManagementSqlProvider {
sql.VALUES("img", "#{img,jdbcType=VARCHAR}");
}
if (record.getSignImg() != null) {
sql.VALUES("sign_img", "#{signImg,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
@ -128,6 +132,7 @@ public class EnOilManagementSqlProvider {
sql.SELECT("change_num");
sql.SELECT("remark");
sql.SELECT("img");
sql.SELECT("sign_img");
sql.SELECT("`status`");
sql.SELECT("create_user");
sql.SELECT("create_user_name");
@ -199,6 +204,10 @@ public class EnOilManagementSqlProvider {
sql.SET("img = #{record.img,jdbcType=VARCHAR}");
}
if (record.getSignImg() != null) {
sql.SET("sign_img = #{record.signImg,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
@ -258,6 +267,7 @@ public class EnOilManagementSqlProvider {
sql.SET("change_num = #{record.changeNum,jdbcType=DECIMAL}");
sql.SET("remark = #{record.remark,jdbcType=VARCHAR}");
sql.SET("img = #{record.img,jdbcType=VARCHAR}");
sql.SET("sign_img = #{record.signImg,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_user = #{record.createUser,jdbcType=BIGINT}");
sql.SET("create_user_name = #{record.createUserName,jdbcType=VARCHAR}");
@ -318,6 +328,10 @@ public class EnOilManagementSqlProvider {
sql.SET("img = #{img,jdbcType=VARCHAR}");
}
if (record.getSignImg() != null) {
sql.SET("sign_img = #{signImg,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}

@ -45,6 +45,7 @@ public interface EnOrderOilMapper extends EnOrderOilMapperExt {
"segment_id, segment_name, ",
"oil_type, oil_num, ",
"service_company_device_id, service_company_device_code, ",
"service_company_device_name, service_company_device_img, ",
"device_id, device_code, ",
"car_id, car_no, order_no, ",
"`number`, third_order_no, ",
@ -62,6 +63,7 @@ public interface EnOrderOilMapper extends EnOrderOilMapperExt {
"#{segmentId,jdbcType=BIGINT}, #{segmentName,jdbcType=VARCHAR}, ",
"#{oilType,jdbcType=INTEGER}, #{oilNum,jdbcType=DECIMAL}, ",
"#{serviceCompanyDeviceId,jdbcType=BIGINT}, #{serviceCompanyDeviceCode,jdbcType=VARCHAR}, ",
"#{serviceCompanyDeviceName,jdbcType=VARCHAR}, #{serviceCompanyDeviceImg,jdbcType=VARCHAR}, ",
"#{deviceId,jdbcType=BIGINT}, #{deviceCode,jdbcType=VARCHAR}, ",
"#{carId,jdbcType=BIGINT}, #{carNo,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ",
"#{number,jdbcType=BIGINT}, #{thirdOrderNo,jdbcType=VARCHAR}, ",
@ -96,6 +98,8 @@ public interface EnOrderOilMapper extends EnOrderOilMapperExt {
@Result(column="oil_num", property="oilNum", jdbcType=JdbcType.DECIMAL),
@Result(column="service_company_device_id", property="serviceCompanyDeviceId", jdbcType=JdbcType.BIGINT),
@Result(column="service_company_device_code", property="serviceCompanyDeviceCode", jdbcType=JdbcType.VARCHAR),
@Result(column="service_company_device_name", property="serviceCompanyDeviceName", jdbcType=JdbcType.VARCHAR),
@Result(column="service_company_device_img", property="serviceCompanyDeviceImg", jdbcType=JdbcType.VARCHAR),
@Result(column="device_id", property="deviceId", jdbcType=JdbcType.BIGINT),
@Result(column="device_code", property="deviceCode", jdbcType=JdbcType.VARCHAR),
@Result(column="car_id", property="carId", jdbcType=JdbcType.BIGINT),
@ -128,11 +132,12 @@ public interface EnOrderOilMapper extends EnOrderOilMapperExt {
"select",
"id, transport_company_id, transport_company_name, item_id, item_name, company_id, ",
"company_name, segment_id, segment_name, oil_type, oil_num, service_company_device_id, ",
"service_company_device_code, device_id, device_code, car_id, car_no, order_no, ",
"`number`, third_order_no, `mode`, liter, price, sale, card_no, card_user_name, ",
"card_before_consume_money, card_after_consume_money, card_plate_number, sign_img, ",
"fill_date_time, `status`, create_user_id, create_user_name, create_time, update_user_id, ",
"update_user_name, update_time",
"service_company_device_code, service_company_device_name, service_company_device_img, ",
"device_id, device_code, car_id, car_no, order_no, `number`, third_order_no, ",
"`mode`, liter, price, sale, card_no, card_user_name, card_before_consume_money, ",
"card_after_consume_money, card_plate_number, sign_img, fill_date_time, `status`, ",
"create_user_id, create_user_name, create_time, update_user_id, update_user_name, ",
"update_time",
"from en_order_oil",
"where id = #{id,jdbcType=BIGINT}"
})
@ -150,6 +155,8 @@ public interface EnOrderOilMapper extends EnOrderOilMapperExt {
@Result(column="oil_num", property="oilNum", jdbcType=JdbcType.DECIMAL),
@Result(column="service_company_device_id", property="serviceCompanyDeviceId", jdbcType=JdbcType.BIGINT),
@Result(column="service_company_device_code", property="serviceCompanyDeviceCode", jdbcType=JdbcType.VARCHAR),
@Result(column="service_company_device_name", property="serviceCompanyDeviceName", jdbcType=JdbcType.VARCHAR),
@Result(column="service_company_device_img", property="serviceCompanyDeviceImg", jdbcType=JdbcType.VARCHAR),
@Result(column="device_id", property="deviceId", jdbcType=JdbcType.BIGINT),
@Result(column="device_code", property="deviceCode", jdbcType=JdbcType.VARCHAR),
@Result(column="car_id", property="carId", jdbcType=JdbcType.BIGINT),
@ -201,6 +208,8 @@ public interface EnOrderOilMapper extends EnOrderOilMapperExt {
"oil_num = #{oilNum,jdbcType=DECIMAL},",
"service_company_device_id = #{serviceCompanyDeviceId,jdbcType=BIGINT},",
"service_company_device_code = #{serviceCompanyDeviceCode,jdbcType=VARCHAR},",
"service_company_device_name = #{serviceCompanyDeviceName,jdbcType=VARCHAR},",
"service_company_device_img = #{serviceCompanyDeviceImg,jdbcType=VARCHAR},",
"device_id = #{deviceId,jdbcType=BIGINT},",
"device_code = #{deviceCode,jdbcType=VARCHAR},",
"car_id = #{carId,jdbcType=BIGINT},",

@ -76,6 +76,14 @@ public class EnOrderOilSqlProvider {
sql.VALUES("service_company_device_code", "#{serviceCompanyDeviceCode,jdbcType=VARCHAR}");
}
if (record.getServiceCompanyDeviceName() != null) {
sql.VALUES("service_company_device_name", "#{serviceCompanyDeviceName,jdbcType=VARCHAR}");
}
if (record.getServiceCompanyDeviceImg() != null) {
sql.VALUES("service_company_device_img", "#{serviceCompanyDeviceImg,jdbcType=VARCHAR}");
}
if (record.getDeviceId() != null) {
sql.VALUES("device_id", "#{deviceId,jdbcType=BIGINT}");
}
@ -198,6 +206,8 @@ public class EnOrderOilSqlProvider {
sql.SELECT("oil_num");
sql.SELECT("service_company_device_id");
sql.SELECT("service_company_device_code");
sql.SELECT("service_company_device_name");
sql.SELECT("service_company_device_img");
sql.SELECT("device_id");
sql.SELECT("device_code");
sql.SELECT("car_id");
@ -292,6 +302,14 @@ public class EnOrderOilSqlProvider {
sql.SET("service_company_device_code = #{record.serviceCompanyDeviceCode,jdbcType=VARCHAR}");
}
if (record.getServiceCompanyDeviceName() != null) {
sql.SET("service_company_device_name = #{record.serviceCompanyDeviceName,jdbcType=VARCHAR}");
}
if (record.getServiceCompanyDeviceImg() != null) {
sql.SET("service_company_device_img = #{record.serviceCompanyDeviceImg,jdbcType=VARCHAR}");
}
if (record.getDeviceId() != null) {
sql.SET("device_id = #{record.deviceId,jdbcType=BIGINT}");
}
@ -413,6 +431,8 @@ public class EnOrderOilSqlProvider {
sql.SET("oil_num = #{record.oilNum,jdbcType=DECIMAL}");
sql.SET("service_company_device_id = #{record.serviceCompanyDeviceId,jdbcType=BIGINT}");
sql.SET("service_company_device_code = #{record.serviceCompanyDeviceCode,jdbcType=VARCHAR}");
sql.SET("service_company_device_name = #{record.serviceCompanyDeviceName,jdbcType=VARCHAR}");
sql.SET("service_company_device_img = #{record.serviceCompanyDeviceImg,jdbcType=VARCHAR}");
sql.SET("device_id = #{record.deviceId,jdbcType=BIGINT}");
sql.SET("device_code = #{record.deviceCode,jdbcType=VARCHAR}");
sql.SET("car_id = #{record.carId,jdbcType=BIGINT}");
@ -496,6 +516,14 @@ public class EnOrderOilSqlProvider {
sql.SET("service_company_device_code = #{serviceCompanyDeviceCode,jdbcType=VARCHAR}");
}
if (record.getServiceCompanyDeviceName() != null) {
sql.SET("service_company_device_name = #{serviceCompanyDeviceName,jdbcType=VARCHAR}");
}
if (record.getServiceCompanyDeviceImg() != null) {
sql.SET("service_company_device_img = #{serviceCompanyDeviceImg,jdbcType=VARCHAR}");
}
if (record.getDeviceId() != null) {
sql.SET("device_id = #{deviceId,jdbcType=BIGINT}");
}

@ -39,20 +39,20 @@ public interface EnServiceCompanyDeviceMapper extends EnServiceCompanyDeviceMapp
int deleteByPrimaryKey(Long id);
@Insert({
"insert into en_service_company_device (company_id, device_no, ",
"device_type, credentials_img, ",
"`status`, create_user, ",
"create_user_name, create_time, ",
"update_user, update_user_name, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"values (#{companyId,jdbcType=BIGINT}, #{deviceNo,jdbcType=VARCHAR}, ",
"#{deviceType,jdbcType=INTEGER}, #{credentialsImg,jdbcType=VARCHAR}, ",
"#{status,jdbcType=INTEGER}, #{createUser,jdbcType=BIGINT}, ",
"#{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateUser,jdbcType=BIGINT}, #{updateUserName,jdbcType=VARCHAR}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"insert into en_service_company_device (company_id, device_name, ",
"device_no, device_type, ",
"credentials_img, `status`, ",
"create_user, create_user_name, ",
"create_time, update_user, ",
"update_user_name, update_time, ",
"ext_1, ext_2, ext_3)",
"values (#{companyId,jdbcType=BIGINT}, #{deviceName,jdbcType=VARCHAR}, ",
"#{deviceNo,jdbcType=VARCHAR}, #{deviceType,jdbcType=INTEGER}, ",
"#{credentialsImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{createUser,jdbcType=BIGINT}, #{createUserName,jdbcType=VARCHAR}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, ",
"#{updateUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(EnServiceCompanyDevice record);
@ -65,6 +65,7 @@ public interface EnServiceCompanyDeviceMapper extends EnServiceCompanyDeviceMapp
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="device_name", property="deviceName", jdbcType=JdbcType.VARCHAR),
@Result(column="device_no", property="deviceNo", jdbcType=JdbcType.VARCHAR),
@Result(column="device_type", property="deviceType", jdbcType=JdbcType.INTEGER),
@Result(column="credentials_img", property="credentialsImg", jdbcType=JdbcType.VARCHAR),
@ -83,15 +84,16 @@ public interface EnServiceCompanyDeviceMapper extends EnServiceCompanyDeviceMapp
@Select({
"select",
"id, company_id, device_no, device_type, credentials_img, `status`, create_user, ",
"create_user_name, create_time, update_user, update_user_name, update_time, ext_1, ",
"ext_2, ext_3",
"id, company_id, device_name, device_no, device_type, credentials_img, `status`, ",
"create_user, create_user_name, create_time, update_user, update_user_name, update_time, ",
"ext_1, ext_2, ext_3",
"from en_service_company_device",
"where id = #{id,jdbcType=BIGINT}"
})
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="device_name", property="deviceName", jdbcType=JdbcType.VARCHAR),
@Result(column="device_no", property="deviceNo", jdbcType=JdbcType.VARCHAR),
@Result(column="device_type", property="deviceType", jdbcType=JdbcType.INTEGER),
@Result(column="credentials_img", property="credentialsImg", jdbcType=JdbcType.VARCHAR),
@ -120,6 +122,7 @@ public interface EnServiceCompanyDeviceMapper extends EnServiceCompanyDeviceMapp
@Update({
"update en_service_company_device",
"set company_id = #{companyId,jdbcType=BIGINT},",
"device_name = #{deviceName,jdbcType=VARCHAR},",
"device_no = #{deviceNo,jdbcType=VARCHAR},",
"device_type = #{deviceType,jdbcType=INTEGER},",
"credentials_img = #{credentialsImg,jdbcType=VARCHAR},",

@ -32,6 +32,10 @@ public class EnServiceCompanyDeviceSqlProvider {
sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}");
}
if (record.getDeviceName() != null) {
sql.VALUES("device_name", "#{deviceName,jdbcType=VARCHAR}");
}
if (record.getDeviceNo() != null) {
sql.VALUES("device_no", "#{deviceNo,jdbcType=VARCHAR}");
}
@ -95,6 +99,7 @@ public class EnServiceCompanyDeviceSqlProvider {
sql.SELECT("id");
}
sql.SELECT("company_id");
sql.SELECT("device_name");
sql.SELECT("device_no");
sql.SELECT("device_type");
sql.SELECT("credentials_img");
@ -133,6 +138,10 @@ public class EnServiceCompanyDeviceSqlProvider {
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
}
if (record.getDeviceName() != null) {
sql.SET("device_name = #{record.deviceName,jdbcType=VARCHAR}");
}
if (record.getDeviceNo() != null) {
sql.SET("device_no = #{record.deviceNo,jdbcType=VARCHAR}");
}
@ -195,6 +204,7 @@ public class EnServiceCompanyDeviceSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
sql.SET("device_name = #{record.deviceName,jdbcType=VARCHAR}");
sql.SET("device_no = #{record.deviceNo,jdbcType=VARCHAR}");
sql.SET("device_type = #{record.deviceType,jdbcType=INTEGER}");
sql.SET("credentials_img = #{record.credentialsImg,jdbcType=VARCHAR}");
@ -222,6 +232,10 @@ public class EnServiceCompanyDeviceSqlProvider {
sql.SET("company_id = #{companyId,jdbcType=BIGINT}");
}
if (record.getDeviceName() != null) {
sql.SET("device_name = #{deviceName,jdbcType=VARCHAR}");
}
if (record.getDeviceNo() != null) {
sql.SET("device_no = #{deviceNo,jdbcType=VARCHAR}");
}

@ -40,11 +40,11 @@ public interface SecRoleMapper extends SecRoleMapperExt {
@Insert({
"insert into sec_role (role_name, role_desc, ",
"`status`, create_time, ",
"update_time)",
"`status`, create_time_user_id, ",
"create_time, update_time)",
"values (#{roleName,jdbcType=VARCHAR}, #{roleDesc,jdbcType=VARCHAR}, ",
"#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP})"
"#{status,jdbcType=INTEGER}, #{createTimeUserId,jdbcType=BIGINT}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(SecRole record);
@ -59,6 +59,7 @@ public interface SecRoleMapper extends SecRoleMapperExt {
@Result(column="role_name", property="roleName", jdbcType=JdbcType.VARCHAR),
@Result(column="role_desc", property="roleDesc", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time_user_id", property="createTimeUserId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP)
})
@ -66,7 +67,7 @@ public interface SecRoleMapper extends SecRoleMapperExt {
@Select({
"select",
"id, role_name, role_desc, `status`, create_time, update_time",
"id, role_name, role_desc, `status`, create_time_user_id, create_time, update_time",
"from sec_role",
"where id = #{id,jdbcType=BIGINT}"
})
@ -75,6 +76,7 @@ public interface SecRoleMapper extends SecRoleMapperExt {
@Result(column="role_name", property="roleName", jdbcType=JdbcType.VARCHAR),
@Result(column="role_desc", property="roleDesc", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time_user_id", property="createTimeUserId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP)
})
@ -94,6 +96,7 @@ public interface SecRoleMapper extends SecRoleMapperExt {
"set role_name = #{roleName,jdbcType=VARCHAR},",
"role_desc = #{roleDesc,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"create_time_user_id = #{createTimeUserId,jdbcType=BIGINT},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP}",
"where id = #{id,jdbcType=BIGINT}"

@ -40,6 +40,10 @@ public class SecRoleSqlProvider {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
if (record.getCreateTimeUserId() != null) {
sql.VALUES("create_time_user_id", "#{createTimeUserId,jdbcType=BIGINT}");
}
if (record.getCreateTime() != null) {
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
}
@ -61,6 +65,7 @@ public class SecRoleSqlProvider {
sql.SELECT("role_name");
sql.SELECT("role_desc");
sql.SELECT("`status`");
sql.SELECT("create_time_user_id");
sql.SELECT("create_time");
sql.SELECT("update_time");
sql.FROM("sec_role");
@ -96,6 +101,10 @@ public class SecRoleSqlProvider {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
if (record.getCreateTimeUserId() != null) {
sql.SET("create_time_user_id = #{record.createTimeUserId,jdbcType=BIGINT}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
}
@ -116,6 +125,7 @@ public class SecRoleSqlProvider {
sql.SET("role_name = #{record.roleName,jdbcType=VARCHAR}");
sql.SET("role_desc = #{record.roleDesc,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_time_user_id = #{record.createTimeUserId,jdbcType=BIGINT}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
@ -140,6 +150,10 @@ public class SecRoleSqlProvider {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}
if (record.getCreateTimeUserId() != null) {
sql.SET("create_time_user_id = #{createTimeUserId,jdbcType=BIGINT}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
}

@ -43,16 +43,16 @@ public interface SecUserMapper extends SecUserMapperExt {
"login_name, `password`, ",
"telephone, object_type, ",
"object_id, role_id, ",
"`status`, create_time, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"`status`, create_time_user_id, ",
"create_time, update_time, ",
"ext_1, ext_2, ext_3)",
"values (#{avatar,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, ",
"#{loginName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, ",
"#{telephone,jdbcType=VARCHAR}, #{objectType,jdbcType=INTEGER}, ",
"#{objectId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}, ",
"#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"#{status,jdbcType=INTEGER}, #{createTimeUserId,jdbcType=BIGINT}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(SecUser record);
@ -73,6 +73,7 @@ public interface SecUserMapper extends SecUserMapperExt {
@Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT),
@Result(column="role_id", property="roleId", jdbcType=JdbcType.BIGINT),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time_user_id", property="createTimeUserId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -84,7 +85,8 @@ public interface SecUserMapper extends SecUserMapperExt {
@Select({
"select",
"id, avatar, user_name, login_name, `password`, telephone, object_type, object_id, ",
"role_id, `status`, create_time, update_time, ext_1, ext_2, ext_3",
"role_id, `status`, create_time_user_id, create_time, update_time, ext_1, ext_2, ",
"ext_3",
"from sec_user",
"where id = #{id,jdbcType=BIGINT}"
})
@ -99,6 +101,7 @@ public interface SecUserMapper extends SecUserMapperExt {
@Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT),
@Result(column="role_id", property="roleId", jdbcType=JdbcType.BIGINT),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time_user_id", property="createTimeUserId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -127,6 +130,7 @@ public interface SecUserMapper extends SecUserMapperExt {
"object_id = #{objectId,jdbcType=BIGINT},",
"role_id = #{roleId,jdbcType=BIGINT},",
"`status` = #{status,jdbcType=INTEGER},",
"create_time_user_id = #{createTimeUserId,jdbcType=BIGINT},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",

@ -64,6 +64,10 @@ public class SecUserSqlProvider {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
if (record.getCreateTimeUserId() != null) {
sql.VALUES("create_time_user_id", "#{createTimeUserId,jdbcType=BIGINT}");
}
if (record.getCreateTime() != null) {
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
}
@ -103,6 +107,7 @@ public class SecUserSqlProvider {
sql.SELECT("object_id");
sql.SELECT("role_id");
sql.SELECT("`status`");
sql.SELECT("create_time_user_id");
sql.SELECT("create_time");
sql.SELECT("update_time");
sql.SELECT("ext_1");
@ -165,6 +170,10 @@ public class SecUserSqlProvider {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
if (record.getCreateTimeUserId() != null) {
sql.SET("create_time_user_id = #{record.createTimeUserId,jdbcType=BIGINT}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
}
@ -203,6 +212,7 @@ public class SecUserSqlProvider {
sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}");
sql.SET("role_id = #{record.roleId,jdbcType=BIGINT}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_time_user_id = #{record.createTimeUserId,jdbcType=BIGINT}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@ -254,6 +264,10 @@ public class SecUserSqlProvider {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}
if (record.getCreateTimeUserId() != null) {
sql.SET("create_time_user_id = #{createTimeUserId,jdbcType=BIGINT}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
}

@ -35,7 +35,7 @@ public class EnOilManagement implements Serializable {
private String transportCarNo;
/**
* 油品类型1 柴油 2汽油
* 油品类型1柴油 2汽油
*/
private Integer oilType;
@ -69,6 +69,11 @@ public class EnOilManagement implements Serializable {
*/
private String img;
/**
* 签名图片
*/
private String signImg;
/**
* 状态
*/
@ -209,6 +214,14 @@ public class EnOilManagement implements Serializable {
this.img = img;
}
public String getSignImg() {
return signImg;
}
public void setSignImg(String signImg) {
this.signImg = signImg;
}
public Integer getStatus() {
return status;
}
@ -312,6 +325,7 @@ public class EnOilManagement implements Serializable {
&& (this.getChangeNum() == null ? other.getChangeNum() == null : this.getChangeNum().equals(other.getChangeNum()))
&& (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
&& (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
&& (this.getSignImg() == null ? other.getSignImg() == null : this.getSignImg().equals(other.getSignImg()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateUser() == null ? other.getCreateUser() == null : this.getCreateUser().equals(other.getCreateUser()))
&& (this.getCreateUserName() == null ? other.getCreateUserName() == null : this.getCreateUserName().equals(other.getCreateUserName()))
@ -339,6 +353,7 @@ public class EnOilManagement implements Serializable {
result = prime * result + ((getChangeNum() == null) ? 0 : getChangeNum().hashCode());
result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
result = prime * result + ((getSignImg() == null) ? 0 : getSignImg().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateUser() == null) ? 0 : getCreateUser().hashCode());
result = prime * result + ((getCreateUserName() == null) ? 0 : getCreateUserName().hashCode());
@ -369,6 +384,7 @@ public class EnOilManagement implements Serializable {
sb.append(", changeNum=").append(changeNum);
sb.append(", remark=").append(remark);
sb.append(", img=").append(img);
sb.append(", signImg=").append(signImg);
sb.append(", status=").append(status);
sb.append(", createUser=").append(createUser);
sb.append(", createUserName=").append(createUserName);

@ -826,6 +826,76 @@ public class EnOilManagementExample {
return (Criteria) this;
}
public Criteria andSignImgIsNull() {
addCriterion("sign_img is null");
return (Criteria) this;
}
public Criteria andSignImgIsNotNull() {
addCriterion("sign_img is not null");
return (Criteria) this;
}
public Criteria andSignImgEqualTo(String value) {
addCriterion("sign_img =", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgNotEqualTo(String value) {
addCriterion("sign_img <>", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgGreaterThan(String value) {
addCriterion("sign_img >", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgGreaterThanOrEqualTo(String value) {
addCriterion("sign_img >=", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgLessThan(String value) {
addCriterion("sign_img <", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgLessThanOrEqualTo(String value) {
addCriterion("sign_img <=", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgLike(String value) {
addCriterion("sign_img like", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgNotLike(String value) {
addCriterion("sign_img not like", value, "signImg");
return (Criteria) this;
}
public Criteria andSignImgIn(List<String> values) {
addCriterion("sign_img in", values, "signImg");
return (Criteria) this;
}
public Criteria andSignImgNotIn(List<String> values) {
addCriterion("sign_img not in", values, "signImg");
return (Criteria) this;
}
public Criteria andSignImgBetween(String value1, String value2) {
addCriterion("sign_img between", value1, value2, "signImg");
return (Criteria) this;
}
public Criteria andSignImgNotBetween(String value1, String value2) {
addCriterion("sign_img not between", value1, value2, "signImg");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("`status` is null");
return (Criteria) this;

@ -79,6 +79,16 @@ public class EnOrderOil implements Serializable {
*/
private String serviceCompanyDeviceCode;
/**
* 服务公司设备名称
*/
private String serviceCompanyDeviceName;
/**
* 服务公司设备图片
*/
private String serviceCompanyDeviceImg;
/**
* 设备ID
*/
@ -170,7 +180,7 @@ public class EnOrderOil implements Serializable {
private Date fillDateTime;
/**
* 状态 1成功 2失败 3等待加注
* 状态 1成功 2失败 3等待加注 4确认签名
*/
private Integer status;
@ -310,6 +320,22 @@ public class EnOrderOil implements Serializable {
this.serviceCompanyDeviceCode = serviceCompanyDeviceCode;
}
public String getServiceCompanyDeviceName() {
return serviceCompanyDeviceName;
}
public void setServiceCompanyDeviceName(String serviceCompanyDeviceName) {
this.serviceCompanyDeviceName = serviceCompanyDeviceName;
}
public String getServiceCompanyDeviceImg() {
return serviceCompanyDeviceImg;
}
public void setServiceCompanyDeviceImg(String serviceCompanyDeviceImg) {
this.serviceCompanyDeviceImg = serviceCompanyDeviceImg;
}
public Long getDeviceId() {
return deviceId;
}
@ -535,6 +561,8 @@ public class EnOrderOil implements Serializable {
&& (this.getOilNum() == null ? other.getOilNum() == null : this.getOilNum().equals(other.getOilNum()))
&& (this.getServiceCompanyDeviceId() == null ? other.getServiceCompanyDeviceId() == null : this.getServiceCompanyDeviceId().equals(other.getServiceCompanyDeviceId()))
&& (this.getServiceCompanyDeviceCode() == null ? other.getServiceCompanyDeviceCode() == null : this.getServiceCompanyDeviceCode().equals(other.getServiceCompanyDeviceCode()))
&& (this.getServiceCompanyDeviceName() == null ? other.getServiceCompanyDeviceName() == null : this.getServiceCompanyDeviceName().equals(other.getServiceCompanyDeviceName()))
&& (this.getServiceCompanyDeviceImg() == null ? other.getServiceCompanyDeviceImg() == null : this.getServiceCompanyDeviceImg().equals(other.getServiceCompanyDeviceImg()))
&& (this.getDeviceId() == null ? other.getDeviceId() == null : this.getDeviceId().equals(other.getDeviceId()))
&& (this.getDeviceCode() == null ? other.getDeviceCode() == null : this.getDeviceCode().equals(other.getDeviceCode()))
&& (this.getCarId() == null ? other.getCarId() == null : this.getCarId().equals(other.getCarId()))
@ -579,6 +607,8 @@ public class EnOrderOil implements Serializable {
result = prime * result + ((getOilNum() == null) ? 0 : getOilNum().hashCode());
result = prime * result + ((getServiceCompanyDeviceId() == null) ? 0 : getServiceCompanyDeviceId().hashCode());
result = prime * result + ((getServiceCompanyDeviceCode() == null) ? 0 : getServiceCompanyDeviceCode().hashCode());
result = prime * result + ((getServiceCompanyDeviceName() == null) ? 0 : getServiceCompanyDeviceName().hashCode());
result = prime * result + ((getServiceCompanyDeviceImg() == null) ? 0 : getServiceCompanyDeviceImg().hashCode());
result = prime * result + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode());
result = prime * result + ((getDeviceCode() == null) ? 0 : getDeviceCode().hashCode());
result = prime * result + ((getCarId() == null) ? 0 : getCarId().hashCode());
@ -626,6 +656,8 @@ public class EnOrderOil implements Serializable {
sb.append(", oilNum=").append(oilNum);
sb.append(", serviceCompanyDeviceId=").append(serviceCompanyDeviceId);
sb.append(", serviceCompanyDeviceCode=").append(serviceCompanyDeviceCode);
sb.append(", serviceCompanyDeviceName=").append(serviceCompanyDeviceName);
sb.append(", serviceCompanyDeviceImg=").append(serviceCompanyDeviceImg);
sb.append(", deviceId=").append(deviceId);
sb.append(", deviceCode=").append(deviceCode);
sb.append(", carId=").append(carId);

@ -956,6 +956,146 @@ public class EnOrderOilExample {
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameIsNull() {
addCriterion("service_company_device_name is null");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameIsNotNull() {
addCriterion("service_company_device_name is not null");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameEqualTo(String value) {
addCriterion("service_company_device_name =", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameNotEqualTo(String value) {
addCriterion("service_company_device_name <>", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameGreaterThan(String value) {
addCriterion("service_company_device_name >", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameGreaterThanOrEqualTo(String value) {
addCriterion("service_company_device_name >=", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameLessThan(String value) {
addCriterion("service_company_device_name <", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameLessThanOrEqualTo(String value) {
addCriterion("service_company_device_name <=", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameLike(String value) {
addCriterion("service_company_device_name like", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameNotLike(String value) {
addCriterion("service_company_device_name not like", value, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameIn(List<String> values) {
addCriterion("service_company_device_name in", values, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameNotIn(List<String> values) {
addCriterion("service_company_device_name not in", values, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameBetween(String value1, String value2) {
addCriterion("service_company_device_name between", value1, value2, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceNameNotBetween(String value1, String value2) {
addCriterion("service_company_device_name not between", value1, value2, "serviceCompanyDeviceName");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgIsNull() {
addCriterion("service_company_device_img is null");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgIsNotNull() {
addCriterion("service_company_device_img is not null");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgEqualTo(String value) {
addCriterion("service_company_device_img =", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgNotEqualTo(String value) {
addCriterion("service_company_device_img <>", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgGreaterThan(String value) {
addCriterion("service_company_device_img >", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgGreaterThanOrEqualTo(String value) {
addCriterion("service_company_device_img >=", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgLessThan(String value) {
addCriterion("service_company_device_img <", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgLessThanOrEqualTo(String value) {
addCriterion("service_company_device_img <=", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgLike(String value) {
addCriterion("service_company_device_img like", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgNotLike(String value) {
addCriterion("service_company_device_img not like", value, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgIn(List<String> values) {
addCriterion("service_company_device_img in", values, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgNotIn(List<String> values) {
addCriterion("service_company_device_img not in", values, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgBetween(String value1, String value2) {
addCriterion("service_company_device_img between", value1, value2, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andServiceCompanyDeviceImgNotBetween(String value1, String value2) {
addCriterion("service_company_device_img not between", value1, value2, "serviceCompanyDeviceImg");
return (Criteria) this;
}
public Criteria andDeviceIdIsNull() {
addCriterion("device_id is null");
return (Criteria) this;

@ -23,6 +23,11 @@ public class EnServiceCompanyDevice implements Serializable {
*/
private Long companyId;
/**
* 设备名称
*/
private String deviceName;
/**
* 设备编号
*/
@ -106,6 +111,14 @@ public class EnServiceCompanyDevice implements Serializable {
this.companyId = companyId;
}
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getDeviceNo() {
return deviceNo;
}
@ -224,6 +237,7 @@ public class EnServiceCompanyDevice implements Serializable {
EnServiceCompanyDevice other = (EnServiceCompanyDevice) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getDeviceName() == null ? other.getDeviceName() == null : this.getDeviceName().equals(other.getDeviceName()))
&& (this.getDeviceNo() == null ? other.getDeviceNo() == null : this.getDeviceNo().equals(other.getDeviceNo()))
&& (this.getDeviceType() == null ? other.getDeviceType() == null : this.getDeviceType().equals(other.getDeviceType()))
&& (this.getCredentialsImg() == null ? other.getCredentialsImg() == null : this.getCredentialsImg().equals(other.getCredentialsImg()))
@ -245,6 +259,7 @@ public class EnServiceCompanyDevice implements Serializable {
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getDeviceName() == null) ? 0 : getDeviceName().hashCode());
result = prime * result + ((getDeviceNo() == null) ? 0 : getDeviceNo().hashCode());
result = prime * result + ((getDeviceType() == null) ? 0 : getDeviceType().hashCode());
result = prime * result + ((getCredentialsImg() == null) ? 0 : getCredentialsImg().hashCode());
@ -269,6 +284,7 @@ public class EnServiceCompanyDevice implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", companyId=").append(companyId);
sb.append(", deviceName=").append(deviceName);
sb.append(", deviceNo=").append(deviceNo);
sb.append(", deviceType=").append(deviceType);
sb.append(", credentialsImg=").append(credentialsImg);

@ -245,6 +245,76 @@ public class EnServiceCompanyDeviceExample {
return (Criteria) this;
}
public Criteria andDeviceNameIsNull() {
addCriterion("device_name is null");
return (Criteria) this;
}
public Criteria andDeviceNameIsNotNull() {
addCriterion("device_name is not null");
return (Criteria) this;
}
public Criteria andDeviceNameEqualTo(String value) {
addCriterion("device_name =", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameNotEqualTo(String value) {
addCriterion("device_name <>", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameGreaterThan(String value) {
addCriterion("device_name >", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameGreaterThanOrEqualTo(String value) {
addCriterion("device_name >=", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameLessThan(String value) {
addCriterion("device_name <", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameLessThanOrEqualTo(String value) {
addCriterion("device_name <=", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameLike(String value) {
addCriterion("device_name like", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameNotLike(String value) {
addCriterion("device_name not like", value, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameIn(List<String> values) {
addCriterion("device_name in", values, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameNotIn(List<String> values) {
addCriterion("device_name not in", values, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameBetween(String value1, String value2) {
addCriterion("device_name between", value1, value2, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNameNotBetween(String value1, String value2) {
addCriterion("device_name not between", value1, value2, "deviceName");
return (Criteria) this;
}
public Criteria andDeviceNoIsNull() {
addCriterion("device_no is null");
return (Criteria) this;

@ -33,6 +33,8 @@ public class SecRole implements Serializable {
*/
private Integer status;
private Long createTimeUserId;
/**
* 创建时间
*/
@ -77,6 +79,14 @@ public class SecRole implements Serializable {
this.status = status;
}
public Long getCreateTimeUserId() {
return createTimeUserId;
}
public void setCreateTimeUserId(Long createTimeUserId) {
this.createTimeUserId = createTimeUserId;
}
public Date getCreateTime() {
return createTime;
}
@ -109,6 +119,7 @@ public class SecRole implements Serializable {
&& (this.getRoleName() == null ? other.getRoleName() == null : this.getRoleName().equals(other.getRoleName()))
&& (this.getRoleDesc() == null ? other.getRoleDesc() == null : this.getRoleDesc().equals(other.getRoleDesc()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateTimeUserId() == null ? other.getCreateTimeUserId() == null : this.getCreateTimeUserId().equals(other.getCreateTimeUserId()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
}
@ -121,6 +132,7 @@ public class SecRole implements Serializable {
result = prime * result + ((getRoleName() == null) ? 0 : getRoleName().hashCode());
result = prime * result + ((getRoleDesc() == null) ? 0 : getRoleDesc().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateTimeUserId() == null) ? 0 : getCreateTimeUserId().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
return result;
@ -136,6 +148,7 @@ public class SecRole implements Serializable {
sb.append(", roleName=").append(roleName);
sb.append(", roleDesc=").append(roleDesc);
sb.append(", status=").append(status);
sb.append(", createTimeUserId=").append(createTimeUserId);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", serialVersionUID=").append(serialVersionUID);

@ -385,6 +385,66 @@ public class SecRoleExample {
return (Criteria) this;
}
public Criteria andCreateTimeUserIdIsNull() {
addCriterion("create_time_user_id is null");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdIsNotNull() {
addCriterion("create_time_user_id is not null");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdEqualTo(Long value) {
addCriterion("create_time_user_id =", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdNotEqualTo(Long value) {
addCriterion("create_time_user_id <>", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdGreaterThan(Long value) {
addCriterion("create_time_user_id >", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("create_time_user_id >=", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdLessThan(Long value) {
addCriterion("create_time_user_id <", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdLessThanOrEqualTo(Long value) {
addCriterion("create_time_user_id <=", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdIn(List<Long> values) {
addCriterion("create_time_user_id in", values, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdNotIn(List<Long> values) {
addCriterion("create_time_user_id not in", values, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdBetween(Long value1, Long value2) {
addCriterion("create_time_user_id between", value1, value2, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdNotBetween(Long value1, Long value2) {
addCriterion("create_time_user_id not between", value1, value2, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;

@ -59,10 +59,12 @@ public class SecUser implements Serializable {
private Long roleId;
/**
* 状态 0删除 1可用 2禁用
* 状态 0删除 1可用
*/
private Integer status;
private Long createTimeUserId;
/**
* 创建时间
*/
@ -161,6 +163,14 @@ public class SecUser implements Serializable {
this.status = status;
}
public Long getCreateTimeUserId() {
return createTimeUserId;
}
public void setCreateTimeUserId(Long createTimeUserId) {
this.createTimeUserId = createTimeUserId;
}
public Date getCreateTime() {
return createTime;
}
@ -223,6 +233,7 @@ public class SecUser implements Serializable {
&& (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId()))
&& (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateTimeUserId() == null ? other.getCreateTimeUserId() == null : this.getCreateTimeUserId().equals(other.getCreateTimeUserId()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@ -244,6 +255,7 @@ public class SecUser implements Serializable {
result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode());
result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateTimeUserId() == null) ? 0 : getCreateTimeUserId().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@ -268,6 +280,7 @@ public class SecUser implements Serializable {
sb.append(", objectId=").append(objectId);
sb.append(", roleId=").append(roleId);
sb.append(", status=").append(status);
sb.append(", createTimeUserId=").append(createTimeUserId);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", ext1=").append(ext1);

@ -775,6 +775,66 @@ public class SecUserExample {
return (Criteria) this;
}
public Criteria andCreateTimeUserIdIsNull() {
addCriterion("create_time_user_id is null");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdIsNotNull() {
addCriterion("create_time_user_id is not null");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdEqualTo(Long value) {
addCriterion("create_time_user_id =", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdNotEqualTo(Long value) {
addCriterion("create_time_user_id <>", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdGreaterThan(Long value) {
addCriterion("create_time_user_id >", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("create_time_user_id >=", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdLessThan(Long value) {
addCriterion("create_time_user_id <", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdLessThanOrEqualTo(Long value) {
addCriterion("create_time_user_id <=", value, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdIn(List<Long> values) {
addCriterion("create_time_user_id in", values, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdNotIn(List<Long> values) {
addCriterion("create_time_user_id not in", values, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdBetween(Long value1, Long value2) {
addCriterion("create_time_user_id between", value1, value2, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeUserIdNotBetween(Long value1, Long value2) {
addCriterion("create_time_user_id not between", value1, value2, "createTimeUserId");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;

@ -62,6 +62,9 @@ public class SecRoleServiceImpl implements SecRoleService {
if (StringUtils.isNotBlank(MapUtils.getString(param, "roleName"))) {
criteria.andRoleNameLike("%"+MapUtils.getString(param, "roleName")+"%");
}
if (MapUtils.getLong(param, "createTimeUserId") != null) {
criteria.andCreateTimeUserIdEqualTo(MapUtils.getLong(param, "createTimeUserId"));
}
example.setOrderByClause("create_time desc");
return secRoleMapper.selectByExample(example);

@ -125,6 +125,9 @@ public class SecUserServiceImpl implements SecUserService {
if (MapUtils.getInteger(param, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(param, "status"));
}
if (MapUtils.getLong(param, "createTimeUserId") != null) {
criteria.andCreateTimeUserIdEqualTo(MapUtils.getLong(param, "createTimeUserId"));
}
example.setOrderByClause("create_time desc");
List<SecUser> list = secUserMapper.selectByExample(example);

@ -82,7 +82,7 @@ public class EnItemSegmentsServiceImpl implements EnItemSegmentsService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnItemSegments> list = enItemSegmentsMapper.selectByExample(example);
return list.isEmpty()?null:list.get(0);
@ -119,7 +119,7 @@ public class EnItemSegmentsServiceImpl implements EnItemSegmentsService {
}else {
criteria.andStatusNotEqualTo(0);
}
example.setOrderByClause("create_time desc");
return enItemSegmentsMapper.selectByExample(example);
}
}

@ -45,6 +45,7 @@ public class EnItemServiceImpl implements EnItemService {
SecUser secUser = new SecUser();
secUser.setUserName(enItem.getProjectName());
secUser.setLoginName(enItem.getContactInfo());
secUser.setCreateTimeUserId(enItem.getCreateUser());
secUser.setPassword(MD5Util.encode("123456".getBytes()));
secUser.setTelephone(enItem.getContactInfo());
secUser.setRoleId(1026L);

@ -42,6 +42,7 @@ public class EnOilDepotsServiceImpl implements EnOilDepotsService {
SecUser secUser = new SecUser();
secUser.setUserName(enOilDepots.getOilDepotName());
secUser.setCreateTimeUserId(enOilDepots.getCreateUser());
secUser.setLoginName(enOilDepots.getContactInfo());
secUser.setPassword(MD5Util.encode("123456".getBytes()));
secUser.setTelephone(enOilDepots.getContactInfo());
@ -120,7 +121,7 @@ public class EnOilDepotsServiceImpl implements EnOilDepotsService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnOilDepots> list = enOilDepotsMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
@ -154,7 +155,7 @@ public class EnOilDepotsServiceImpl implements EnOilDepotsService {
}else {
criteria.andStatusNotEqualTo(0);
}
example.setOrderByClause("create_time desc");
return enOilDepotsMapper.selectByExample(example);
}
}

@ -81,6 +81,7 @@ public class EnOilManagementServiceImpl implements EnOilManagementService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnOilManagement> list = enOilManagementMapper.selectByExample(example);
@ -120,7 +121,7 @@ public class EnOilManagementServiceImpl implements EnOilManagementService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enOilManagementMapper.selectByExample(example);
}
}

@ -88,7 +88,7 @@ public class EnSerCompanySgRelServiceImpl implements EnSerCompanySgRelService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnSerCompanySgRel> list = enSerCompanySgRelMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
@ -122,6 +122,7 @@ public class EnSerCompanySgRelServiceImpl implements EnSerCompanySgRelService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enSerCompanySgRelMapper.selectByExample(example);
}
}

@ -88,7 +88,7 @@ public class EnSerOilDepotsSgRelServiceImpl implements EnSerOilDepotsSgRelServic
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnSerOilDepotsSgRel> list = enSerOilDepotsSgRelMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
@ -122,6 +122,7 @@ public class EnSerOilDepotsSgRelServiceImpl implements EnSerOilDepotsSgRelServic
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enSerOilDepotsSgRelMapper.selectByExample(example);
}
}

@ -74,6 +74,7 @@ public class EnServiceCompanyDeviceServiceImpl implements EnServiceCompanyDevice
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnServiceCompanyDevice> list = enServiceCompanyDeviceMapper.selectByExample(example);
return list.isEmpty()?null:list.get(0);
@ -90,6 +91,9 @@ public class EnServiceCompanyDeviceServiceImpl implements EnServiceCompanyDevice
if (StringUtils.isNotBlank(MapUtils.getString(map, "deviceNo"))) {
criteria.andDeviceNoLike("%"+MapUtils.getString(map, "deviceNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "deviceName"))) {
criteria.andDeviceNameLike("%"+MapUtils.getString(map, "deviceName")+"%");
}
if (MapUtils.getInteger(map, "deviceType") != null) {
criteria.andDeviceTypeEqualTo(MapUtils.getInteger(map, "deviceType"));
@ -105,6 +109,7 @@ public class EnServiceCompanyDeviceServiceImpl implements EnServiceCompanyDevice
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enServiceCompanyDeviceMapper.selectByExample(example) ;
}
}

@ -42,6 +42,7 @@ public class EnServiceCompanyServiceImpl implements EnServiceCompanyService {
SecUser secUser = new SecUser();
secUser.setUserName(enServiceCompany.getName());
secUser.setCreateTimeUserId(enServiceCompany.getCreateUser());
secUser.setLoginName(enServiceCompany.getContactInfo());
secUser.setPassword(MD5Util.encode("123456".getBytes()));
secUser.setTelephone(enServiceCompany.getContactInfo());
@ -118,6 +119,7 @@ public class EnServiceCompanyServiceImpl implements EnServiceCompanyService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnServiceCompany> list = enServiceCompanyMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
@ -151,6 +153,7 @@ public class EnServiceCompanyServiceImpl implements EnServiceCompanyService {
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enServiceCompanyMapper.selectByExample(example);
}
}

@ -36,10 +36,11 @@ public class EnTransportCompanyCarServiceImpl implements EnTransportCompanyCarSe
SecUser secUser = new SecUser();
secUser.setUserName(enTransportCompanyCar.getPerson());
secUser.setCreateTimeUserId(enTransportCompanyCar.getCreateUser());
secUser.setLoginName(enTransportCompanyCar.getContactInfo());
secUser.setPassword(MD5Util.encode("123456".getBytes()));
secUser.setTelephone(enTransportCompanyCar.getContactInfo());
secUser.setRoleId(1029L);
secUser.setRoleId(1030L);
secUser.setObjectType(SecUserObjectTypeEnum.type6.getCode());
secUser.setObjectId(enTransportCompanyCar.getId());
secUser.setStatus(SecUserStatusEnum.status1.getCode());
@ -123,6 +124,7 @@ public class EnTransportCompanyCarServiceImpl implements EnTransportCompanyCarSe
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnTransportCompanyCar> list = enTransportCompanyCarMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
@ -164,6 +166,7 @@ public class EnTransportCompanyCarServiceImpl implements EnTransportCompanyCarSe
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enTransportCompanyCarMapper.selectByExample(example) ;
}
}

@ -39,6 +39,7 @@ public class EnTransportCompanyServiceImpl implements EnTransportCompanyService
SecUser secUser = new SecUser();
secUser.setUserName(enTransportCompany.getName());
secUser.setLoginName(enTransportCompany.getContactInfo());
secUser.setCreateTimeUserId(enTransportCompany.getCreateUser());
secUser.setPassword(MD5Util.encode("123456".getBytes()));
secUser.setTelephone(enTransportCompany.getContactInfo());
secUser.setRoleId(1029L);
@ -114,6 +115,7 @@ public class EnTransportCompanyServiceImpl implements EnTransportCompanyService
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnTransportCompany> list = enTransportCompanyMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
@ -147,6 +149,7 @@ public class EnTransportCompanyServiceImpl implements EnTransportCompanyService
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enTransportCompanyMapper.selectByExample(example);
}
}

@ -127,6 +127,9 @@ public class EnOrderOilServiceImpl implements EnOrderOilService {
if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) {
criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "serviceCompanyDeviceCode"))) {
criteria.andServiceCompanyDeviceCodeLike("%"+MapUtils.getString(map, "serviceCompanyDeviceCode")+"%");
}
if (MapUtils.getInteger(map, "oilType") != null) {
criteria.andOilTypeEqualTo(MapUtils.getInteger(map, "oilType"));
}

@ -12,3 +12,5 @@ obsEndPoint=https://obs.cn-southwest-2.myhuaweicloud.com
obsUrl=https://phg.obs.cn-southwest-2.myhuaweicloud.com
huiPayPreorderNotifyUrl=https://phg.dctpay.com/order/notify/huipay
phgAppid=20250732800
phgSecret=E66D0CED2CB1D5817133FC11B87AF910
Loading…
Cancel
Save