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
bdfa1733
Commit
bdfa1733
authored
Dec 07, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
两个规定 单个提交优化
parent
81cb0d08
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
44 deletions
+39
-44
ControllerAop.java
...a/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
+1
-0
ESTaskDetailDto.java
...a/com/yeejoin/amos/patrol/dao/entity/ESTaskDetailDto.java
+2
-0
XJConstant.java
...om/yeejoin/amos/patrol/business/constants/XJConstant.java
+3
-0
CheckController.java
...join/amos/patrol/business/controller/CheckController.java
+12
-44
PlanTaskDetailMapper.java
...amos/patrol/business/dao/mapper/PlanTaskDetailMapper.java
+2
-0
CheckServiceImpl.java
...n/amos/patrol/business/service/impl/CheckServiceImpl.java
+0
-0
ICheckService.java
...oin/amos/patrol/business/service/intfc/ICheckService.java
+8
-0
plan_task_detail.xml
...rol-biz/src/main/resources/db/mapper/plan_task_detail.xml
+11
-0
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @
bdfa1733
...
...
@@ -289,6 +289,7 @@ public class ControllerAop {
regionParams
.
setUserModel
(
userList
.
get
(
0
));
ReginParams
.
PersonIdentity
personIdentity
=
new
ReginParams
.
PersonIdentity
();
personIdentity
.
setBizOrgCode
(
companyM
.
getOrgCode
());
personIdentity
.
setCompanyBizOrgCode
(
companyM
.
getOrgCode
());
regionParams
.
setPersonIdentity
(
personIdentity
);
redisUtils
.
set
(
authToken
,
JSONObject
.
toJSONString
(
regionParams
),
redisRegionTimeSecond
);
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/ESTaskDetailDto.java
View file @
bdfa1733
...
...
@@ -82,6 +82,8 @@ public class ESTaskDetailDto {
@Field
(
type
=
FieldType
.
Text
)
private
String
score
;
private
String
isRisk
;
@Field
(
type
=
FieldType
.
Text
)
private
List
<
String
>
pointImgUrls
;
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/constants/XJConstant.java
View file @
bdfa1733
...
...
@@ -375,6 +375,9 @@ public class XJConstant {
public
static
final
int
INIT_NUM
=
0
;
public
static
final
int
RISK_NUM
=
1
;
public
static
final
int
NORISK_NUM
=
2
;
//点是否有合格 1 合格 2 不合格
public
static
final
String
IS_RISK
=
"1"
;
public
static
final
String
NO_IS_RISK
=
"2"
;
public
static
final
String
INPUT_ITEM_OK_SCORE
=
"OkScore"
;
public
static
final
String
INPUT_ITEM_NOT_SCORE
=
"NoScore"
;
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @
bdfa1733
package
com
.
yeejoin
.
amos
.
patrol
.
business
.
controller
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.utils.DateUtils
;
import
com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient
;
...
...
@@ -17,6 +18,7 @@ import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskDetailVo;
import
com.yeejoin.amos.patrol.business.dto.SendToMsgRiskEquipInfoVo
;
import
com.yeejoin.amos.patrol.business.dto.TopicEntityVo
;
import
com.yeejoin.amos.patrol.business.param.CheckInfoPageParam
;
import
com.yeejoin.amos.patrol.business.param.CheckInputParam
;
import
com.yeejoin.amos.patrol.business.param.CheckRecordParam
;
import
com.yeejoin.amos.patrol.business.param.CheckStatisticalParam
;
import
com.yeejoin.amos.patrol.business.service.intfc.ICheckService
;
...
...
@@ -40,6 +42,7 @@ import com.yeejoin.amos.patrol.common.enums.PlanTaskTypeStatusEnum;
import
com.yeejoin.amos.patrol.core.async.AsyncTask
;
import
com.yeejoin.amos.patrol.core.common.request.CommonPageable
;
import
com.yeejoin.amos.patrol.core.common.request.CommonRequest
;
import
com.yeejoin.amos.patrol.core.common.response.AppCheckInputRespone
;
import
com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone
;
import
com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse
;
import
com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum
;
...
...
@@ -53,6 +56,7 @@ import com.yeejoin.amos.patrol.utils.UserTransmittableUtils;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.io.IOUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
...
...
@@ -94,6 +98,7 @@ import java.util.Date;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
@RestController
@RequestMapping
(
value
=
"/api/check"
)
...
...
@@ -162,9 +167,6 @@ public class CheckController extends AbstractBaseController {
PointMapper
pointMapper
;
@Autowired
ESPlanTaskList
esPlanTaskList
;
@Autowired
JobService
jobService
;
private
String
P_STATIC_DAY
=
"p_static_day"
;
...
...
@@ -278,48 +280,14 @@ public class CheckController extends AbstractBaseController {
}
int
count
=
checkService
.
checkHasRecord
(
requestParam
);
if
(
count
<
1
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
orgCode
=
reginParams
.
getPersonIdentity
().
getBizOrgCode
(
);
requestParam
.
setOrgCode
(
orgCode
);
requestParam
.
setUserId
(
getUserId
());
CheckDto
checkDto
=
checkService
.
saveCheckRecordNew
(
requestParam
,
planTask
);
//准备es数据
ESTaskDetailDto
esTaskDetailDto
=
checkService
.
buildEsDetailData
(
requestParam
,
planTask
);
ESPlanTaskListDto
esPlanTaskListDto
=
checkService
.
buildEsTaskData
(
requestParam
.
getPlanTaskId
(),
esTaskDetailDto
);
//更新必须数据
checkService
.
saveMustData
(
esTaskDetailDto
,
esPlanTaskListDto
,
planTask
);
Long
planTaskId
=
planTask
.
getId
();
List
<
String
>
ids
=
new
ArrayList
<>();
ids
.
add
(
String
.
valueOf
(
planTaskId
));
Map
<
String
,
Object
>
map
=
planTaskMapper
.
selectTaskStatus
(
planTaskId
);
String
status
=
map
.
get
(
"status"
).
toString
();
ESPlanTaskListDto
esPlanTaskListDto
=
esPlanTaskList
.
findById
(
String
.
valueOf
(
planTaskId
)).
get
();
Map
task
=
planTaskMapper
.
queryPlanTaskById
(
planTaskId
);
esPlanTaskListDto
.
setFinshNum
(
ObjectUtils
.
isEmpty
(
task
.
get
(
"finshNum"
))
?
"0"
:
task
.
get
(
"finshNum"
).
toString
());
esPlanTaskListDto
.
setOmission
(
ObjectUtils
.
isEmpty
(
task
.
get
(
"omission"
))
?
"0"
:
task
.
get
(
"omission"
).
toString
());
esPlanTaskListDto
.
setUnqualified
(
ObjectUtils
.
isEmpty
(
task
.
get
(
"unqualified"
))
?
"0"
:
task
.
get
(
"unqualified"
).
toString
());
esPlanTaskListDto
.
setUnplan
(
ObjectUtils
.
isEmpty
(
task
.
get
(
"unplan"
))
?
"0"
:
task
.
get
(
"unplan"
).
toString
());
esPlanTaskListDto
.
setTaskPlanNum
(
ObjectUtils
.
isEmpty
(
task
.
get
(
"taskPlanNum"
))
?
"0"
:
task
.
get
(
"taskPlanNum"
).
toString
());
List
<
PlanTaskDetail
>
planTaskDetailList
=
planTaskMapper
.
selectTaskDetails
(
"('"
+
planTaskId
+
"')"
);
esPlanTaskListDto
.
setFinishStatus
(
status
);
esPlanTaskListDto
.
setPoints
(
planTaskDetailList
);
esPlanTaskList
.
save
(
esPlanTaskListDto
);
if
(
status
.
equals
(
String
.
valueOf
(
PlanTaskFinishStatusEnum
.
FINISHED
.
getValue
())))
{
// 更新统计表
if
(
planTask
.
getPlanType
().
equals
(
String
.
valueOf
(
PlanTaskTypeStatusEnum
.
day
.
getValue
())))
{
planTaskMapper
.
updateSingle
(
P_STATIC_DAY
,
XJConstant
.
RISK_NUM
==
Integer
.
parseInt
(
map
.
get
(
"riskStatus"
).
toString
())
?
1
:
0
,
XJConstant
.
NORISK_NUM
==
Integer
.
parseInt
(
map
.
get
(
"riskStatus"
).
toString
())
?
1
:
0
,
planTask
.
getOrgCode
(),
planTask
.
getCheckDate
());
}
else
if
(
planTask
.
getPlanType
().
equals
(
String
.
valueOf
(
PlanTaskTypeStatusEnum
.
week
.
getValue
())))
{
planTaskMapper
.
updateSingle
(
P_STATIC_WEEK
,
XJConstant
.
RISK_NUM
==
Integer
.
parseInt
(
map
.
get
(
"riskStatus"
).
toString
())
?
1
:
0
,
XJConstant
.
NORISK_NUM
==
Integer
.
parseInt
(
map
.
get
(
"riskStatus"
).
toString
())
?
1
:
0
,
planTask
.
getOrgCode
(),
planTask
.
getCheckDate
());
}
else
{
planTaskMapper
.
updateSingle
(
P_STATIC_WEEK
,
XJConstant
.
RISK_NUM
==
Integer
.
parseInt
(
map
.
get
(
"riskStatus"
).
toString
())
?
1
:
0
,
XJConstant
.
NORISK_NUM
==
Integer
.
parseInt
(
map
.
get
(
"riskStatus"
).
toString
())
?
1
:
0
,
planTask
.
getOrgCode
(),
planTask
.
getCheckDate
());
}
}
return
ResponseHelper
.
buildResponse
(
checkDto
);
CheckDto
checkDto
=
checkService
.
saveCheckRecordNew
(
requestParam
,
planTask
);
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
else
{
return
ResponseHelperUtil
.
buildErrorResponse
(
"无需重新巡检"
);
}
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskDetailMapper.java
View file @
bdfa1733
...
...
@@ -17,4 +17,6 @@ public interface PlanTaskDetailMapper extends BaseMapper {
List
<
PlanTaskDetail
>
findAllByIdInAndStatus
(
@Param
(
"planTaskIds"
)
List
<
Long
>
planTaskNo
,
@Param
(
"status"
)
String
status
);
List
<
ESTaskDetailDto
>
findAllByTaskNos
(
@Param
(
"ids"
)
String
ids
);
PlanTaskDetail
selectOne
(
Long
planTaskId
,
Long
pointId
);
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @
bdfa1733
This diff is collapsed.
Click to expand it.
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ICheckService.java
View file @
bdfa1733
...
...
@@ -14,6 +14,8 @@ import com.yeejoin.amos.patrol.core.common.response.CommonPage;
import
com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse
;
import
com.yeejoin.amos.patrol.core.common.response.QueryCriteriaRespone
;
import
com.yeejoin.amos.patrol.dao.entity.CheckShot
;
import
com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto
;
import
com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto
;
import
com.yeejoin.amos.patrol.dao.entity.PlanTask
;
import
com.yeejoin.amos.patrol.exception.YeeException
;
import
org.springframework.data.domain.Page
;
...
...
@@ -276,4 +278,10 @@ public interface ICheckService {
Page
<
CheckInfoVo
>
getPeoplePatrolPage
(
CheckInfoPageParam
param
);
Map
<
String
,
Object
>
getPeopleStatistic
(
String
bizOrgCode
,
String
userId
);
ESTaskDetailDto
buildEsDetailData
(
CheckRecordParam
requestParam
,
PlanTask
planTask
);
ESPlanTaskListDto
buildEsTaskData
(
Long
planTaskId
,
ESTaskDetailDto
esTaskDetailDto
);
void
saveMustData
(
ESTaskDetailDto
esTaskDetailDto
,
ESPlanTaskListDto
esPlanTaskListDto
,
PlanTask
planTask
);
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/plan_task_detail.xml
View file @
bdfa1733
...
...
@@ -38,4 +38,14 @@
where
pptd.task_no in #{ids}
</select>
<select
id=
"selectOne"
resultType=
"com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail"
>
select
pptd.id
from
"p_plan_task_detail" pptd
where
pptd.task_no = #{planTaskId}
and pptd.point_id = #{pointId}
</select>
</mapper>
\ 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