root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:提交验箱接口代码，所有回传mes接口增加请求超时时间120s,提交用户页面 部门和角色未回显，提交任务查询优化

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2025-02-28 10:21:01 +08:00
parent e54878bbe8
commit 60d26adbc6
7 changed files with 204 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
View File

@@ -25,36 +25,33 @@
sys_user.extuser_id as extuserId
</sql>
<insert id="insertDataPermission">
INSERT INTO sys_user_data_permission(user_id, permission_scope_type, permission_id)
VALUES (#{dataPermission.user_id}, #{dataPermission.permission_scope_type}, #{dataPermission.permission_id})
INSERT INTO sys_user_data_permission(user_id, permission_scope_type, permission_id) VALUES (#{dataPermission.user_id}, #{dataPermission.permission_scope_type}, #{dataPermission.permission_id})
</insert>
<delete id="deleteDataPermissionById">
DELETE
FROM sys_user_data_permission
WHERE user_id = #{userId}
DELETE FROM sys_user_data_permission WHERE user_id = #{userId}
</delete>
<resultMap id="UserDetail" type="org.nl.system.service.user.dto.SysUserDetail">
<id column="userId" property="user_id"/>
<result column="username" property="username"/>
<result column="personName" property="person_name"/>
<result column="gender" property="gender"/>
<result column="phone" property="phone"/>
<result column="email" property="email"/>
<result column="avatarName" property="avatar_name"/>
<result column="avatarPath" property="avatar_path"/>
<result column="password" property="password"/>
<result column="isAdmin" property="is_admin"/>
<result column="isUsed" property="is_used"/>
<result column="pwdResetUserId" property="pwd_reset_user_id"/>
<result column="pwdResetTime" property="pwd_reset_time"/>
<result column="create_id" property="create_id"/>
<result column="createName" property="create_name"/>
<result column="createTime" property="create_time"/>
<result column="updateId" property="update_id"/>
<result column="updateName" property="update_name"/>
<result column="updateTime" property="update_time"/>
<result column="extpersonId" property="extperson_id"/>
<result column="extuserId" property="extuser_id"/>
<resultMap id="UserDetail" type="org.nl.system.service.user.dto.SysUserDetail" >
<id column="userId" property="user_id" />
<result column="username" property="username" />
<result column="personName" property="person_name" />
<result column="gender" property="gender" />
<result column="phone" property="phone" />
<result column="email" property="email" />
<result column="avatarName" property="avatar_name" />
<result column="avatarPath" property="avatar_path" />
<result column="password" property="password" />
<result column="isAdmin" property="is_admin" />
<result column="isUsed" property="is_used" />
<result column="pwdResetUserId" property="pwd_reset_user_id" />
<result column="pwdResetTime" property="pwd_reset_time" />
<result column="create_id" property="create_id" />
<result column="createName" property="create_name" />
<result column="createTime" property="create_time" />
<result column="updateId" property="update_id" />
<result column="updateName" property="update_name" />
<result column="updateTime" property="update_time" />
<result column="extpersonId" property="extperson_id" />
<result column="extuserId" property="extuser_id" />
<collection property="depts" ofType="org.nl.system.service.dept.dao.SysDept">
<id property="dept_id" column="dept_id"/>
<result column="dept_name" property="name"/>
@@ -83,13 +80,13 @@
and sys_user.is_used = #{query.is_used}
</if>
<if test="query.start_time != null">
and sys_user.create_time >= #{query.startTime}
and and sys_user.create_time >= #{query.startTime}
</if>
<if test="query.end_time != null">
and #{query.end_time} >= sys_user.create_time
</if>
<if test="query.blurry != null">
and (email like #{query.blurry} or username like concat('%',#{query.blurry},'%') or person_name like concat('%',#{query.blurry},'%'))
and (email like #{query.blurry} or username like #{query.blurry} or person_name like #{query.blurry})
</if>
</where>
</select>
@@ -126,15 +123,11 @@
</select>
<select id="getUserDataPermissionByPermissionId"
resultType="org.nl.system.service.user.dto.UserDataPermissionDto">
SELECT *
FROM sys_user_data_permission
WHERE permission_id = #{permissionId}
SELECT * FROM sys_user_data_permission WHERE permission_id = #{permissionId}
</select>
<select id="getUserDataPermissionByUserId"
resultType="org.nl.system.service.user.dto.UserDataPermissionDto">
SELECT *
FROM sys_user_data_permission
WHERE user_id = #{userId}
SELECT * FROM sys_user_data_permission WHERE user_id = #{userId}
</select>
<select id="getUserIdByDeptId" resultType="java.lang.String">
SELECT

7
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java
View File

@@ -140,6 +140,13 @@ public class LmsToMesController {
return new ResponseEntity<>(lmsToMesService.momBoxPackageSubmit(jo), HttpStatus.OK);
}
@PostMapping("/momBoxCheckSubmit")
@Log("LMS将验箱信息传递给MES")
@SaIgnore
public ResponseEntity<Object> momBoxCheckSubmit(@RequestBody JSONObject jo) {
return new ResponseEntity<>(lmsToMesService.BoxDataCollectionSubmit2(jo), HttpStatus.OK);
}
@PostMapping("/GetInspectionResult")
@Log("LMS获取MES称重后子卷信息")
@SaIgnore

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java
View File

@@ -183,5 +183,7 @@ public interface LmsToMesService {
JSONObject momBoxPackageSubmit(JSONObject jo);
JSONObject BoxDataCollectionSubmit2(JSONObject jo);
JSONObject getInspectionResult(JSONObject jo);
}

88
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
View File

@@ -38,6 +38,8 @@ public class LmsToMesServiceImpl implements LmsToMesService {
private static String is_connect_mes = "1";
private static Integer time_out = 120000;
@Autowired
private IBstIvtBoxinfoService bstIvtBoxinfoService;
@@ -72,6 +74,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("momRollFoilWeighing接口输出参数为：-------------------" + result.toString());
@@ -131,6 +134,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("momRollBakeInBound接口输出参数为：-------------------" + result.toString());
@@ -194,6 +198,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("momRollBakeOutBound接口输出参数为：-------------------" + result.toString());
@@ -234,6 +239,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("momRollSemiFGInboundComplete接口输出参数为：-------------------" + result.toString());
@@ -288,6 +294,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(jo))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("airSwellWithPaperTubeAssComplete接口输出参数为：-------------------" + result.toString());
@@ -346,6 +353,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(jo))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("airSwellWithPaperTubeAssComplete接口输出参数为：-------------------" + result.toString());
@@ -396,6 +404,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(jo))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("airSwellWithPaperTubeAssArrival接口输出参数为：-------------------" + result.toString());
@@ -449,8 +458,10 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String api = "CamstarApi/ChildRollFGInboundComplete";
url = url + api;
try {
String resultMsg = HttpRequest.post(url)
String resultMsg = HttpRequest
.post(url)
.body(String.valueOf(jo))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("childRollFGInboundComplete接口输出参数为：-------------------" + result.toString());
@@ -493,6 +504,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("childRollFGOutboundComplete接口输出参数为：-------------------" + result.toString());
@@ -540,6 +552,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("LMSUnPackage接口输出参数为：-------------------" + result.toString());
@@ -587,6 +600,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("LMSPackakge接口输出参数为：-------------------" + result.toString());
@@ -623,6 +637,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("scrapAudit接口输出参数为：-------------------" + result.toString());
@@ -659,6 +674,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("proudDayData接口输出参数为：-------------------" + result.toString());
@@ -700,6 +716,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("ChildScrapUpdate接口输出参数为：-------------------" + result.toString());
@@ -736,6 +753,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("sendSalesIvtMsg接口输出参数为：-------------------" + result.toString());
@@ -771,6 +789,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("sendSalesIvtMsgParam接口输出参数为：-------------------" + result.toString());
@@ -825,6 +844,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
/*String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("momAutoTransterMoveIn接口输出参数为：-------------------" + result.toString());
@@ -868,6 +888,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("momGetPackingInfo接口输出参数为：-------------------" + result.toString());
@@ -931,6 +952,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
IpdmBiSubpackagerelationService subpackagerelationService = SpringContextHolder.getBean(IpdmBiSubpackagerelationService.class);
@@ -958,6 +980,69 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
@Override
public JSONObject BoxDataCollectionSubmit2(JSONObject param) {
log.info("BoxDataCollectionSubmit2接口输入参数为：-------------------" + param.toString());
String box_no = param.getString("box_no");
String box_weight = param.getString("box_weight");
if (StrUtil.isEmpty(box_no)) {
throw new BadRequestException("木箱号不能为空！");
}
if (StrUtil.isEmpty(box_weight)) {
throw new BadRequestException("木箱毛重不能为空！");
}
JSONObject result = new JSONObject();
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL2").getValue();
String api = "CamstarApi/BoxDataCollectionSubmit2";
url = url + api;
String UserName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue();
String Password = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue();
param.put("UserName", UserName);
param.put("Password", Password);
param.put("BoxContainerName", box_no);
param.put("BoxWeight", box_weight);
JSONArray rows = new JSONArray();
JSONObject row1 = new JSONObject();
row1.put("DataPointName","保护棉是否填充");
row1.put("DataType","7");
row1.put("DataValue","true");
row1.put("DataCollectionDefId","001c61800000004f");
row1.put("DataCollectionDefName","PACKAGE");
row1.put("DataCollectionDefName","PACKAGE");
rows.add(row1);
row1.put("DataPointName","信息核对准确");
rows.add(row1);
row1.put("DataPointName","木箱是否防护");
rows.add(row1);
param.put("DataPoints", rows);
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
log.info("BoxDataCollectionSubmit2接口输出参数为：-------------------" + result.toString());
String RTYPE = result.getString("RTYPE");
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
} catch (Exception e) {
throw new BadRequestException("MES提示错误：" + e.getMessage());
}
return result;
}
public JSONObject getInspectionResult(JSONObject param) {
log.info("getInspectionResult接口输出参数为：-------------------" + param.toString());
@@ -988,6 +1073,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(param))
.timeout(time_out)//超时时间，毫秒
.execute().body();
result = JSONObject.parseObject(resultMsg);
IpdmBiSubpackagerelationService subpackagerelationService = SpringContextHolder.getBean(IpdmBiSubpackagerelationService.class);

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -88,10 +88,10 @@ public class TaskServiceImpl implements TaskService {
map.put("finishTypeList", whereJson.getString("finishTypeList"));
}
if (StrUtil.isNotEmpty(whereJson.getString("begin_time"))) {
map.put("begin_time", whereJson.getString("begin_time"));
map.put("begin_time", whereJson.getString("begin_time").substring(0, 10)+" 00:00:00");
}
if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) {
map.put("end_time", whereJson.getString("end_time"));
map.put("end_time", whereJson.getString("end_time").substring(0, 10)+" 99:99:99");
}
if (StrUtil.isNotEmpty(whereJson.getString("is_delete"))) {
map.put("is_delete", whereJson.getString("is_delete"));

111
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
View File

@@ -52,60 +52,59 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT * FROM (
SELECT
task.*,
md.class_name task_type_name,
user.person_name AS create_name1,
dict.label task_status_name,
case when task.task_type like '0105%' then 'LK' when task.task_type like '0107%' then 'LK' ELSE task.product_area end AS final_product_area
FROM
sch_base_task task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
LEFT JOIN sys_user user ON user.username = task.create_name
LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
WHERE
1=1
OPTION 输入.is_delete <> ""
task.is_delete = 输入.is_delete
SELECT
task.*,
md.class_name task_type_name,
user.person_name AS create_name1,
dict.label task_status_name,
case when task.task_type like '0105%' then 'LK' when task.task_type like '0107%' then 'LK' ELSE task.product_area end AS final_product_area
FROM
(select
tas.*
from
sch_base_task tas
where 1=1
OPTION 输入.is_delete <> ""
tas.is_delete = 输入.is_delete
ENDOPTION
OPTION 输入.finished_type <> ""
tas.finished_type = 输入.finished_type
ENDOPTION
OPTION 输入.unFinish <> ""
tas.task_status <> '07'
ENDOPTION
OPTION 输入.task_status <> ""
find_in_set( tas.task_status, 输入.task_status)
ENDOPTION
OPTION 输入.vehicle_code <> ""
(tas.vehicle_code like 输入.vehicle_code OR tas.material_code like 输入.vehicle_code OR tas.vehicle_code2 like 输入.vehicle_code)
ENDOPTION
OPTION 输入.task_code <> ""
(tas.task_code like 输入.task_code)
ENDOPTION
OPTION 输入.point_code1 <> ""
(tas.point_code1 like 输入.point_code1)
ENDOPTION
OPTION 输入.begin_time <> ""
tas.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
tas.create_time <= 输入.end_time
ENDOPTION
) task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
LEFT JOIN sys_user user ON user.username = task.create_name
LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
WHERE
1=1
OPTION 输入.task_type <> ""
md.class_id in 输入.task_type
ENDOPTION
) a
WHERE 1=1
OPTION 输入.in_area_id <> ""
a.final_product_area IN 输入.in_area_id
ENDOPTION
OPTION 输入.task_type <> ""
md.class_id in 输入.task_type
ENDOPTION
OPTION 输入.finished_type <> ""
task.finished_type = 输入.finished_type
ENDOPTION
OPTION 输入.begin_time <> ""
task.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
task.create_time <= 输入.end_time
ENDOPTION
OPTION 输入.unFinish <> ""
task.task_status <> '07'
ENDOPTION
OPTION 输入.task_status <> ""
find_in_set( task.task_status, 输入.task_status)
ENDOPTION
OPTION 输入.vehicle_code <> ""
(task.vehicle_code like 输入.vehicle_code OR task.material_code like 输入.vehicle_code OR task.vehicle_code2 like 输入.vehicle_code)
ENDOPTION
OPTION 输入.task_code <> ""
(task.task_code like 输入.task_code)
ENDOPTION
OPTION 输入.point_code1 <> ""
(task.point_code1 like 输入.point_code1)
ENDOPTION
OPTION 输入.begin_time <> ""
task.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
task.create_time <= 输入.end_time
ENDOPTION
) a
WHERE 1=1
OPTION 输入.in_area_id <> ""
a.final_product_area IN 输入.in_area_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
ENDSELECT
ENDPAGEQUERY
ENDIF