pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改给仓库管理员发送消息后无法存储到redis的bug

lwx_dev
erdanergou 3 years ago
parent
289b467b46
commit
ccfef76a72
6 changed files with 43 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
  2. 27
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 12
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  4. 4
      src/main/resources/templates/pages/application/application-review.html
  5. 6
      src/test/java/com/dreamchaser/depository_manage/SomeTest.java
  6. 4
      target/classes/templates/pages/application/application-review.html

15
src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
View File

@ -181,4 +181,19 @@ public class PublicConfig {
exs.shutdownNow();
}
}
/**
* 用于获取Map<String,String>
* @param jsonObject
* @return
*/
public static Map<String,String> returnMapString(JSONObject jsonObject){
Map<String,String> stringObjectMap = new HashMap<>();
for (String next : jsonObject.keySet()) {
String value = String.valueOf(jsonObject.get(next));
stringObjectMap.put(next,value);
}
return stringObjectMap;
}
}

27
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -831,7 +831,7 @@ public class PageController {
mv.addObject("display", "none");
}
List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
mv.addObject("btList",businessTypeAll);
mv.addObject("btList", businessTypeAll);
mv.setViewName("pages/application/application-out");
Integer maindeparment = userToken.getMaindeparment();
if (PublicConfig.roleAdminorgList.contains(maindeparment)) {
@ -851,7 +851,7 @@ public class PageController {
ModelAndView mv = new ModelAndView();
// 获取所有出库业务类别
List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
mv.addObject("btList",businessTypeAll);
mv.addObject("btList", businessTypeAll);
mv.setViewName("pages/applicationForStorageCenter/application-out_admin");
return mv;
}
@ -868,7 +868,7 @@ public class PageController {
public ModelAndView application_out_back(String code, String depositoryId, HttpServletRequest request) {
ModelAndView mv = new ModelAndView();
List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
mv.addObject("btList",businessTypeAll);
mv.addObject("btList", businessTypeAll);
mv.setViewName("pages/application/application-out_back");
String token = request.getHeader("user-token");
if (token == null) {
@ -1946,11 +1946,7 @@ public class PageController {
// 获取当前出库仓库是否为开放仓库
int flagForOpenDepository = recordP.getFlagForOpenDepository();
if (flagForOpenDepository == 2) {
mv.addObject("depositoryManagerText", "部门负责人");
} else {
mv.addObject("depositoryManagerText", "仓储负责人");
}
mv.addObject("depositoryManagerText", "负责人");
// 获取所有子订单
List<ApplicationOutRecordMinP> applicationOutRecordMinByParent = depositoryRecordService.findApplicationOutRecordMinByParent(recordP.getId());
@ -2043,15 +2039,18 @@ public class PageController {
// 平衡岗人员
String balancePoster = recordP.getBalancePoster();
StringBuilder balancePosterName = new StringBuilder();
if(balancePoster != null && !"".equals(balancePoster)){
if (balancePoster != null && !"".equals(balancePoster)) {
String[] strings = balancePoster.split(",");
for (String string : strings) {
if(!"".equals(string)){
if (!"".equals(string)) {
UserByPort user = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(string), userKey, token);
balancePosterName.append(user.getName()).append(",");
}
}
recordP.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getBalancePosterTime())));
String balancePosterTime = recordP.getBalancePosterTime();
if (balancePosterTime != null && !"".equals(balancePosterTime) && !"0".equals(balancePosterTime)) {
recordP.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(balancePosterTime)));
}
}
// 获取出库的所有仓库
@ -2391,7 +2390,7 @@ public class PageController {
}
}
applicationOutRecordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getBalancePosterTime())));
}else{
} else {
applicationOutRecordPById.setBalancePosterTime("");
}
@ -3231,7 +3230,7 @@ public class PageController {
token = (String) request.getSession().getAttribute("userToken");
}
List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
mv.addObject("btList",businessTypeAll);
mv.addObject("btList", businessTypeAll);
UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
List<String> range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1);
// 获取当前用户是否存在可见仓库
@ -3627,8 +3626,6 @@ public class PageController {
}
// 用于展示库存数据
@GetMapping("/toShowInventory")
public ModelAndView toShowInventory(@RequestParam Map<String, String> param) {

12
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -2410,7 +2410,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
SendQyWxMessageThreadPool.execute(() -> {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token);
String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId();
Map stringObjectMap = jsonObject.toJavaObject(Map.class);
Map<String,String> stringObjectMap = PublicConfig.returnMapString(jsonObject);
redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap);
redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS);
});
@ -2491,7 +2491,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
SendQyWxMessageThreadPool.execute(() -> {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token);
String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId();
Map stringObjectMap = jsonObject.toJavaObject(Map.class);
Map<String,String> stringObjectMap = PublicConfig.returnMapString(jsonObject);
redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap);
redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS);
});
@ -3472,7 +3472,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
SendQyWxMessageThreadPool.execute(() -> {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token);
String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId();
Map stringObjectMap = jsonObject.toJavaObject(Map.class);
Map<String,String> stringObjectMap = PublicConfig.returnMapString(jsonObject);
redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap);
redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS);
});
@ -3551,7 +3551,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
SendQyWxMessageThreadPool.execute(() -> {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token);
String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId();
Map stringObjectMap = jsonObject.toJavaObject(Map.class);
Map<String,String> stringObjectMap = PublicConfig.returnMapString(jsonObject);
redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap);
redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS);
});
@ -3950,7 +3950,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
SendQyWxMessageThreadPool.execute(() -> {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token);
String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId();
Map stringObjectMap = jsonObject.toJavaObject(Map.class);
Map<String,String> stringObjectMap = PublicConfig.returnMapString(jsonObject);
redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap);
redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS);
});
@ -4028,7 +4028,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
SendQyWxMessageThreadPool.execute(() -> {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token);
String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId();
Map stringObjectMap = jsonObject.toJavaObject(Map.class);
Map<String,String> stringObjectMap = PublicConfig.returnMapString(jsonObject);
redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap);
redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS);
});

