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
c2d24198
Commit
c2d24198
authored
Sep 14, 2022
by
王龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成省局箱线图接口
parent
fb9fe861
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
460 additions
and
185 deletions
+460
-185
pom.xml
amos-boot-system-cas/amos-boot-module-cas-api/pom.xml
+4
-19
IdxBizXnzsDto.java
...m/yeejoin/amos/boot/module/cas/api/dto/IdxBizXnzsDto.java
+26
-0
ResultDto.java
...a/com/yeejoin/amos/boot/module/cas/api/dto/ResultDto.java
+11
-0
IdxBizXnzs.java
...m/yeejoin/amos/boot/module/cas/api/entity/IdxBizXnzs.java
+80
-0
IdxBizXnzsMapper.java
...oin/amos/boot/module/cas/api/mapper/IdxBizXnzsMapper.java
+21
-0
IIdxBizXnzsService.java
.../amos/boot/module/cas/api/service/IIdxBizXnzsService.java
+18
-0
application.properties
...-module-cas-api/src/main/resources/application.properties
+0
-0
IdxBizXnzsMapper.xml
...le-cas-api/src/main/resources/mapper/IdxBizXnzsMapper.xml
+67
-0
pom.xml
amos-boot-system-cas/amos-boot-module-cas-biz/pom.xml
+4
-11
AmosCasApplication.java
...boot-module-cas-biz/src/main/java/AmosCasApplication.java
+0
-20
IdxBizXnzsController.java
...amos/boot/module/cas/controller/IdxBizXnzsController.java
+152
-0
IdxBizXnzsServiceImpl.java
...s/boot/module/cas/service/impl/IdxBizXnzsServiceImpl.java
+67
-0
application-dev.properties
...ule-cas-biz/src/main/resources/application-dev.properties
+0
-28
application.properties
...-module-cas-biz/src/main/resources/application.properties
+3
-89
pom.xml
amos-boot-system-cas/pom.xml
+0
-16
application-dev2.properties
...le-tzs-biz/src/main/resources/application-dev2.properties
+5
-2
pom.xml
pom.xml
+2
-0
No files found.
amos-boot-system-cas/amos-boot-module-cas-api/pom.xml
View file @
c2d24198
...
...
@@ -7,29 +7,14 @@
<version>
1.0.0
</version>
</parent>
<artifac
tId>
amos-boot-module-cas-api
</artifac
tId>
<artifac
stId>
amos-boot-module-cas-api
</artifacs
tId>
<dependencies>
<dependency>
<groupId>
org.springframework.data
</groupId>
<artifactId>
spring-data-elasticsearch
</artifactId>
<
scope>
compile
</scope
>
<groupId>
com.amosframework.boot
</groupId>
<artifactId>
amos-boot-module-common-api
</artifactId>
<
version>
${amos-biz-boot.version}
</version
>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.amosframework.boot</groupId>-->
<!-- <artifactId>amos-boot-module-common-api</artifactId>-->
<!-- <version>${amos-biz-boot.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>
com.yeejoin
</groupId>
<artifactId>
amos-component-rule
</artifactId>
<exclusions>
<exclusion>
<groupId>
org.typroject
</groupId>
<artifactId>
tyboot-core-auth
</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
amos-boot-system-cas/amos-boot-module-cas-api/src/main/java/com/yeejoin/amos/boot/module/cas/api/dto/IdxBizXnzsDto.java
0 → 100644
View file @
c2d24198
package
com
.
yeejoin
.
amos
.
boot
.
module
.
cas
.
api
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* Dto
*
* @author duanwei
* @date 2022-09-14
*/
@Data
public
class
IdxBizXnzsDto
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
axisData
;
private
double
one
;
private
double
two
;
private
double
three
;
private
double
four
;
}
amos-boot-system-cas/amos-boot-module-cas-api/src/main/java/com/yeejoin/amos/boot/module/cas/api/dto/ResultDto.java
0 → 100644
View file @
c2d24198
package
com
.
yeejoin
.
amos
.
boot
.
module
.
cas
.
api
.
dto
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
ResultDto
{
List
<
List
<
Double
>>
seriesData
;
List
<
String
>
axisData
;
}
amos-boot-system-cas/amos-boot-module-cas-api/src/main/java/com/yeejoin/amos/boot/module/cas/api/entity/IdxBizXnzs.java
0 → 100644
View file @
c2d24198
package
com
.
yeejoin
.
amos
.
boot
.
module
.
cas
.
api
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
*
*
* @author duanwei
* @date 2022-09-14
*/
@Data
//@EqualsAndHashCode(callSuper = true)
@Accessors
(
chain
=
true
)
@ApiModel
(
value
=
"IdxBizXnzs对象"
,
description
=
""
)
public
class
IdxBizXnzs
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
Boolean
valid
;
private
String
record
;
private
LocalDateTime
date
;
private
String
creator
;
@TableField
(
"creatorName"
)
private
String
creatorName
;
private
String
status
;
@TableField
(
"instanceId"
)
private
String
instanceId
;
@ApiModelProperty
(
value
=
"年份"
)
private
Integer
cNf
;
@ApiModelProperty
(
value
=
"季度"
)
private
String
cJd
;
@ApiModelProperty
(
value
=
"地市"
)
private
String
cDs
;
@ApiModelProperty
(
value
=
"季度代码"
)
private
Integer
cJddm
;
@ApiModelProperty
(
value
=
"政务大类"
)
private
String
cZwdl
;
@ApiModelProperty
(
value
=
"政务大类代码"
)
private
String
cZwdldm
;
@ApiModelProperty
(
value
=
"政务子类"
)
private
String
cZwzl
;
@ApiModelProperty
(
value
=
"政务子类代码"
)
private
String
cZwzldm
;
@ApiModelProperty
(
value
=
"效能指数"
)
private
Double
cXnzs
;
@ApiModelProperty
(
value
=
"季度权重"
)
private
Integer
cJdqz
;
@ApiModelProperty
(
value
=
"地市权重"
)
private
Integer
cDsqz
;
@ApiModelProperty
(
value
=
"报表权重"
)
private
Integer
cBbqz
;
}
amos-boot-system-cas/amos-boot-module-cas-api/src/main/java/com/yeejoin/amos/boot/module/cas/api/mapper/IdxBizXnzsMapper.java
0 → 100644
View file @
c2d24198
package
com
.
yeejoin
.
amos
.
boot
.
module
.
cas
.
api
.
mapper
;
import
com.yeejoin.amos.boot.module.cas.api.dto.IdxBizXnzsDto
;
import
com.yeejoin.amos.boot.module.cas.api.entity.IdxBizXnzs
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
java.io.Serializable
;
import
java.util.Collection
;
import
java.util.List
;
/**
* Mapper 接口
*
* @author duanwei
* @date 2022-09-14
*/
public
interface
IdxBizXnzsMapper
extends
BaseMapper
<
IdxBizXnzs
>
{
List
<
IdxBizXnzsDto
>
select
();
}
amos-boot-system-cas/amos-boot-module-cas-api/src/main/java/com/yeejoin/amos/boot/module/cas/api/service/IIdxBizXnzsService.java
0 → 100644
View file @
c2d24198
package
com
.
yeejoin
.
amos
.
boot
.
module
.
cas
.
api
.
service
;
import
com.yeejoin.amos.boot.module.cas.api.dto.IdxBizXnzsDto
;
import
com.yeejoin.amos.boot.module.cas.api.dto.ResultDto
;
import
com.yeejoin.amos.boot.module.cas.api.entity.IdxBizXnzs
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
/**
* 服务类
*
* @author duanwei
* @date 2022-09-14
*/
public
interface
IIdxBizXnzsService
extends
IService
<
IdxBizXnzs
>
{
ResultDto
select
();
}
amos-boot-system-cas/amos-boot-module-cas-api/src/main/resources/application.properties
deleted
100644 → 0
View file @
fb9fe861
amos-boot-system-cas/amos-boot-module-cas-api/src/main/resources/mapper/IdxBizXnzsMapper.xml
0 → 100644
View file @
c2d24198
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.cas.api.mapper.IdxBizXnzsMapper"
>
<select
id=
"select"
resultType=
"com.yeejoin.amos.boot.module.cas.api.dto.IdxBizXnzsDto"
>
SELECT
a.c_ds as `axisData`,
a.`one`,
b.`two`,
c.`three`,
d.`four`
FROM
(
SELECT
c_ds,
round( SUM(((( `b`.`c_xnzs` * `b`.`c_jdqz` ) * `b`.`c_dsqz` ) * `b`.`c_bbqz` )), 2 ) AS "one"
FROM
idx_biz_xnzs AS b,
( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 0, 1 ) AS a
WHERE
a.c_nf = b.c_nf
AND a.c_jddm = b.c_jddm
GROUP BY
c_ds
) AS a
LEFT JOIN (
SELECT
c_ds,
round( SUM(((( `b`.`c_xnzs` * `b`.`c_jdqz` ) * `b`.`c_dsqz` ) * `b`.`c_bbqz` )), 2 ) AS "two"
FROM
idx_biz_xnzs AS b,
( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 1, 1 ) AS a
WHERE
a.c_nf = b.c_nf
AND a.c_jddm = b.c_jddm
GROUP BY
c_ds
) AS b ON b.c_ds = a.c_ds
LEFT JOIN (
SELECT
c_ds,
round( SUM(((( `b`.`c_xnzs` * `b`.`c_jdqz` ) * `b`.`c_dsqz` ) * `b`.`c_bbqz` )), 2 ) AS "three"
FROM
idx_biz_xnzs AS b,
( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 2, 1 ) AS a
WHERE
a.c_nf = b.c_nf
AND a.c_jddm = b.c_jddm
GROUP BY
c_ds
) AS c ON c.c_ds = a.c_ds
LEFT JOIN (
SELECT
c_ds,
round( SUM(((( `b`.`c_xnzs` * `b`.`c_jdqz` ) * `b`.`c_dsqz` ) * `b`.`c_bbqz` )), 2 ) AS "four"
FROM
idx_biz_xnzs AS b,
( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 3, 1 ) AS a
WHERE
a.c_nf = b.c_nf
AND a.c_jddm = b.c_jddm
GROUP BY
c_ds
) AS d ON d.c_ds = a.c_ds
</select>
</mapper>
amos-boot-system-cas/amos-boot-module-cas-biz/pom.xml
View file @
c2d24198
...
...
@@ -15,19 +15,12 @@
<artifactId>
amos-boot-module-cas-api
</artifactId>
<version>
${amos-biz-boot.version}
</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.amosframework.boot</groupId>-->
<!-- <artifactId>amos-boot-module-common-biz</artifactId>-->
<!-- <version>${amos-biz-boot.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
<artifactId>
httpmime
</artifactId>
<groupId>
com.amosframework.boot
</groupId>
<artifactId>
Unknown
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
org.liquibase
</groupId>
<artifactId>
liquibase-core
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
amos-boot-system-cas/amos-boot-module-cas-biz/src/main/java/AmosCasApplication.java
View file @
c2d24198
...
...
@@ -58,24 +58,4 @@ public class AmosCasApplication {
+
"Application Amos-Biz-Boot is running! Access URLs:\n\t"
+
"Swagger文档: \thttp://"
+
ip
+
":"
+
port
+
path
+
"/doc.html\n"
+
"----------------------------------------------------------"
);
}
// /**
// * 初始化MQTT
// *
// * @throws MqttException
// */
// @Bean
// public void initMqtt() throws MqttException {
// emqKeeper.getMqttClient().subscribe("/idx/idx_biz_carcyl_unit_inspect", 1, carcylUnitInspectMqTtlListener);
// emqKeeper.getMqttClient().subscribe("/tm/tz_base_enterprise_info", 1, baseEnterpriseMqTtlListener);
// emqKeeper.getMqttClient().subscribe("/tz/privilege_company_add_update",1, privilegeCompanyUpdateAddListener);
// emqKeeper.getMqttClient().subscribe("/tz/privilege_company_delete",1, privilegeCompanyDeleteListener);
//// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener);
//// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener);
// }
// @Bean
// public void initToken() {
// startPlatformTokenService.getToken();
// }
}
amos-boot-system-cas/amos-boot-module-cas-biz/src/main/java/com/yeejoin/amos/boot/module/cas/controller/IdxBizXnzsController.java
0 → 100644
View file @
c2d24198
package
com
.
yeejoin
.
amos
.
boot
.
module
.
cas
.
controller
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.utils.NameUtils
;
import
com.yeejoin.amos.boot.module.cas.api.dto.IdxBizXnzsDto
;
import
com.yeejoin.amos.boot.module.cas.api.dto.ResultDto
;
import
com.yeejoin.amos.boot.module.cas.api.entity.IdxBizXnzs
;
import
com.yeejoin.amos.boot.module.cas.api.service.IIdxBizXnzsService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.*
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Arrays
;
import
java.util.List
;
/**
*
*
* @author duanwei
* @date 2022-09-14
*/
@RestController
@Api
(
tags
=
"Api"
)
@RequestMapping
(
value
=
"/idx-biz-xnzs"
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
class
IdxBizXnzsController
extends
BaseController
{
@Autowired
IIdxBizXnzsService
iIdxBizXnzsService
;
/**
* 新增
* @return
*/
@RequestMapping
(
value
=
"/save"
,
method
=
RequestMethod
.
POST
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
public
boolean
saveIdxBizXnzs
(
HttpServletRequest
request
,
@RequestBody
IdxBizXnzs
idxBizXnzs
){
return
iIdxBizXnzsService
.
save
(
idxBizXnzs
);
}
/**
* 根据id删除
* @param id
* @return
*/
@RequestMapping
(
value
=
"/{id}"
,
method
=
RequestMethod
.
DELETE
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据id删除"
,
notes
=
"根据id删除"
)
public
boolean
deleteById
(
HttpServletRequest
request
,
@PathVariable
Long
id
){
return
iIdxBizXnzsService
.
removeById
(
id
);
}
/**
* 修改
* @return
*/
@RequestMapping
(
value
=
"/updateById"
,
method
=
RequestMethod
.
PUT
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"修改"
,
notes
=
"修改"
)
public
boolean
updateByIdIdxBizXnzs
(
HttpServletRequest
request
,
@RequestBody
IdxBizXnzs
idxBizXnzs
){
return
iIdxBizXnzsService
.
updateById
(
idxBizXnzs
);
}
/**
* 根据id查询
* @param id
* @return
*/
@RequestMapping
(
value
=
"/{id}"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据id查询"
,
notes
=
"根据id查询"
)
public
IdxBizXnzs
selectById
(
HttpServletRequest
request
,
@PathVariable
Long
id
){
return
iIdxBizXnzsService
.
getById
(
id
);
}
/**
* 列表分页查询
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@RequestMapping
(
value
=
"/list"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表分页查询"
,
notes
=
"列表分页查询"
)
public
IPage
<
IdxBizXnzs
>
listPage
(
String
pageNum
,
String
pageSize
,
IdxBizXnzs
idxBizXnzs
){
Page
<
IdxBizXnzs
>
pageBean
;
QueryWrapper
<
IdxBizXnzs
>
idxBizXnzsQueryWrapper
=
new
QueryWrapper
<>();
Class
<?
extends
IdxBizXnzs
>
aClass
=
idxBizXnzs
.
getClass
();
Arrays
.
stream
(
aClass
.
getDeclaredFields
()).
forEach
(
field
->
{
try
{
field
.
setAccessible
(
true
);
Object
o
=
field
.
get
(
idxBizXnzs
);
if
(
o
!=
null
)
{
Class
<?>
type
=
field
.
getType
();
String
name
=
NameUtils
.
camel2Underline
(
field
.
getName
());
if
(
type
.
equals
(
Integer
.
class
))
{
Integer
fileValue
=
(
Integer
)
field
.
get
(
idxBizXnzs
);
idxBizXnzsQueryWrapper
.
eq
(
name
,
fileValue
);
}
else
if
(
type
.
equals
(
Long
.
class
))
{
Long
fileValue
=
(
Long
)
field
.
get
(
idxBizXnzs
);
idxBizXnzsQueryWrapper
.
eq
(
name
,
fileValue
);
}
else
if
(
type
.
equals
(
String
.
class
))
{
String
fileValue
=
(
String
)
field
.
get
(
idxBizXnzs
);
idxBizXnzsQueryWrapper
.
eq
(
name
,
fileValue
);
}
else
{
String
fileValue
=
(
String
)
field
.
get
(
idxBizXnzs
);
idxBizXnzsQueryWrapper
.
eq
(
name
,
fileValue
);
}
}
}
catch
(
Exception
e
)
{
}
});
IPage
<
IdxBizXnzs
>
page
;
if
(
StringUtils
.
isBlank
(
pageNum
)
||
StringUtils
.
isBlank
(
pageSize
))
{
pageBean
=
new
Page
<>(
0
,
Long
.
MAX_VALUE
);
}
else
{
pageBean
=
new
Page
<>(
Integer
.
parseInt
(
pageNum
),
Integer
.
parseInt
(
pageSize
));
}
page
=
iIdxBizXnzsService
.
page
(
pageBean
,
idxBizXnzsQueryWrapper
);
return
page
;
}
/**
* 查询
* @param
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@RequestMapping
(
value
=
"/select"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据id查询"
,
notes
=
"根据id查询"
)
public
ResponseModel
<
ResultDto
>
select
(){
return
ResponseHelper
.
buildResponse
(
iIdxBizXnzsService
.
select
());
}
}
amos-boot-system-cas/amos-boot-module-cas-biz/src/main/java/com/yeejoin/amos/boot/module/cas/service/impl/IdxBizXnzsServiceImpl.java
0 → 100644
View file @
c2d24198
package
com
.
yeejoin
.
amos
.
boot
.
module
.
cas
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.yeejoin.amos.boot.module.cas.api.dto.IdxBizXnzsDto
;
import
com.yeejoin.amos.boot.module.cas.api.dto.ResultDto
;
import
com.yeejoin.amos.boot.module.cas.api.entity.IdxBizXnzs
;
import
com.yeejoin.amos.boot.module.cas.api.mapper.IdxBizXnzsMapper
;
import
com.yeejoin.amos.boot.module.cas.api.service.IIdxBizXnzsService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
springfox.documentation.spring.web.json.Json
;
import
java.util.*
;
/**
* 服务实现类
*
* @author wanglong
* @date 2022-09-14
*/
@Service
public
class
IdxBizXnzsServiceImpl
extends
BaseService
<
IdxBizXnzsDto
,
IdxBizXnzs
,
IdxBizXnzsMapper
>
implements
IIdxBizXnzsService
{
@Autowired
private
IdxBizXnzsMapper
idxBizXnzsMapper
;
@Override
public
ResultDto
select
()
{
List
<
IdxBizXnzsDto
>
xnzsDtoList
=
idxBizXnzsMapper
.
select
();
List
<
String
>
axisData
=
new
ArrayList
<>();
List
<
List
<
Double
>>
seriesDataList
=
new
ArrayList
<>();
for
(
IdxBizXnzsDto
bizXnzsDto
:
xnzsDtoList
){
List
<
Double
>
list
=
new
ArrayList
<>();
axisData
.
add
(
bizXnzsDto
.
getAxisData
());
Double
one
=
bizXnzsDto
.
getOne
();
Double
two
=
bizXnzsDto
.
getTwo
();
Double
three
=
bizXnzsDto
.
getThree
();
Double
four
=
bizXnzsDto
.
getFour
();
Double
min
;
Double
[]
doubles
=
{
one
,
two
,
three
,
four
};
Arrays
.
sort
(
doubles
);
list
.
add
(
doubles
[
0
]);
list
.
add
((
doubles
[
0
]+
doubles
[
1
])/
2
);
list
.
add
((
doubles
[
1
]+
doubles
[
2
])/
2
);
list
.
add
((
doubles
[
2
]+
doubles
[
3
])/
2
);
list
.
add
(
doubles
[
3
]);
seriesDataList
.
add
(
list
);
}
System
.
out
.
println
(
seriesDataList
);
ResultDto
resultDto
=
new
ResultDto
();
resultDto
.
setAxisData
(
axisData
);
resultDto
.
setSeriesData
(
seriesDataList
);
return
resultDto
;
}
}
amos-boot-system-cas/amos-boot-module-cas-biz/src/main/resources/application-dev.properties
View file @
c2d24198
...
...
@@ -15,19 +15,6 @@ eureka.instance.metadata-map.management.context-path=${server.servlet.context-pa
eureka.instance.status-page-url
=
http://172.16.3.99:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs
=
http://172.16.3.99:${server.port}${server.servlet.context-path}/swagger-ui.html
## ES properties:
biz.elasticsearch.address
=
172.16.10.210
spring.data.elasticsearch.cluster-name
=
elasticsearch
spring.data.elasticsearch.cluster-nodes
=
${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris
=
http://${biz.elasticsearch.address}:9200
elasticsearch.username
=
elastic
elasticsearch.password
=
Yeejoin@2020
## unit(h)
alertcall.es.synchrony.time
=
48
fileserver.domain
=
https://rpm.yeeamos.com:8888/
#redis properties:
spring.redis.database
=
1
spring.redis.host
=
172.16.10.210
...
...
@@ -39,17 +26,3 @@ spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle
=
0
spring.redis.expire.time
=
300
## emqx properties:
emqx.clean-session
=
true
emqx.client-id
=
${spring.application.name}-${random.int[1024,65536]}
emqx.broker
=
tcp://172.16.10.210:1883
emqx.user-name
=
super
emqx.password
=
123456
rule.definition.load
=
false
rule.definition.model-package
=
com.yeejoin.amos.boot.module.tzs.api.dto
rule.definition.default-agency
=
tzs
rule.definition.localIp
=
172.16.3.39
org.filter.group.seq
=
1564150103147573249
\ No newline at end of file
amos-boot-system-cas/amos-boot-module-cas-biz/src/main/resources/application.properties
View file @
c2d24198
...
...
@@ -7,7 +7,7 @@ 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.configuration.log-impl
=
org.apache.ibatis.logging.stdout.StdOutImpl
redis.cache.failure.time
=
10800
##liquibase
spring.liquibase.change-log
=
classpath:/db/changelog/changelog-master.xml
spring.liquibase.enabled
=
true
...
...
@@ -40,90 +40,4 @@ spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait
=
-1
spring.redis.lettuce.pool.max-idle
=
10
spring.redis.lettuce.pool.min-idle
=
0
spring.redis.expire.time
=
300
iot.fegin.name
=
AMOS-API-IOT
equip.fegin.name
=
AMOS-EQUIPMANAGE
supervision.feign.name
=
AMOS-SUPERVISION-API
security.systemctl.name
=
AMOS-API-SYSTEMCTL
jcs.company.topic.add
=
jcs/company/topic/add
jcs.company.topic.delete
=
jcs/company/topic/delete
## �豸�����������š��㲥�����壩
control.fegin.name
=
JCS-API-CONTROL
## redis��ʱʱ��
redis.cache.failure.time
=
10800
failure.work.flow.processDefinitionKey
=
malfunction_repair
video.fegin.name
=
video
latentDanger.feign.name
=
AMOS-LATENT-DANGER
Knowledgebase.fegin.name
=
AMOS-API-KNOWLEDGEBASE
## �豸��֪����v1
inform.work.flow.processDefinitionKey
=
equipment_inform_process_v1
## ������Ԯ���ϲ�ID
fire-rescue
=
1432549862557130753
tzs.cti.appkey
=
4e805006-3fef-ae43-3915-a153731007c4
tzs.cti.secretkey
=
7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
tzs.wechat.url
=
https://api.weixin.qq.com
tzs.wechat.appid
=
wx79aca5bb1cb4af92
tzs.wechat.secret
=
f3a12323ba731d282c3d4698c27c3e97
##wechatToken
tzs.wechat.token
=
yeejoin_2021
##wechatTicketUrl
tzs.wechat.ticketurl
=
https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
tzs.wechat.tempId.kr
=
rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
tzs.wechat.url.kr
=
tzs.yeeamos.com/persondetail.html
tzs.wechat.tempId.wx
=
ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
tzs.wechat.url.wx
=
tzs.yeeamos.com/repairPersondetail.html
tzs.wechat.tempId.ts
=
Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
tzs.wechat.url.ts
=
tzs.yeeamos.com/taskComplaintDetail.html
mqtt.topic.task.newtask
=
tzs-task-newtask
mqtt.topic.task.personinfo
=
tzs-task-personinfo
mqtt.topic.elevator.push
=
/tzs/tcb_elevator
mqtt.topic.alertInfo.push
=
/tzs/tcb_alertInfo
mqtt.topic.alertReport.push
=
/tzs/tcb_alertReport
mqtt.topic.alertHeart.push
=
/tzs/tcb_alertHeart
mqtt.topic.alertMatrix.push
=
/tzs/tcb_alertMatrix
mqtt.topic.cti.push
=
/cti/record
mqtt.topic.cyl.warning.push
=
/tzs/cyl_cyl_warning
cti.user.name
=
tzs_cti
cti.user.pwd
=
a1234567
flc.sms.tempCode
=
SMS_TZS_0001
## Ԥ��֪ͨģ��id
tzs.wechat.tempId.warning
=
-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
##��������֪ͨ
tzs.wechat.tempId.supervise
=
P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
## ���ںŲ����û�id��ƽ̨userId��
tzs.wechat.test.userId
=
3393279
admin.product
=
AMOS-SERVICE-ADMIN
admin.appkey
=
AMOS_ADMIN
admin.user
=
admin_tzs
admin.password
=
a1234560
admin.product.web
=
AMOS-WEB-ADMIN
amos.secret.key
=
qaz
\ No newline at end of file
spring.redis.expire.time
=
300
\ No newline at end of file
amos-boot-system-cas/pom.xml
View file @
c2d24198
...
...
@@ -17,22 +17,6 @@
<groupId>
com.amosframework.boot
</groupId>
<artifactId>
amos-boot-biz-common
</artifactId>
<version>
${amos-biz-boot.version}
</version>
<exclusions>
<exclusion>
<artifactId>
poi-ooxml
</artifactId>
<groupId>
org.apache.poi
</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-text
</artifactId>
<version>
1.9
</version>
</dependency>
<dependency>
<groupId>
com.yeejoin
</groupId>
<artifactId>
amos-feign-privilege
</artifactId>
<version>
1.7.12-SNAPSHOT
</version>
</dependency>
</dependencies>
</project>
...
...
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev2.properties
View file @
c2d24198
...
...
@@ -53,4 +53,7 @@ rule.definition.model-package=com.yeejoin.amos.boot.module.tzs.api.dto
rule.definition.default-agency
=
tzs
#rule.definition.localIp=172.16.3.34
org.filter.group.seq
=
1564150103147573249
\ No newline at end of file
org.filter.group.seq
=
1564150103147573249
elasticsearch.username
=
elastic
elasticsearch.password
=
Yeejoin@2020
\ No newline at end of file
pom.xml
View file @
c2d24198
...
...
@@ -332,5 +332,6 @@
<module>
amos-boot-system-ccs
</module>
<module>
amos-boot-data
</module>
<module>
amos-boot-system-precontrol
</module>
<module>
amos-boot-system-cas
</module>
</modules>
</project>
\ 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