Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2025-04-07 9fb370afff71f4d5659d8904e8751479280d5b48

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
Êþº¾@
½

java/lang/Object
<init>
()V        

!com/dy/pipIrrBase/block/BlockCtrl
sv
!Lcom/dy/pipIrrBase/block/BlockSv;

com/dy/pipIrrBase/block/BlockSv
    selectAll
'()Lcom/dy/common/webUtil/QueryResultVo;

'com/dy/common/webUtil/BaseResponseUtils
buildSuccess
8(Ljava/lang/Object;)Lcom/dy/common/webUtil/BaseResponse;
java/lang/Exception    
log
Lorg/slf4j/Logger; 
查询片区异常"#$%&
org/slf4j/Logger
error
*(Ljava/lang/String;Ljava/lang/Throwable;)V
()*

getMessage
()Ljava/lang/String;
,-.
buildException
8(Ljava/lang/String;)Lcom/dy/common/webUtil/BaseResponse;
012

selectSome
H(Lcom/dy/pipIrrBase/block/QueryVo;)Lcom/dy/common/webUtil/QueryResultVo;
452
    getBlocks7
获取开卡记录异常
9:;

selectById
6(Ljava/lang/Long;)Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;=>?@A
,org/springframework/validation/BindingResult
    hasErrors
()Z=CDE
 getFieldError
-()Lorg/springframework/validation/FieldError;
GHIJK
java/util/Objects
requireNonNull
&(Ljava/lang/Object;)Ljava/lang/Object;M
)org/springframework/validation/FieldError
LOP*
getDefaultMessage
RS.
    buildFailU
"com/dy/pipIrrGlobal/pojoBa/BaBlock
T
XYZ[*
!com/dy/pipIrrBase/block/dto/Block
getName
T]^_
setName
(Ljava/lang/String;)V
Xab*
    getHeader
Tde_
    setHeader
