Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
675cdd1b
Commit
675cdd1b
authored
Sep 10, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://172.16.10.76/moa/amos-boot-biz
into developer
parents
5dc4c319
4b6f8dc1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
140 additions
and
54 deletions
+140
-54
DutyPersonShiftMapper.xml
...n-api/src/main/resources/mapper/DutyPersonShiftMapper.xml
+1
-1
FirefightersMapper.xml
...mmon-api/src/main/resources/mapper/FirefightersMapper.xml
+24
-11
OrgPersonController.java
...oot/module/common/biz/controller/OrgPersonController.java
+1
-1
OrgUsrController.java
...s/boot/module/common/biz/controller/OrgUsrController.java
+5
-1
WaterResourceController.java
...module/common/biz/controller/WaterResourceController.java
+0
-3
DutyCommonServiceImpl.java
...module/common/biz/service/impl/DutyCommonServiceImpl.java
+31
-0
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+69
-29
ExcelServiceImpl.java
...os/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
+0
-0
application.properties
...boot-system-jcs/src/main/resources/application.properties
+9
-8
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml
View file @
675cdd1b
...
...
@@ -19,7 +19,7 @@
and s.duty_date >= #{beginDate}
and s.duty_date
<![CDATA[<=]]>
#{endDate}
and s.app_Key = #{appKey}
GROUP BY s.duty_date
GROUP BY s.duty_date
,s.shift_id
<!--增添分组条件 根据班次分组技术 -->
) a) as maxDutyPersonNumDay,
(select
IFNULL(max(num),0)
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml
View file @
675cdd1b
...
...
@@ -3,7 +3,8 @@
<mapper
namespace=
"com.yeejoin.amos.boot.module.common.api.mapper.FirefightersMapper"
>
<select
id=
"getFirefightersJobTitleCount"
resultType=
"com.yeejoin.amos.boot.biz.common.utils.FirefightersTreeDto"
>
<select
id=
"getFirefightersJobTitleCount"
resultType=
"com.yeejoin.amos.boot.biz.common.utils.FirefightersTreeDto"
>
select COUNT(a.sequence_nbr) num, a.job_title_code jobTitleCode
from cb_firefighters a
where a.is_delete = 0
...
...
@@ -12,7 +13,9 @@
<!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
<select
id=
"getFirefighters"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto"
>
select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code areasExpertiseCode from cb_firefighters a LEFT JOIN cb_firefighters_post b on
select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code
areasExpertiseCode from cb_firefighters a LEFT JOIN
cb_firefighters_post b on
a.sequence_nbr=b.firefighters_id where a.is_delete=0
<if
test=
'par.postQualification!=null'
>
and b.post_qualification_code = #{par.postQualification}
</if>
<if
test=
'par.areasExpertise!=null'
>
and b.areas_expertise_code= #{par.areasExpertise}
</if>
...
...
@@ -20,7 +23,8 @@
<if
test=
'par.state!=null'
>
and a.state_code= #{par.state}
</if>
<if
test=
'par.fireTeamId!=null'
>
and a.fire_team_id= #{par.fireTeamId}
</if>
<if
test=
'par.jobTitle!=null'
>
and a.job_title_code =#{par.jobTitle}
</if>
<if
test=
'par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'
>
and b.areas_expertise_code =#{par.areasExpertiseCode}
</if>
<if
test=
'par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'
>
and b.areas_expertise_code =#{par.areasExpertiseCode}
</if>
<if
test=
'par.areasExpertiseCode=="0"'
>
and b.areas_expertise_code is not null
</if>
ORDER BY a.rec_date desc limit #{pageNum},#{pageSize}
</select>
...
...
@@ -35,7 +39,8 @@
<if
test=
'par.state!=null'
>
and a.state_code= #{par.state}
</if>
<if
test=
'par.fireTeamId!=null'
>
and a.fire_team_id= #{par.fireTeamId}
</if>
<if
test=
'par.jobTitle!=null'
>
and a.job_title_code =#{par.jobTitle}
</if>
<if
test=
'par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'
>
and b.areas_expertise_code =#{par.areasExpertiseCode}
</if>
<if
test=
'par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'
>
and b.areas_expertise_code =#{par.areasExpertiseCode}
</if>
<if
test=
'par.areasExpertiseCode=="0"'
>
and b.areas_expertise_code is not null
</if>
ORDER BY a.rec_date desc
...
...
@@ -69,13 +74,21 @@
</select>
<!-- BUG3553 BY kongfm 人员关系显示汉字-->
<select
id=
"exportToExcel"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto"
>
select f.*,
(select cb_fire_team.name from cb_fire_team where cb_fire_team.sequence_nbr=f.fire_team_id) fireTeam,
emergency_contact, (select da.name from cb_data_dictionary da where da.code = fc.relationship) as relationship , emergency_contact_phone
from cb_firefighters f
left join cb_firefighters_contacts fc on f.sequence_nbr = fc.firefighters_id
<!-- BUG3553 BY kongfm 人员关系显示汉字 -->
<select
id=
"exportToExcel"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto"
>
SELECT
f.*,
( SELECT cb_fire_team.NAME FROM cb_fire_team WHERE
cb_fire_team.sequence_nbr = f.fire_team_id ) fireTeam,
emergency_contact,
da.NAME AS relationship,
emergency_contact_phone
FROM
cb_firefighters f
LEFT JOIN cb_firefighters_contacts fc ON f.sequence_nbr =
fc.firefighters_id
left join cb_data_dictionary da on da.CODE = fc.relationship
where f.is_delete = #{isDelete}
</select>
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java
View file @
675cdd1b
...
...
@@ -79,7 +79,7 @@ public class OrgPersonController {
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"更新单位数据"
,
notes
=
"更新单位数据"
)
public
ResponseModel
<?>
updateByIdOrgUsr
(
HttpServletRequest
request
,
@RequestBody
OrgPersonDto
OrgPersonVo
,
@PathVariable
Long
id
)
throws
Exception
{
//
OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
OrgPersonVo
.
setBizOrgType
(
CommonConstant
.
BIZ_ORG_TYPE_PERSON
);
iOrgUsrService
.
updateByIdOrgPerson
(
OrgPersonVo
,
id
);
return
ResponseHelper
.
buildResponse
(
null
);
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @
675cdd1b
...
...
@@ -87,7 +87,10 @@ public class OrgUsrController extends BaseController {
return
ResponseHelper
.
buildResponse
(
"-1"
);
}
}
iOrgUsrService
.
update
(
new
UpdateWrapper
<
OrgUsr
>().
eq
(
"sequence_nbr"
,
id
).
set
(
"is_delete"
,
CommonConstant
.
IS_DELETE_01
));
// iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
/*bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 开始*/
iOrgUsrService
.
update
(
new
UpdateWrapper
<
OrgUsr
>().
eq
(
"sequence_nbr"
,
String
.
valueOf
(
id
)).
set
(
"is_delete"
,
CommonConstant
.
IS_DELETE_01
));
/*bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 结束*/
try
{
eSOrgUsrService
.
deleteById
(
id
);
emqKeeper
.
getMqttClient
().
publish
(
airportDeleteTopic
,
JSON
.
toJSONString
(
id
).
getBytes
(),
2
,
false
);
...
...
@@ -108,6 +111,7 @@ public class OrgUsrController extends BaseController {
@RequestMapping
(
value
=
"/{id}"
,
method
=
RequestMethod
.
PUT
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"更新单位数据"
,
notes
=
"更新单位数据"
)
public
ResponseModel
<?>
updateByIdOrgUsr
(
HttpServletRequest
request
,
@RequestBody
OrgUsrDto
OrgUsrVo
,
@PathVariable
Long
id
)
throws
Exception
{
OrgUsrVo
.
setBizOrgType
(
CommonConstant
.
BIZ_ORG_TYPE_COMPANY
);
iOrgUsrService
.
updateByIdOrgUsr
(
OrgUsrVo
,
id
);
return
ResponseHelper
.
buildResponse
(
null
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java
View file @
675cdd1b
...
...
@@ -100,7 +100,6 @@ public class WaterResourceController extends BaseController {
model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
}*/
if
(!
StringUtils
.
isEmpty
(
resourceType
))
{
switch
(
resourceType
)
{
case
"hydrant"
:
...
...
@@ -176,8 +175,6 @@ public class WaterResourceController extends BaseController {
model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
}*/
// 更新基本信息
model
.
setSequenceNbr
(
sequenceNbr
);
model
.
setRealityImg
(
JSONArray
.
toJSONString
(
model
.
getRealityImgList
()));
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java
View file @
675cdd1b
...
...
@@ -85,16 +85,43 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
}
private
void
fillDutyShiftData
(
String
beginDate
,
String
endDate
,
Map
<
String
,
Object
>
m
)
throws
ParseException
{
// 获取值班的实例id
String
instanceId
=
m
.
get
(
"instanceId"
).
toString
();
// 根据appkey 获取未删除的值班班次
List
<
DutyShift
>
dutyShifts
=
dutyShiftService
.
list
(
new
LambdaQueryWrapper
<
DutyShift
>()
.
eq
(
BaseEntity:
:
getIsDelete
,
false
).
eq
(
DutyShift:
:
getAppKey
,
RequestContext
.
getAppKey
()));
// 根据id 保存成key -value
Map
<
Long
,
DutyShift
>
keyNameMap
=
dutyShifts
.
stream
()
.
collect
(
Collectors
.
toMap
(
BaseEntity:
:
getSequenceNbr
,
Function
.
identity
()));
// 根据时间 查询值班关系表
// BUG 2806 获取月份第一天和最后一天 2021-09-09 by kongfm
if
(
beginDate
!=
null
)
{
Calendar
c
=
Calendar
.
getInstance
();
c
.
setTime
(
DateUtils
.
longStr2Date
(
beginDate
));
c
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
c
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
c
.
set
(
Calendar
.
MINUTE
,
0
);
c
.
set
(
Calendar
.
SECOND
,
0
);
beginDate
=
DateUtils
.
date2LongStr
(
c
.
getTime
());
}
if
(
endDate
!=
null
)
{
Calendar
c
=
Calendar
.
getInstance
();
c
.
setTime
(
DateUtils
.
longStr2Date
(
beginDate
));
c
.
add
(
Calendar
.
MONTH
,
1
);
c
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
c
.
add
(
Calendar
.
DATE
,
-
1
);
c
.
set
(
Calendar
.
HOUR_OF_DAY
,
23
);
c
.
set
(
Calendar
.
MINUTE
,
59
);
c
.
set
(
Calendar
.
SECOND
,
59
);
endDate
=
DateUtils
.
date2LongStr
(
c
.
getTime
());
}
List
<
DutyPersonShiftDto
>
personShiftList
=
dutyPersonShiftService
.
list
(
new
LambdaQueryWrapper
<
DutyPersonShift
>().
eq
(
DutyPersonShift:
:
getInstanceId
,
instanceId
)
.
ge
(
beginDate
!=
null
,
DutyPersonShift:
:
getDutyDate
,
beginDate
)
.
le
(
endDate
!=
null
,
DutyPersonShift:
:
getDutyDate
,
endDate
))
.
stream
().
map
(
e
->
{
// 值班关系查询到以后 重新封装
DutyPersonShiftDto
dto
=
new
DutyPersonShiftDto
();
Bean
.
copyExistPropertis
(
e
,
dto
);
// 没值班信息,默认休
...
...
@@ -152,6 +179,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
public
List
<
Map
<
String
,
Object
>>
list
(
Long
teamId
,
String
beginDate
,
String
endDate
)
throws
ParseException
{
// 1.已column为准 进行返回
String
groupCode
=
this
.
getGroupCode
();
// 动态表单查询所有值班信息
List
<
Map
<
String
,
Object
>>
list
=
dynamicFormInstanceService
.
listAll
(
groupCode
);
// 2.组织值班数据
...
...
@@ -299,6 +327,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
@Override
public
Boolean
deleteDutyData
(
Long
instanceId
)
{
// 一个人共用一个 instanceId
dynamicFormInstanceService
.
remove
(
new
LambdaQueryWrapper
<
DynamicFormInstance
>().
eq
(
DynamicFormInstance:
:
getInstanceId
,
instanceId
));
dutyPersonShiftService
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
675cdd1b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
biz
.
service
.
impl
;
import
java.lang.reflect.Method
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
javax.annotation.Resource
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
import
org.typroject.tyboot.core.foundation.utils.Bean
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
...
...
@@ -8,7 +33,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yeejoin.amos.boot.biz.common.constants.CommonConstant
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
com.yeejoin.amos.boot.biz.common.utils.TreeParser
;
import
com.yeejoin.amos.boot.module.common.api.dto.*
;
import
com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.CompanyDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson
;
import
com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.FormValue
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.RequestData
;
import
com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto
;
import
com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn
;
import
com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance
;
import
com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany
;
...
...
@@ -23,24 +65,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.RoleModel
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.typroject.tyboot.core.foundation.utils.Bean
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
import
javax.annotation.Resource
;
import
java.lang.reflect.Method
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* 机构/部门/人员表 服务实现类
*
...
...
@@ -169,13 +193,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return
resultList
;
}
@SuppressWarnings
(
"unchecked"
)
@Override
public
List
<
OrgMenuDto
>
getSub
(
Long
topId
,
@SuppressWarnings
(
"rawtypes"
)
Collection
entityList
,
String
packageURL
,
String
IDMethodName
,
int
IDHierarchy
,
String
NAMEMethodName
,
String
PARENTIDMethodName
,
String
OrgTypeMethodName
)
throws
Exception
{
List
<
OrgMenuDto
>
childList
=
new
ArrayList
<>();
@SuppressWarnings
(
"rawtypes"
)
Class
clazz
=
Class
.
forName
(
packageURL
);
Method
IDMethodNameme
=
null
;
switch
(
IDHierarchy
)
{
...
...
@@ -413,14 +435,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
private
void
updateChildOrgCode
(
String
oriOrgCode
,
String
targetOrgCode
)
{
List
<
OrgUsr
>
list
=
queryOrgUsrList
(
oriOrgCode
);
if
(
ObjectUtils
.
isEmpty
(
list
))
{
return
;
}
if
(!
ObjectUtils
.
isEmpty
(
list
))
{
list
.
forEach
(
action
->
{
action
.
setBizOrgCode
(
action
.
getBizOrgCode
().
replace
(
oriOrgCode
,
targetOrgCode
));
updateById
(
action
);
});
}
}
public
List
<
OrgUsr
>
queryOrgUsrList
(
String
bizOrgCode
)
{
return
this
.
baseMapper
.
queryOrgUsrListByBizOrgCode
(
bizOrgCode
);
...
...
@@ -621,6 +642,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
OrgUsr
oriOrgUsr
=
getById
(
id
);
BeanUtils
.
copyProperties
(
OrgUsrVo
,
orgUsr
);
/*单位编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
OrgUsr
parent
=
getById
(
OrgUsrVo
.
getParentId
());
if
(
parent
!=
null
){
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
orgUsr
.
setSequenceNbr
(
id
);
/*单位编辑后 code值也应做出修改 2021-09-09 陈召 结束 */
saveOrgUsr
(
orgUsr
,
oriOrgUsr
);
// 保存动态表单数据
updateDynamicFormInstance
(
orgUsr
.
getSequenceNbr
(),
OrgUsrVo
.
getDynamicFormValue
());
...
...
@@ -636,13 +664,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
OrgUsr
oriOrgUsr
=
getById
(
id
);
BeanUtils
.
copyProperties
(
OrgPersonVo
,
orgUsr
);
orgUsr
.
setSequenceNbr
(
id
);
/* Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召 开始*/
/* Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召 开始*/
OrgUsr
parent
=
getById
(
OrgPersonVo
.
getParentId
());
if
(!
ObjectUtils
.
isEmpty
(
parent
)
){
if
(
parent
!=
null
){
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
/* Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召 结束*/
orgUsr
.
setSequenceNbr
(
id
);
if
(!
ObjectUtils
.
isEmpty
(
OrgPersonVo
.
getAmosOrgId
()))
{
AgencyUserModel
user
=
Privilege
.
agencyUserClient
.
queryByUserId
(
OrgPersonVo
.
getAmosOrgId
()).
getResult
();
oriOrgUsr
.
setAmosOrgCode
(
user
.
getRealName
());
...
...
@@ -776,6 +804,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr
orgUsr
=
new
OrgUsr
();
OrgUsr
oriOrgUsr
=
getById
(
id
);
BeanUtils
.
copyProperties
(
OrgDepartmentVo
,
orgUsr
);
/*部门编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
OrgUsr
parent
=
getById
(
OrgDepartmentVo
.
getParentId
());
if
(
parent
!=
null
){
orgUsr
.
setBizOrgCode
(
parent
.
getBizOrgCode
()
+
getOrgCodeStr
());
}
orgUsr
.
setSequenceNbr
(
id
);
/*部门编辑后 code值也应做出修改 2021-09-09 陈召 结束 */
saveOrgUsr
(
orgUsr
,
oriOrgUsr
);
// 保存动态表单数据
updateDynamicFormInstance
(
orgUsr
.
getSequenceNbr
(),
OrgDepartmentVo
.
getDynamicFormValue
());
...
...
@@ -961,7 +997,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return
null
;
}
return
ids
.
stream
().
map
(
m
->
{
OrgUsr
org
=
getById
(
m
);
// BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据 2021 - 09 - 09by kongfm
OrgUsr
org
=
getById
(
m
.
toString
());
if
(
ObjectUtils
.
isEmpty
(
org
))
{
return
null
;
}
...
...
@@ -979,6 +1016,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return
this
.
queryForList
(
null
,
false
,
parentId
,
bizOrgType
,
isDelete
);
}
public
List
<
OrgUsrDto
>
queryForListByParentIdAndOrgType
(
Long
parentId
,
String
bizOrgType
)
{
return
Bean
.
toModels
(
this
.
list
(
new
LambdaQueryWrapper
<
OrgUsr
>().
eq
(
OrgUsr:
:
getIsDelete
,
false
).
eq
(
OrgUsr:
:
getParentId
,
parentId
).
eq
(
OrgUsr:
:
getBizOrgType
,
bizOrgType
)),
this
.
getModelClass
());
}
public
OrgUsrDto
getOrg
(
String
amosUserId
)
{
OrgUsrDto
person
=
queryForListByParentIdAndOrgType
(
amosUserId
);
if
(
ObjectUtils
.
isEmpty
(
person
))
{
...
...
@@ -1383,7 +1424,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List
<
OrgUsr
>
orgUsrList
=
this
.
baseMapper
.
selectList
(
wrapper
);
return
orgUsrList
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @
675cdd1b
This diff is collapsed.
Click to expand it.
amos-boot-system-jcs/src/main/resources/application.properties
View file @
675cdd1b
spring.application.name
=
JCS
-chenhao
spring.application.name
=
JCS
server.servlet.context-path
=
/jcs
server.port
=
11100
spring.profiles.active
=
dev
...
...
@@ -7,10 +7,10 @@ spring.jackson.time-zone=GMT+8
spring.jackson.date-format
=
yyyy-MM-dd HH:mm:ss
logging.config
=
classpath:logback-${spring.profiles.active}.xml
## mybatis-plus
é ç½®æ§å¶å°æå°å®æ´å¸¦åæ°SQLè¯å¥
## mybatis-plus
配置控制台打印完整带参数SQL语句
mybatis-plus.configuration.log-impl
=
org.apache.ibatis.logging.stdout.StdOutImpl
## redis
å¤±ææ¶é´
## redis
失效时间
redis.cache.failure.time
=
10800
## unit(h)
...
...
@@ -52,13 +52,13 @@ spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time
=
300
#在重启服务的过程中是否清空缓存的标识符 --2021-09-09
my.spring.redis.cache.isclean
=
false
## mqtt-
è¦æ åæ¥æ¶æ¯ä¸»é¢
## mqtt-
警情初报消息主题
mqtt.topic.alert.reporting
=
alertReporting
##
å®æææ¥æ°è¦æ �?�æ¥ä¸»é¢
##
实战指挥新警情主题
mqtt.topic.command.alert.notice
=
alertNotice
##
è·é©¬ç¯å°éï¼å¤©æ°é¢è¦ä¿¡æ¯
##
跑马灯地震、天气预警信息
mqtt.topic.command.meteorological.notice
=
meteorological
mqtt.topic.command.power.deployment
=
power
...
...
@@ -72,8 +72,8 @@ iot.fegin.name=AMOS-API-IOT
equip.fegin.name
=
AMOS-EQUIPMANAGE
##
设å¤è卿å¡ï¼è½¦åºé¨ã广æãè¦éï¼
##
设备联动服务(车库门、广播、警铃)
control.fegin.name
=
JCS-API-CONTROL
##
æ éæ¥ä¿®æµç¨
##
故障报修流程
failure.work.flow.processDefinitionKey
=
malfunction_repair
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment