Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
8570c775
Commit
8570c775
authored
Oct 22, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
委托管理 校核接口优化完成
parent
1d3887b3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
470 additions
and
184 deletions
+470
-184
EntrustController.java
...wise/sc/cement/business/controller/EntrustController.java
+2
-2
WeiXinController.java
.../wise/sc/cement/business/controller/WeiXinController.java
+23
-0
SampleCheck.java
...n/java/cn/wise/sc/cement/business/entity/SampleCheck.java
+4
-11
SampleCheckTeam.java
...va/cn/wise/sc/cement/business/entity/SampleCheckTeam.java
+4
-1
CheckCountQuery.java
.../wise/sc/cement/business/model/query/CheckCountQuery.java
+13
-5
CheckCountSampleQuery.java
...sc/cement/business/model/query/CheckCountSampleQuery.java
+42
-0
SampleCheckTeamVo.java
...n/wise/sc/cement/business/model/vo/SampleCheckTeamVo.java
+8
-0
SampleCheckVo.java
...va/cn/wise/sc/cement/business/model/vo/SampleCheckVo.java
+8
-8
IEntrustService.java
...a/cn/wise/sc/cement/business/service/IEntrustService.java
+2
-2
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+305
-135
WeiXinService.java
...n/wise/sc/cement/business/service/impl/WeiXinService.java
+18
-18
CheckCountUtil.java
.../java/cn/wise/sc/cement/business/util/CheckCountUtil.java
+41
-2
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java
View file @
8570c775
...
...
@@ -445,7 +445,7 @@ public class EntrustController {
}
@ApiOperation
(
value
=
"数据校核"
)
/*
@ApiOperation(value = "数据校核")
@PostMapping("/check")
public BaseResponse check(@RequestBody CheckQuery query) {
try {
...
...
@@ -454,7 +454,7 @@ public class EntrustController {
log.debug("数据校核{}", e);
}
return BaseResponse.errorMsg("失败!");
}
}
*/
private
String
getTeamName
(
List
<
SampleDistributionTeamVo
>
teamVos
)
{
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @
8570c775
...
...
@@ -47,6 +47,29 @@ public class WeiXinController {
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"获取accessToken信息-小程序端"
)
@GetMapping
(
"/getAccessToken"
)
public
BaseResponse
getAccessToken
(){
try
{
String
accessToken
=
weiXinService
.
getAccessToken
();
return
BaseResponse
.
okData
(
accessToken
);
}
catch
(
Exception
e
){
log
.
debug
(
"获取accessToken信息-小程序端{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"获取accessToken信息-管理端"
)
@GetMapping
(
"/getPCAccessToken"
)
public
BaseResponse
getPCAccessToken
(){
try
{
String
accessToken
=
weiXinService
.
getPCAccessToken
();
return
BaseResponse
.
okData
(
accessToken
);
}
catch
(
Exception
e
){
log
.
debug
(
"获取accessToken信息-管理端{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"当前登录用户"
)
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleCheck.java
View file @
8570c775
...
...
@@ -43,14 +43,11 @@ public class SampleCheck implements Serializable {
@ApiModelProperty
(
"检测组名称"
)
private
String
teamGroupName
;
@ApiModelProperty
(
"主样校核计算结果json串"
)
private
String
mainMap
;
@ApiModelProperty
(
"次样校核计算结果json串"
)
private
String
secondaryMap
;
@ApiModelProperty
(
"最终校核计算结果json串"
)
private
String
countResult
;
private
String
countResults
;
@ApiModelProperty
(
"误差值 计算结果json串"
)
private
String
countError
;
@ApiModelProperty
(
"是否平行样(1是,0否)"
)
private
Integer
isParallel
;
...
...
@@ -62,8 +59,4 @@ public class SampleCheck implements Serializable {
private
String
remark
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleCheckTeam.java
View file @
8570c775
...
...
@@ -52,9 +52,12 @@ public class SampleCheckTeam implements Serializable {
* json串
* {"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
*/
@ApiModelProperty
(
"
校核人员
输入检测结果 json串"
)
@ApiModelProperty
(
"输入检测结果 json串"
)
private
String
inputResult
;
@ApiModelProperty
(
"计算结果 json串"
)
private
String
countResult
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/CheckCountQuery.java
View file @
8570c775
...
...
@@ -14,20 +14,28 @@ import java.util.Map;
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel
(
"数据校核-校核计算接口请求"
)
@ApiModel
(
"数据校核-校核计算接口请求
(检测组)
"
)
public
class
CheckCountQuery
{
@ApiModelProperty
(
"校核sample_check表id,不传id为新增,传id为修改"
)
private
Integer
id
;
@ApiModelProperty
(
"检测组表id"
)
private
Integer
teamGroupId
;
@ApiModelProperty
(
"检测组名称"
)
private
String
teamGroupName
;
@ApiModelProperty
(
"是否平行样(1是,0否)"
)
private
Integer
isParallel
;
@ApiModelProperty
(
"
主样输入信息
"
)
private
Map
<
String
,
Object
>
mainResult
=
new
HashMap
<>()
;
@ApiModelProperty
(
"
委托表id
"
)
private
Integer
entrustId
;
@ApiModelProperty
(
"
次样输入信息
"
)
private
Map
<
String
,
Object
>
secondaryResult
=
new
HashMap
<>()
;
@ApiModelProperty
(
"
本所编号
"
)
private
String
cementCode
;
@ApiModelProperty
(
"样品信息集合"
)
private
List
<
CheckCountSampleQuery
>
sampleList
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/CheckCountSampleQuery.java
0 → 100644
View file @
8570c775
package
cn
.
wise
.
sc
.
cement
.
business
.
model
.
query
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel
(
"数据校核-校核计算接口请求(样品)"
)
public
class
CheckCountSampleQuery
{
@ApiModelProperty
(
"校核sample_check_team表id,不传id为新增,传id为修改"
)
private
Integer
id
;
@ApiModelProperty
(
"样品表id"
)
private
Integer
smapleId
;
@ApiModelProperty
(
"平行样编号"
)
private
String
parallelCode
;
@ApiModelProperty
(
"检测人员id"
)
private
Integer
userId
;
@ApiModelProperty
(
"检测设备表id"
)
private
Integer
equipmentId
;
@ApiModelProperty
(
"检测设备名称"
)
private
String
equipmentName
;
@ApiModelProperty
(
"输入信息集合"
)
private
Map
<
String
,
Object
>
intputResult
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleCheckTeamVo.java
View file @
8570c775
...
...
@@ -13,6 +13,9 @@ import lombok.Data;
@ApiModel
(
"校核-检测组列表Vo"
)
public
class
SampleCheckTeamVo
{
@ApiModelProperty
(
"校核sample_check_team表id,不传id为新增,传id为修改"
)
private
Integer
id
;
@ApiModelProperty
(
"校核表id"
)
private
Integer
checkId
;
...
...
@@ -41,5 +44,10 @@ public class SampleCheckTeamVo {
@ApiModelProperty
(
"校核人员输入检测结果 json串"
)
private
String
inputResult
;
@ApiModelProperty
(
"计算结果 json串"
)
private
String
countResult
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleCheckVo.java
View file @
8570c775
...
...
@@ -18,6 +18,9 @@ import java.util.List;
@ApiModel
(
"校核-样品Vo"
)
public
class
SampleCheckVo
{
@ApiModelProperty
(
"校核sample_check表id,不传id为新增,传id为修改"
)
private
Integer
id
;
@ApiModelProperty
(
"委托表id"
)
private
Integer
entrustId
;
...
...
@@ -33,16 +36,13 @@ public class SampleCheckVo {
@ApiModelProperty
(
"检测组名称"
)
private
String
teamGroupName
;
@ApiModelProperty
(
"主样校核计算结果json串"
)
private
String
mainMap
;
@ApiModelProperty
(
"次样校核计算结果json串"
)
private
String
secondaryMap
;
@ApiModelProperty
(
"最终校核计算结果json串"
)
private
String
countResult
;
private
String
countResults
;
@ApiModelProperty
(
"误差值 计算结果json串"
)
private
String
countError
;
@ApiModelProperty
(
"是否平行样(
1
是,0否)"
)
@ApiModelProperty
(
"是否平行样(
2-3
是,0否)"
)
private
Integer
isParallel
;
@ApiModelProperty
(
"检测组列表"
)
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java
View file @
8570c775
...
...
@@ -80,9 +80,9 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse
<
List
<
SampleDistribution
>>
getEnclosureList
(
Integer
sampleId
,
Integer
teamGroupId
,
Integer
userId
);
BaseResponse
<
Map
<
String
,
Map
<
String
,
String
>
>>
checkCount
(
CheckCountQuery
query
);
BaseResponse
<
Map
<
String
,
Object
>>
checkCount
(
CheckCountQuery
query
);
BaseResponse
<
String
>
check
(
CheckQuery
query
);
/*BaseResponse<String> check(CheckQuery query);*/
BaseResponse
<
IPage
<
EntrustVo
>>
getReportPage
(
PageQuery
pageQuery
,
String
startDate
,
String
endDate
,
Integer
clientId
,
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
8570c775
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java
View file @
8570c775
...
...
@@ -49,24 +49,24 @@ public class WeiXinService {
System
.
out
.
println
(
"==================code==================="
);
System
.
out
.
println
(
code
);
try
{
//
String accessToken = null;
//
if(type.equals("PC")){
//
accessToken = getAccessToken();
//
}else if(type.equals("APP")){
//
accessToken = getPCAccessToken();
//
}else{
//
return BaseResponse.errorMsg("参数错误");
//
}
//
String param = "access_token=%s&code=%s";
//
param = String.format(param, accessToken, code);
//
JSONObject jsonObject = WeixinInterfaceUtil.doGet(Global.USERINFOURL, param);
//
if(jsonObject.get("errcode").toString().equals("40029")){
//
return BaseResponse.errorMsg("code失效!");
//
}
//
String UserId = jsonObject.getString("UserId");
//
System.out.println("==================UserId===================");
//
System.out.println(UserId);
// JSONObject userJson = getUser(accessToken, UserId);
/*
String accessToken = null;
if(type.equals("PC")){
accessToken = getAccessToken();
}else if(type.equals("APP")){
accessToken = getPCAccessToken();
}else{
return BaseResponse.errorMsg("参数错误");
}
String param = "access_token=%s&code=%s";
param = String.format(param, accessToken, code);
JSONObject jsonObject = WeixinInterfaceUtil.doGet(Global.USERINFOURL, param);
if(jsonObject.get("errcode").toString().equals("40029")){
return BaseResponse.errorMsg("code失效!");
}
String UserId = jsonObject.getString("UserId");
System.out.println("==================UserId===================");
System.out.println(UserId);
JSONObject userJson = getUser(accessToken, UserId);*/
QueryWrapper
<
SysUser
>
wrapper
=
new
QueryWrapper
<>();
// wrapper.eq("phone", userJson.get("mobile"));
wrapper
.
eq
(
"phone"
,
code
);
//暂时用手机号代替code
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @
8570c775
...
...
@@ -10,6 +10,7 @@ import java.io.*;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -795,15 +796,53 @@ public class CheckCountUtil {
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
endResult
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
endResult
=
aveCount
.
multiply
(
param100
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
endResult
=
aveCount
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
endResult
=
aveCount
.
multiply
(
param100
).
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
endResult
=
aveCount
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
endResult
.
toString
();
}
/**
* 计算平行样的平均值 最大误差值
* @return
*/
public
static
Map
<
String
,
Map
<
String
,
String
>>
countParallelAvgError
(
Map
<
String
,
String
>
groupMap
)
{
Map
<
String
,
Map
<
String
,
String
>>
map
=
new
HashMap
<>();
Map
<
String
,
String
>
countResults
=
new
HashMap
<>();
Map
<
String
,
String
>
countError
=
new
HashMap
<>();
for
(
Map
.
Entry
<
String
,
String
>
entry
:
groupMap
.
entrySet
()){
String
[]
values
=
entry
.
getValue
().
split
(
","
);
BigDecimal
resultSum
=
null
;
//求总和
BigDecimal
maxNum
=
null
;
//求最大值
BigDecimal
minNum
=
null
;
//求最小值
for
(
String
val
:
values
){
BigDecimal
valBD
=
getBigDecimal
(
val
);
resultSum
=
resultSum
==
null
?
valBD:
resultSum
.
add
(
valBD
);
maxNum
=
maxNum
==
null
?
valBD:
(
valBD
.
compareTo
(
maxNum
)
==
1
?
valBD:
maxNum
);
minNum
=
minNum
==
null
?
valBD:
(
valBD
.
compareTo
(
minNum
)
==
-
1
?
valBD:
minNum
);
}
//平均值
BigDecimal
aveCount
=
resultSum
.
divide
(
new
BigDecimal
(
values
.
length
),
2
);
BigDecimal
result1
=
aveCount
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
ResultsValue
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
ResultsValue
=
aveCount
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
ResultsValue
=
aveCount
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
//最大误差值
BigDecimal
errorValue
=
maxNum
.
subtract
(
minNum
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);;
countResults
.
put
(
entry
.
getKey
(),
ResultsValue
.
toString
());
countError
.
put
(
entry
.
getKey
(),
errorValue
.
toString
());
}
map
.
put
(
"countResults"
,
countResults
);
map
.
put
(
"countError"
,
countError
);
return
map
;
}
...
...
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