Xgh*
getPhone
Tjk_
setPhone
Xmno
getArea
()Ljava/lang/Integer;
Tqrs
setArea
(Ljava/lang/Integer;)V
Xuv*
getColor
Txy_
setColor
X{|*
    getRemark
T~_
    setRemark    ‚ƒ„…
"com/dy/common/mybatis/envm/Deleted
NO
$Lcom/dy/common/mybatis/envm/Deleted;    T‡ˆ…
deleted
Š‹Œ
save
6(Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;)Ljava/lang/Long;
Ž‘’
java/util/Optional

ofNullable
((Ljava/lang/Object;)Ljava/util/Optional;
”•–—˜
java/lang/Long
valueOf
(J)Ljava/lang/Long;
Žš›K
orElse
žŸ— 
java/lang/Integer
(I)Ljava/lang/Integer;
”¢£¤
equals
(Ljava/lang/Object;)Z    ¦§¨©ª
)com/dy/pipIrrBase/result/SystemResultCode
SAVA_BLOCK_ERROR
+Lcom/dy/pipIrrBase/result/SystemResultCode;
¦(
­®.
 buildErrorMsg
X°±²
    getGraphs
#()Lcom/alibaba/fastjson2/JSONArray;
´µ¶·¸
com/alibaba/fastjson2/JSONArray
size
()I
´º»¼
 getJSONObject
%(I)Lcom/alibaba/fastjson2/JSONObject;¾
%com/dy/pipIrrGlobal/pojoBa/BaMapGraph
½
½ÁÂÃ

setBlockId
(Ljava/lang/Long;)VÅ
type
ÇÈÉÊË
 com/alibaba/fastjson2/JSONObject
    getString
&(Ljava/lang/String;)Ljava/lang/String;
ÍÎÏи
java/lang/String
hashCodeÒ
CircleMarker
Í¢Õ
Polygon×
Polyline    ÙÚÛÜÝ
+com/dy/pipIrrBase/block/enums/graphTypeENUM
 CIRCLE_MARKER
-Lcom/dy/pipIrrBase/block/enums/graphTypeENUM;
Ùßàá
getCode
()Ljava/lang/Byte;
½ãäå
setGraphType
(Ljava/lang/Byte;)V    ÙçèÝ
POLYGON    ÙêëÝ
POLYLINE
íîï
addMapGraph
9(Lcom/dy/pipIrrGlobal/pojoBa/BaMapGraph;)Ljava/lang/Long;ñ
coordinates
Çóôõ
getJSONArray
5(Ljava/lang/String;)Lcom/alibaba/fastjson2/JSONArray;
´÷ôø
$(I)Lcom/alibaba/fastjson2/JSONArray;ú
+com/dy/pipIrrGlobal/pojoBa/BaMapCoordinates
ù
ùýþÃ

setGraphId

lat
Ç



 getBigDecimal
*(Ljava/lang/String;)Ljava/math/BigDecimal;
ù



setLat
(Ljava/math/BigDecimal;)V


lng
ù

 

setLng




addMapCoordinate
?(Lcom/dy/pipIrrGlobal/pojoBa/BaMapCoordinates;)Ljava/lang/Long;



—

java/lang/Boolean
(Z)Ljava/lang/Boolean;    T



id
Ljava/lang/Long;

无数据实体ID



 
update
'(Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;)I
"
保存片区异常
$
数据库存储失败
X
&
'
(
getId
()Ljava/lang/Long;    ¦
*
+ª
THE_BLOCK_NOT_EXIST
T
-
.Ã
setId
X
0
1
2

getDeleted
&()Lcom/dy/common/mybatis/envm/Deleted;
T
4
5
6

setDeleted
'(Lcom/dy/common/mybatis/envm/Deleted;)V

8
9
:
deleteMapCoordinates
(Ljava/lang/Long;)I

<
=
:
deleteMapGraph
?
id不能为空

A
B
:
delete

D
E²
getBlockDivides

G
H
I
J
K
org/slf4j/LoggerFactory
    getLogger
%(Ljava/lang/Class;)Lorg/slf4j/Logger;
Code
LineNumberTable
LocalVariableTable
this
#Lcom/dy/pipIrrBase/block/BlockCtrl;
setSv
$(Lcom/dy/pipIrrBase/block/BlockSv;)V
MethodParameters
RuntimeVisibleAnnotations
8Lorg/springframework/beans/factory/annotation/Autowired;
all
&()Lcom/dy/common/webUtil/BaseResponse;
res
%Lcom/dy/common/webUtil/QueryResultVo;

e
Ljava/lang/Exception;
LocalVariableTypeTable
]Lcom/dy/common/webUtil/QueryResultVo<Ljava/util/List<Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;>;>;
 StackMapTable
    Signature
…()Lcom/dy/common/webUtil/BaseResponse<Lcom/dy/common/webUtil/QueryResultVo<Ljava/util/List<Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;>;>;>;
)Lio/swagger/v3/oas/annotations/Operation;
summary
获得全部片区
description
返回全部片区数据
6Lio/swagger/v3/oas/annotations/responses/ApiResponses;
value
5Lio/swagger/v3/oas/annotations/responses/ApiResponse;
responseCode
0001
D返回全部片区数据（BaseResponse.content:QueryResultVo[{}]）
content
-Lio/swagger/v3/oas/annotations/media/Content;
    mediaType
application/json
schema
,Lio/swagger/v3/oas/annotations/media/Schema;
implementation
$Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;
4Lorg/springframework/web/bind/annotation/GetMapping;
path
Lcom/dy/common/aop/SsoAop;
some
G(Lcom/dy/pipIrrBase/block/QueryVo;)Lcom/dy/common/webUtil/BaseResponse;
vo
!Lcom/dy/pipIrrBase/block/QueryVo;
¦(Lcom/dy/pipIrrBase/block/QueryVo;)Lcom/dy/common/webUtil/BaseResponse<Lcom/dy/common/webUtil/QueryResultVo<Ljava/util/List<Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;>;>;>;
5Lorg/springframework/web/bind/annotation/PostMapping;
some2
consumes
"RuntimeVisibleParameterAnnotations
5Lorg/springframework/web/bind/annotation/RequestBody;
qo
¤(Lcom/dy/pipIrrBase/block/QueryVo;)Lcom/dy/common/webUtil/BaseResponse<Lcom/dy/common/webUtil/QueryResultVo<Ljava/util/List<Lcom/dy/pipIrrGlobal/voBa/VoBlock;>;>;>;
/some
one
6(Ljava/lang/Long;)Lcom/dy/common/webUtil/BaseResponse;
\(Ljava/lang/Long;)Lcom/dy/common/webUtil/BaseResponse<Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;>;
一个片区
得到一个片区数据
5返回一个片区数据（BaseResponse.content:{}）
w(Lcom/dy/pipIrrBase/block/dto/Block;Lorg/springframework/validation/BindingResult;)Lcom/dy/common/webUtil/BaseResponse;
point
"Lcom/alibaba/fastjson2/JSONObject;
mapCoordinates
-Lcom/dy/pipIrrGlobal/pojoBa/BaMapCoordinates;
coordinateId

k

I

coordinate
!Lcom/alibaba/fastjson2/JSONArray;

j
graph

baMapGraph
'Lcom/dy/pipIrrGlobal/pojoBa/BaMapGraph;
graphId

i
po
#Lcom/dy/pipIrrBase/block/dto/Block;
 bindingResult
.Lorg/springframework/validation/BindingResult;
baBlock
blockId
graphs
Œ(Lcom/dy/pipIrrBase/block/dto/Block;Lorg/springframework/validation/BindingResult;)Lcom/dy/common/webUtil/BaseResponse<Ljava/lang/Boolean;>;
保存片区
1提交片区数据（form表单），进行保存
G操作结果：true：成功，false：失败（BaseResponse.content）
Ljava/lang/Boolean;
:Lorg/springframework/transaction/annotation/Transactional;
rollbackFor
RuntimeVisibleTypeAnnotations
Ljakarta/validation/Valid;
update2
x(Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;Lorg/springframework/validation/BindingResult;)Lcom/dy/common/webUtil/BaseResponse;
count
(Lcom/dy/pipIrrGlobal/pojoBa/BaBlock;Lorg/springframework/validation/BindingResult;)Lcom/dy/common/webUtil/BaseResponse<Ljava/lang/Boolean;>;
K(Ljava/lang/Long;)Lcom/dy/common/webUtil/BaseResponse<Ljava/lang/Boolean;>;
删除片区
#提交片区ID，进行逻辑删除
I()Lcom/dy/common/webUtil/BaseResponse<Lcom/alibaba/fastjson2/JSONArray;>;
/block_divides
<clinit>

SourceFile
BlockCtrl.java
(Lio/swagger/v3/oas/annotations/tags/Tag;
name
片区管理
片区增删改查等操作
8Lorg/springframework/web/bind/annotation/RestController;
8Lorg/springframework/web/bind/annotation/RequestMapping;
block!


L/

*·
±
M
)
N

O
P
Q
R
L>*+µ±
M
/0
N
O
P

S

T

U

V
W
L•!*´¶ L+¸°L²+¹!+¶'¸+°
 
MDE FGH
N 
X
Y

Z
[
!
O
P
\

X
]

^
M
_
`
TS
a
bs
c
ds
e
f

g[
@
h
is
j
ds
k
l[
@
m
ns
o
p@
q

rc
s
t

u[
s
V
v

w
x
L "*´+¶/M,¸°M²,¹!,¶'¸+°
 
MU    VWXY
N*    
X
Y
Z
["
O
P"
y
z

\
    
X
]
^
N
S

y
_
{
T
|
u[
s
}
~[
s
o
v



€
5
x
L~ *´+¶3¸°M²6,¹!,¶'¸+°

Mhi jk
N  
Z
[ 
O
P 

z

^
L
S


_
‚
T
t

u[
s
ƒ
v

„
…
L@*´+¶8¸°
M

N
O
P



S


_
†
TS
a
bs
‡
ds
ˆ
f

g[
@
h
is
j
ds
‰
l[
@
m
ns
o
p@
q

rc
s
t

u[
s
„
v
‹
Š
L.;,Æ,¹<
™,¹B
¸FÀL¶N¸Q°»TY·VN-+¶W¶\-+¶`¶c-+¶f¶i-+¶l¶p-+¶t¶w-+¶z¶}-²€µ†*´-¶‰¸    ¸“¶™À”:¸œ¶¡™ ²¥¶«¸¬°+¶¯:Æ
Ÿ¶³ž
—6¶³¢
Š¶¹:»½Y·¿:¶ÀĶÆ:    6
    ¶Ì«O%XåàBK†í2o<µJ"    Ѷә&6
