UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

权限问题。耗材字典下载问题

Browse Source
dev_fifo1.0
anthonywj 1 year ago
parent e7ae556f8d
commit 44ba28c823
4 changed files with 85 additions and 65 deletions
Show Stats Download Patch File Download Diff File

20
src/main/java/com/glxp/api/aspect/AuthorizeAspect.java
Unescape Escape View File

@ -62,7 +62,7 @@ public class AuthorizeAspect {
// log.info("Header Value: " + value);
}
String id = request.getHeader("ADMINID");
String id = getAdminId(request);
if (StrUtil.isBlank(id)) {
String apiKey = request.getHeader("api_key");
String secretKey = request.getHeader("secret_key");
@ -81,7 +81,7 @@ public class AuthorizeAspect {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
String token = request.getHeader("ADMINTOKEN");
String token = getToken(request);
if (token == null) {
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
}
@ -107,5 +107,21 @@ public class AuthorizeAspect {
// authRuleVerify(action.value(), adminId);
}
public String getAdminId(HttpServletRequest request) {
String id = request.getHeader("ADMINID");
if (StrUtil.isBlank(id)) {
id = request.getHeader("ADMIN_ID");
}
return id;
}
public String getToken(HttpServletRequest request) {
String token = request.getHeader("ADMINTOKEN");
if (StrUtil.isBlank(token)) {
token = request.getHeader("ADMIN_TOKEN");
}
return token;
}
}

3
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -814,12 +814,11 @@ public class UdiRelevanceController extends BaseController {
BaseResponse<PageSimpleResponse<YbHcflEntityResponse>> ybHcflDetail = erpBasicClient.getYbHcflDetail(ybHcflDetailFilterRequest);
PageSimpleResponse<YbHcflEntityResponse> data = ybHcflDetail.getData();
YbHcflEntityResponse entityResponse = new YbHcflEntityResponse();
if (data.getList().size() > 0){
if (data.getList().size() > 0) {
entityResponse = data.getList().get(0);
}
return ResultVOUtils.success(entityResponse);
}
}

3
src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.thrsys;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.util.IntUtil;
import org.springframework.beans.BeanUtils;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollUtil;
@ -321,7 +322,7 @@ public class ThrProductsController {
if (null == udiRelevanceResponse) {
return ResultVOUtils.error(500, "参数不能为空");
}
if (StrUtil.isEmpty(udiRelevanceResponse.getOriginUuid())) {
if (!IntUtil.value(udiRelevanceResponse.getNewNeedUpload()) && StrUtil.isEmpty(udiRelevanceResponse.getOriginUuid())) {
return ResultVOUtils.error(500, "产品未关联DI");
}

124
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -191,6 +191,7 @@
basic_products.basicPrductRemak8
FROM basic_udirel
inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
inner join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -475,7 +476,7 @@
AND basic_udirel.isDisable = true
</if>
<if test="attributeType != '' and attributeType != null">
AND basic_udirel.attributeType = #{attributeType}
AND basic_udirel.attributeType = #{attributeType}
</if>
</where>
<choose>
@ -1232,72 +1233,74 @@
<insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
replace
INTO basic_udirel
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock,
lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert)
INTO basic_udirel
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock,
lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
updateTime, modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert)
values (#{id},
#{uuid},
#{mainId},
#{thirdId},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4},
#{udplatCode},
#{isUseDy},
#{isDisable},
#{isLock},
#{lockStatus},
#{isAdavence},#{purType},#{attributeType},#{hcType},
#{useMuti},
#{useNum},
#{supName},
#{createTime},
#{updateTime},
#{modifyTime},
#{createUser},
#{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
#{uuid},
#{mainId},
#{thirdId},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4},
#{udplatCode},
#{isUseDy},
#{isDisable},
#{isLock},
#{lockStatus},
#{isAdavence}, #{purType}, #{attributeType}, #{hcType},
#{useMuti},
#{useNum},
#{supName},
#{createTime},
#{updateTime},
#{modifyTime},
#{createUser},
#{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
</insert>
<insert id="insertUdiRelevanceignore"
parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
insert
ignore
ignore
INTO basic_udirel
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock,
lockStatus, isAdavence,purType,attributeType, hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert)
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock,
lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
updateTime, modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert)
values (#{id},
#{uuid},
#{mainId},
#{thirdId},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4},
#{udplatCode},
#{isUseDy},
#{isDisable},
#{isLock},
#{lockStatus},
#{isAdavence},#{purType},#{attributeType},#{hcType},
#{useMuti},
#{useNum},
#{supName},
#{createTime},
#{updateTime},
#{modifyTime},
#{createUser},
#{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
#{uuid},
#{mainId},
#{thirdId},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4},
#{udplatCode},
#{isUseDy},
#{isDisable},
#{isLock},
#{lockStatus},
#{isAdavence}, #{purType}, #{attributeType}, #{hcType},
#{useMuti},
#{useNum},
#{supName},
#{createTime},
#{updateTime},
#{modifyTime},
#{createUser},
#{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
</insert>
<delete id="deleteById" parameterType="Map">
@ -1450,7 +1453,8 @@
into basic_udirel
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock,
lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime,
modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert)

Write Preview
Loading…
Cancel
Save