4
src/main/resources/templates/pages/application/application-review.html
View File

@ -102,7 +102,7 @@
<tr id="balancePosterNameT" style="display: none">
<td>负责人</td>
<td id="balancePosterName" th:text="${record.getBalancePosterName()}">部门负责人</td>
<td id="balancePosterName" th:text="${record.getBalancePosterName()}"></td>
</tr>
<tr id="balancePosterMessageT" style="display: none">
<td>审核意见</td>
@ -268,7 +268,7 @@
$("#balancePosterNameT").show();
$("#reviewForBalance").show();
} else if(balancePosterTime !== null && balancePosterTime !== "0"){
} else if(balancePosterTime !== null && balancePosterTime !== "0" && balancePosterTime !== ""){
$("#depositoryManagerNameT").show();
$("#balancePosterNameT").show();
$("#balancePosterMessageT").show();

6
src/test/java/com/dreamchaser/depository_manage/SomeTest.java
View File

@ -314,4 +314,10 @@ public class SomeTest {
}
@Test
public void tes(){
Integer a = 1;
System.out.println(String.valueOf(a));
}
}

4
target/classes/templates/pages/application/application-review.html
View File

@ -102,7 +102,7 @@
<tr id="balancePosterNameT" style="display: none">
<td>负责人</td>
<td id="balancePosterName" th:text="${record.getBalancePosterName()}">部门负责人</td>
<td id="balancePosterName" th:text="${record.getBalancePosterName()}"></td>
</tr>
<tr id="balancePosterMessageT" style="display: none">
<td>审核意见</td>
@ -268,7 +268,7 @@
$("#balancePosterNameT").show();
$("#reviewForBalance").show();
} else if(balancePosterTime !== null && balancePosterTime !== "0"){
} else if(balancePosterTime !== null && balancePosterTime !== "0" && balancePosterTime !== ""){
$("#depositoryManagerNameT").show();
$("#balancePosterNameT").show();
$("#balancePosterMessageT").show();

Write Preview
Loading…
Cancel
Save