§     Զә6
§    ֶә6
 
ª@'5²Ø¶Þ¶â§²æ¶Þ¶â§²é¶Þ¶â*´¶ì¸    ¸“¶™À”:        ¸œ¶¡™ ²¥¶«¸¬°ð¶ò:
6
¶³¢…
¶ö:6  ¶³¢i ¶¹:»ùY·û:    ¶üÿ¶

¶

    ¶

¶
*´¶
¸    ¸“¶™À”:¸œ¶¡™ ²¥¶«¸¬°„ 
§ÿ“„
§ÿw„
§þr¸
¸°
M²,˜ ™ (ž0Ÿ8 @¡H¢P£X¤_¥v¦‚§Œª’«Ÿ¬¬­µ°¾±Å²
@´
Kµ
N·
Y¸
\º
g½
¾
‹¿
•Ã
žÄ
«Å
´Æ
ÁÇ
ÊÉ
ÓÊ
ÚË
æÌ
óÍÎÏ!Æ'Ä-¬3Õ
N¬
ÊW
‹
Œ
ÓN

Ž


·p

‘ 
´s
’
“
¡Œ
”
‘µ
x
•
Œ¾
o
–
—
®
˜
    
žñ
“
¢
‘
™
‘;
O
P;
š
›
;
œ
(
ž
sv
Å
Ÿ
’
©
 
“
^w ýkT”ý´
ÿUX=T”´
ǽÍ
  ù
ü-”ý´
ý´
ûiùÿX=T”´
ú
S    
š
œ
_
¡
Tg
a
bs
¢
ds
£
f

g[
@
h
is
j
ds
¤
l[
@
m
ns
o
p@
q

rc
¥
|
u[
s‹
~[
s
o
¦

§[
c
[
v
¨    

©
 
€
©

ª
«
L
e,Æ,¹<
™,¹B
¸FÀL¶N¸Q°+´
Ç

¸Q°*´+¶
>§:²
!¹!¶'¸+°

#¸Q°¸
¸°
.7:
M2ð ñ ó'ô.ø7ü:ù<úIûRýVþ]

N>7
¬
‘<
Z
[e
O
Pe
š
s
e
œ
R
¬
‘
^   Kü


S    
š
œ
_
­
T
|
u[
s
ª
~[
s
o
v
¨    

©
 
€
©


Š
LÕw,Æ,¹<
™,¹B
¸FÀL¶N¸Q°+¶
%N-Ç ²
)¶«¸¬°»TY·V:+¶
%¶
,+¶W¶\+¶`¶c+¶f¶i+¶l¶p+¶t¶w+¶z¶}+¶
/¶
3*´¶
6§:²
!¹!¶'¸+°

#¸Q°*´-¶
7W*´-¶
;W+¶¯:Æ
Ÿ¶³ž
—6¶³¢
Š¶¹:»½Y·¿:        -¶ÀĶÆ:
6
¶Ì«P%XåàCK†í3o<µJ#
Ѷә&6§ 
Զә6§
ֶә6ª@'5    ²Ø¶Þ¶â§    ²æ¶Þ¶â§    ²é¶Þ¶â*´    ¶ì¸    ¸“¶™À”:
 
¸œ¶¡™ ²¥¶«¸¬°ð¶ò:6¶³¢…¶ö: 6 ¶³¢i ¶¹:»ùY·û:
¶üÿ¶

¶

    ¶

¶
*´¶
¸    ¸“¶™À”:¸œ¶¡™ ²¥¶«¸¬°„
§ÿ“„
§ÿw„
§þr¸
¸°
„’
MÚ6
 
 
%
)
3
<
E
N
W
`
i
r
 {
!„
$
(’
%”
&¡
'ª
)¯
*¶
.¿
0È
2Î
3Û
4è
5ñ
8ú
9

:
|
<
‡
=
Š
?
•
@
˜
B
£
E
»
F
Ç
G
Ñ
K
Ú
L
ç
M
ð
N
ý
O
Q
R
S"
T/
UG
VS
W]
Nc
Li
4o
]
Nʏ
¬
‘”
Z
[W
‹
ŒN

ŽG


óp

‘
ðs
’
“ 
݌
”
‘ñ
x
•
Μ
o
–
—    
»®
˜


ڏñ
“Þ
‘
™
‘w
O
Pw
š
›
w
œ
%R
Ÿ
<;
ž
sª
Í
¬
‘Î
©
 
“
^” ü”ÿ^X=”T
ü
ý'´
ÿUX=”T
´
ǽÍ
  ù
ü-”ý´
ý´
ûiùÿX=”T
´
ú
S    
š
œ
_
¡
T&
|
u[
s

~[
s
o
¦

§[
c
[
v
¨    

©
 
€
©

B
…
LéQ+Ç

>¸Q°*´+¶
@=§N²
!-¹!-¶'¸+°

#¸Q°*´+¶
7W*´+¶
;W¸
¸°

M2
u
v
z
~
{
|$
},
0
€7
„@
†I
ˆ
N4
¬
‘
Z
[Q
O
PQ


,%
¬
‘
^Kü


S


_
®
T_
a
bs
¯
ds
°
f

g[
@
h
is
j
ds
¤
l[
@
m
ns
o
p@
q

rc
¥
t

u[
s
B
¦

§[
c
[
v

E
W
Ls*´¶
C¸°L²6+¹!+¶'¸+°


M
“
”
•
–
N
Z
[

O
P
^
K
_
±
T
t

u[
s
²
v
³

L!
    ¸
F³±

M
$
´
µ
T 
¶
·s
¸
ds
¹
º
»

u[
s
¼