Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 914a1e04
authored
Oct 12, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
2 parents
eb7f533c
db6db1ee
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
192 additions
and
21 deletions
project-interface/src/main/java/com/dituhui/pea/enums/StatusCodeEnum.java
project-interface/src/main/java/com/dituhui/pea/pojo/user/OrgInfo.java
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceDetailResp.java
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfo.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java
project-order/src/main/java/com/dituhui/pea/order/enums/OrganizationType.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceDetailImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrganizationServiceImpl.java
project-user/src/main/java/com/dituhui/pea/user/dao/UserDao.java
project-user/src/main/java/com/dituhui/pea/user/dao/UserOrgDao.java
project-user/src/main/java/com/dituhui/pea/user/dao/UserRoleDao.java
project-user/src/main/java/com/dituhui/pea/user/service/UserService.java
project-user/src/main/java/com/dituhui/pea/user/utils/LevelUtils.java
project-interface/src/main/java/com/dituhui/pea/enums/StatusCodeEnum.java
View file @
914a1e0
...
...
@@ -2,6 +2,7 @@ package com.dituhui.pea.enums;
/**
* 错误码枚举类
*
* @author zl
*/
...
...
@@ -38,39 +39,39 @@ public enum StatusCodeEnum {
/**
* 文件不存在
*/
FILE_NOT_EXIST
(
"005"
,
"文件不存在"
,
false
),
FILE_NOT_EXIST
(
"005"
,
"文件不存在"
,
false
),
/**
* 系统异常
*/
SYSTEM_UNKNOWN_ERROR
(
"006"
,
"系统繁忙,请稍后再试...."
,
false
),
SYSTEM_UNKNOWN_ERROR
(
"006"
,
"系统繁忙,请稍后再试...."
,
false
),
REQUEST_LIMIT_ERROR
(
"0429"
,
"请求超限!"
,
false
),
REQUEST_LIMIT_ERROR
(
"0429"
,
"请求超限!"
,
false
),
/**
* 没有查询到对应的数据
*/
NO_DATA
(
"007"
,
"没有查询到对应的数据"
,
false
),
NO_DATA
(
"007"
,
"没有查询到对应的数据"
,
false
),
/**
* 用户不存在
*/
USER_DOES_NOT_EXIST
(
"008"
,
"用户不存在"
,
false
),
USER_DOES_NOT_EXIST
(
"008"
,
"用户不存在"
,
false
),
/**
* 团队不存在
*/
TEAM_DOES_NOT_EXIST
(
"009"
,
"团队不存在"
,
false
),
TEAM_DOES_NOT_EXIST
(
"009"
,
"团队不存在"
,
false
),
/**
* 手机号码已存在
*/
MOBILE_NUMBER_EXISTS
(
"010"
,
"手机号码已存在"
,
false
),
MOBILE_NUMBER_EXISTS
(
"010"
,
"手机号码已存在"
,
false
),
/**
* 账号已存在
*/
ACCOUNT_EXISTS
(
"011"
,
"账号已存在"
,
false
),
ACCOUNT_EXISTS
(
"011"
,
"账号已存在"
,
false
),
/**
* 邮箱已存在
...
...
@@ -80,17 +81,17 @@ public enum StatusCodeEnum {
/**
* 用户已存在团队中,不能重复添加
*/
USER_ALREADY_EXISTS_TEAM
(
"013"
,
"用户已存在团队中,不能重复添加"
,
false
),
USER_ALREADY_EXISTS_TEAM
(
"013"
,
"用户已存在团队中,不能重复添加"
,
false
),
/**
* 角色不存在
*/
ROLE_DOES_NOT_EXIST
(
"014"
,
"角色不存在"
,
false
),
ROLE_DOES_NOT_EXIST
(
"014"
,
"角色不存在"
,
false
),
/**
* 角色资源为空
*/
ROLE_RESOURCE_EMPTY
(
"015"
,
"角色资源为空!"
,
false
),
ROLE_RESOURCE_EMPTY
(
"015"
,
"角色资源为空!"
,
false
),
/**
* 权限资源不存在
...
...
@@ -100,12 +101,12 @@ public enum StatusCodeEnum {
/**
* 角色中已存在该资源,不能重复添加
*/
RESOURCE_ALREADY_EXISTS_ROLE
(
"017"
,
"角色中已存在该资源,不能重复添加"
,
false
),
RESOURCE_ALREADY_EXISTS_ROLE
(
"017"
,
"角色中已存在该资源,不能重复添加"
,
false
),
/**
* 用户状态异常或已被禁用
*/
USER_ISBAN_OR_ERROR
(
"018"
,
"用户状态异常或已被禁用"
,
false
),
USER_ISBAN_OR_ERROR
(
"018"
,
"用户状态异常或已被禁用"
,
false
),
GIS_EXISTS
(
"001"
,
"已存在"
,
false
),
...
...
@@ -117,8 +118,13 @@ public enum StatusCodeEnum {
GIS_AREA_SMALL
(
"005"
,
"对象操作后面积过小"
,
false
),
GIS_AREA_TOPOLOGY
(
"006"
,
"拓扑处理出错"
,
false
)
;
GIS_AREA_TOPOLOGY
(
"006"
,
"拓扑处理出错"
,
false
),
USER_PHONE_ERROR
(
"019"
,
"手机号格式有误"
,
false
),
USER_EMAIL_ERROR
(
"020"
,
"邮箱格式有误"
,
false
),
USER_ORG_NULL_ERROR
(
"021"
,
"组织结构异常或为空"
,
false
);
/**
* 状态码
...
...
project-interface/src/main/java/com/dituhui/pea/pojo/user/OrgInfo.java
View file @
914a1e0
...
...
@@ -16,4 +16,9 @@ public class OrgInfo implements Serializable {
* 机构名称
*/
private
String
name
;
/**
* 组织级别 0:大区 1:分部 2:站点
*/
private
Integer
orgLevel
;
}
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceDetailResp.java
View file @
914a1e0
...
...
@@ -20,6 +20,28 @@ public class OrderServiceDetailResp {
private
OrderDetail
reschedulingParams
;
private
List
<
KV
>
items
;
/**
* 是否重物搬运(双人上门) 0:否 1:是 默认0
*/
private
Integer
isMultiple
;
/**
* 是否指定某个工程师/是否排除某个工程师 0:否 1:指定 2:排除 默认0
*/
private
Integer
isAppointEngineer
;
/**
* 指定某个工程师/排除某个工程师 codes 多个,分割
*/
private
String
appointEngineerCodes
;
/**
* bean优先级,例如:紧急、正常
*/
private
String
beanPriority
;;
@Data
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
static
class
OrderDetail
{
...
...
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
View file @
914a1e0
...
...
@@ -37,5 +37,21 @@ public class OrderServiceList {
*/
private
String
beanPriority
;
/**
* 是否重物搬运(双人上门) 0:否 1:是 默认0
*/
private
Integer
isMultiple
;
/**
* 是否指定某个工程师/是否排除某个工程师 0:否 1:指定 2:排除 默认0
*/
private
Integer
isAppointEngineer
;
/**
* 指定某个工程师/排除某个工程师 codes 多个,分割
*/
private
String
appointEngineerCodes
;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfo.java
View file @
914a1e0
...
...
@@ -59,4 +59,20 @@ public class OrderInfo {
private
String
description
;
private
Timestamp
createTime
;
private
Timestamp
updateTime
;
/**
* 是否重物搬运(双人上门) 0:否 1:是 默认0
*/
private
Integer
isMultiple
;
/**
* 是否指定某个工程师/是否排除某个工程师 0:否 1:指定 2:排除 默认0
*/
private
Integer
isAppointEngineer
;
/**
* 指定某个工程师/排除某个工程师 codes 多个,分割
*/
private
String
appointEngineerCodes
;
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java
View file @
914a1e0
...
...
@@ -44,10 +44,10 @@ public class OrderInfoEntity {
private
String
address
;
@Column
(
name
=
"x"
,
nullable
=
false
,
length
=
20
)
private
String
x
=
"0"
;
private
String
x
=
"0"
;
@Column
(
name
=
"y"
,
nullable
=
false
,
length
=
20
)
private
String
y
=
"0"
;
private
String
y
=
"0"
;
@Column
(
name
=
"bean_brand"
,
nullable
=
false
,
length
=
20
)
private
String
beanBrand
;
...
...
@@ -176,4 +176,25 @@ public class OrderInfoEntity {
private
LocalDateTime
updateTime
=
LocalDateTime
.
now
();
// Getters and setters (omitted for brevity)
/**
* 是否重物搬运(双人上门) 0:否 1:是 默认0
*/
@Column
(
name
=
"is_multiple"
)
private
Integer
isMultiple
=
0
;
/**
* 是否指定某个工程师/是否排除某个工程师 0:否 1:指定 2:排除 默认0
*/
@Column
(
name
=
"is_appoint_engineer"
)
private
Integer
isAppointEngineer
=
0
;
/**
* 指定某个工程师/排除某个工程师 codes 多个,分割
*/
@Column
(
name
=
"appoint_engineer_codes"
)
private
String
appointEngineerCodes
;
}
project-order/src/main/java/com/dituhui/pea/order/enums/OrganizationType.java
View file @
914a1e0
...
...
@@ -7,6 +7,11 @@ package com.dituhui.pea.order.enums;
public
enum
OrganizationType
{
/**
* 超管
*/
admin
(
"admin"
),
/**
* 大区
*/
cluster
(
"cluster"
),
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java
View file @
914a1e0
...
...
@@ -185,7 +185,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
btime
=
getHourMinute
(
order
.
getPlanStartTime
(),
-
order
.
getArriveElapsed
());
etime
=
getHourMinute
(
order
.
getPlanStartTime
());
}
tips
.
add
(
new
LabelValueDTO
().
setLabel
(
"在途路程"
).
setValue
(
String
.
format
(
"%s
米
"
,
order
.
getArriveDistance
())));
tips
.
add
(
new
LabelValueDTO
().
setLabel
(
"在途路程"
).
setValue
(
String
.
format
(
"%s
公里(千米)
"
,
order
.
getArriveDistance
())));
tips
.
add
(
new
LabelValueDTO
().
setLabel
(
"在途时间"
).
setValue
(
String
.
format
(
"%s-%s"
,
btime
,
etime
)));
tips
.
add
(
new
LabelValueDTO
().
setLabel
(
"在途耗时"
).
setValue
(
String
.
format
(
"%s分钟"
,
order
.
getArriveElapsed
())));
return
tips
;
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceDetailImpl.java
View file @
914a1e0
...
...
@@ -68,6 +68,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
res
.
setReschedulingParams
(
detail
);
res
.
setItems
(
items
);
res
.
setIsMultiple
(
order
.
getIsMultiple
());
res
.
setIsAppointEngineer
(
order
.
getIsAppointEngineer
());
res
.
setAppointEngineerCodes
(
order
.
getAppointEngineerCodes
());
res
.
setBeanPriority
(
order
.
getBeanPriority
());
return
Result
.
success
(
res
);
}
...
...
@@ -125,12 +130,12 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
List
<
OrderAppointmentListResp
.
OrderAppointment
>
items
=
new
ArrayList
<>();
for
(
OrderInfoEntity
o
:
results
)
{
EngineerInfoEntity
eg
=
egInfo
.
getOrDefault
(
o
.
getEngineerCode
(),
null
);
if
(
eg
==
null
)
{
if
(
eg
==
null
)
{
log
.
warn
(
"未获得工程师{}基础信息, 订单:{}"
,
o
.
getEngineerCode
(),
o
.
getOrderId
());
continue
;
}
String
skill
=
egSkill
.
getOrDefault
(
o
.
getEngineerCode
(),
null
);
if
(
skill
==
null
)
{
if
(
skill
==
null
)
{
log
.
warn
(
"未获得工程师{}基础技能, 订单:{}"
,
o
.
getEngineerCode
(),
o
.
getOrderId
());
}
...
...
@@ -192,7 +197,8 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
if
(
egCodes
.
isEmpty
())
{
return
map
;
}
List
<
EngineerInfoEntity
>
rows
=
engineerInfoDao
.
findByEngineerCodeIn
(
egCodes
);;
List
<
EngineerInfoEntity
>
rows
=
engineerInfoDao
.
findByEngineerCodeIn
(
egCodes
);
;
for
(
EngineerInfoEntity
row
:
rows
)
{
map
.
put
(
row
.
getEngineerCode
(),
row
);
}
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
View file @
914a1e0
...
...
@@ -140,6 +140,9 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record
.
setCreateTime
(
TimeUtils
.
IsoTimestamp2DateTime
(
o
.
getCreateTime
()));
record
.
setBeanPriority
(
o
.
getBeanPriority
());
record
.
setIsMultiple
(
o
.
getIsMultiple
());
record
.
setIsAppointEngineer
(
o
.
getIsAppointEngineer
());
record
.
setAppointEngineerCodes
(
o
.
getAppointEngineerCodes
());
content
.
add
(
record
);
}
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrganizationServiceImpl.java
View file @
914a1e0
...
...
@@ -235,6 +235,18 @@ public class OrganizationServiceImpl implements OrganizationService {
}).
collect
(
Collectors
.
toList
());
}
break
;
case
admin:
List
<
OrgClusterEntity
>
adminCluster
=
orgClusterDao
.
findAll
();
if
(
CollectionUtils
.
isNotEmpty
(
adminCluster
))
{
return
adminCluster
.
stream
().
map
(
c
->
{
OrganizationDTO
organizationDTO
=
new
OrganizationDTO
();
organizationDTO
.
setId
(
c
.
getClusterId
());
organizationDTO
.
setName
(
c
.
getName
());
organizationDTO
.
setType
(
OrganizationType
.
cluster
.
getValue
());
return
organizationDTO
;
}).
collect
(
Collectors
.
toList
());
}
break
;
default
:
break
;
}
...
...
project-user/src/main/java/com/dituhui/pea/user/dao/UserDao.java
View file @
914a1e0
...
...
@@ -4,9 +4,11 @@ import java.util.List;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaSpecificationExecutor
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.repository.CrudRepository
;
import
com.dituhui.pea.user.entity.UserEntity
;
import
org.springframework.data.repository.query.Param
;
/**
* 用户表(User)表数据库访问层
...
...
@@ -80,4 +82,14 @@ public interface UserDao extends JpaRepository<UserEntity, String>, JpaSpecifica
*/
List
<
UserEntity
>
findByIdIn
(
List
<
String
>
userIds
);
/**
* 登录验证
* @param loginname 登录名(手机号、邮箱、用户名)
* @param password 密码
* @return
*/
@Query
(
"select t from UserEntity t where (t.account=:loginname or t.email=:loginname or t.phone=:loginname) and t.password=:password"
)
public
UserEntity
findByLoginnameAndPass
(
@Param
(
"loginname"
)
String
loginname
,
@Param
(
"password"
)
String
password
);
}
project-user/src/main/java/com/dituhui/pea/user/dao/UserOrgDao.java
View file @
914a1e0
...
...
@@ -21,5 +21,13 @@ public interface UserOrgDao extends JpaRepository<UserOrgEntity, String>, JpaSpe
*/
List
<
UserOrgEntity
>
findByUserId
(
String
userId
);
/**
* 根据用户id查询
*
* @param orgId
* @return
*/
List
<
UserOrgEntity
>
findByOrgId
(
String
orgId
);
void
deleteByUserId
(
String
userId
);
}
project-user/src/main/java/com/dituhui/pea/user/dao/UserRoleDao.java
View file @
914a1e0
...
...
@@ -34,6 +34,14 @@ public interface UserRoleDao extends JpaRepository<UserRoleEntity, String>,
List
<
UserRoleEntity
>
findByUserId
(
String
userId
);
/**
* 根据用户ID查询
*
* @param userId 用户ID
* @return
*/
List
<
UserRoleEntity
>
findByUserIdIn
(
List
<
String
>
userId
);
/**
* 根据角色ID和用户ID删除
*
* @param roleId 角色ID
...
...
project-user/src/main/java/com/dituhui/pea/user/service/UserService.java
View file @
914a1e0
This diff is collapsed.
Click to expand it.
project-user/src/main/java/com/dituhui/pea/user/utils/LevelUtils.java
0 → 100644
View file @
914a1e0
package
com
.
dituhui
.
pea
.
user
.
utils
;
import
cn.hutool.core.util.ObjectUtil
;
public
class
LevelUtils
{
/**
* 组织级别转换
*
* @param orgLevel
* @return
*/
public
static
String
convertOrgLevel
(
Integer
orgLevel
)
{
if
(
ObjectUtil
.
isNull
(
orgLevel
))
{
return
null
;
}
String
level
=
null
;
switch
(
orgLevel
)
{
case
0
:
return
level
=
"cluster"
;
case
1
:
return
level
=
"branch"
;
case
2
:
return
level
=
"group"
;
}
return
level
;
}
}
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment