添加redis外网访问

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@@ -305,6 +305,7 @@ public class MaterialServiceImpl implements MaterialService {
 
     /**
      * 用于修改库存中的备注
+     *
      * @param map 待修改数据
      * @return
      */
@@ -395,7 +396,7 @@ public class MaterialServiceImpl implements MaterialService {
         map.put("code", code);
         Material material = null;
         List<Material> materialByCondition = materialMapper.findMaterialByCondition(map);
-        if(materialByCondition.size() > 0){
+        if (materialByCondition.size() > 0) {
             material = materialByCondition.get(0);
         }
         return material;
@@ -987,7 +988,6 @@ public class MaterialServiceImpl implements MaterialService {
             map.put("quantity", 0);
         }
         Map<String, Object> params = new HashMap<>();
-//        params.put("code", map.get("code"));
         params.put("mid", map.get("mid"));
         params.put("depositoryId", map.get("depositoryId"));
         List<Inventory> inventory = materialMapper.findInventoryForImport(params);
@@ -999,10 +999,12 @@ public class MaterialServiceImpl implements MaterialService {
             Inventory material = inventory.get(0);
 
             if (map.containsKey("remark")) {
-                material.setRemark(map.get("remark").toString());
+                String materialRemark = material.getRemark();
+                if (materialRemark == null) {
+                    materialRemark = "";
+                }
+                material.setRemark(materialRemark + map.get("remark").toString());
             }
-
-
             double quantity = Double.parseDouble(map.get("quantity").toString());
             double quantity_residue = 0;
             int splitInfoScaleQuantity = 0;
@@ -1108,8 +1110,7 @@ public class MaterialServiceImpl implements MaterialService {
                 }
             }
             return materialMapper.updateInventory(material);
-        }
-        else {
+        } else {
             // 用于标志是新插入的物料
             map.put("isNew", true);
             Double quantity = ObjectFormatUtil.toDouble(map.get("quantity"));
@@ -2447,19 +2448,19 @@ public class MaterialServiceImpl implements MaterialService {
      *
      * @return
      */
-    public List<Object> InitTreeForSelectName(String mname, String type, Map<String, Object> map,UserByPort userToken) {
+    public List<Object> InitTreeForSelectName(String mname, String type, Map<String, Object> map, UserByPort userToken) {
         // 获取所有物料类型
         List<MaterialType> materialTypeAll = materialTypeMapper.findMaterialTypeAll();
         // 获取当前用户所可见的仓库id
         List<Integer> depositoryIdForUserHas = new ArrayList<>();
-        if("immediately".equals(type)){
+        if ("immediately".equals(type)) {
             List<Depository> depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
-            for (Depository depository:depositoryByAdminorg
-                 ) {
+            for (Depository depository : depositoryByAdminorg
+            ) {
                 depositoryIdForUserHas.add(depository.getId());
             }
             type = "2";
-        }else{
+        } else {
             depositoryIdForUserHas = roleService.findDepositoryIdForUserHas(userToken);
         }
 
@@ -2495,7 +2496,7 @@ public class MaterialServiceImpl implements MaterialService {
             MaterialType materialType = materialTypeAll.get(i);
             if (((i + 1) % 100) == 0) { // 如果有100个开启线程进行处理
                 materialTypeList.add(materialType.getOldId());
-                TaskTestForSelectMname taskTestForSelectMname = new TaskTestForSelectMname(materialTypeList, mname, type,depositoryIdForUserHas);
+                TaskTestForSelectMname taskTestForSelectMname = new TaskTestForSelectMname(materialTypeList, mname, type, depositoryIdForUserHas);
                 if (flagForStock) {
                     taskTestForSelectMname.setMap(map);
                 }
@@ -2510,7 +2511,7 @@ public class MaterialServiceImpl implements MaterialService {
 
         if (materialTypeList.size() > 0) {
             // 如果有剩余，开启线程进行处理
-            TaskTestForSelectMname taskTestForSelectMname = new TaskTestForSelectMname(materialTypeList, mname, type,depositoryIdForUserHas);
+            TaskTestForSelectMname taskTestForSelectMname = new TaskTestForSelectMname(materialTypeList, mname, type, depositoryIdForUserHas);
             if (flagForStock) {
                 taskTestForSelectMname.setMap(map);
             }
@@ -2722,8 +2723,7 @@ public class MaterialServiceImpl implements MaterialService {
                 map.put("id", material.getId());
                 result.add(map);
             }
-        }
-        else if (inventoryList != null) {
+        } else if (inventoryList != null) {
             for (Inventory inventory : inventoryList) {
                 Map<String, Object> map = new HashMap<>();
                 String version = inventory.getVersion();
@@ -2874,7 +2874,7 @@ public class MaterialServiceImpl implements MaterialService {
         // 当前用户可见的仓库
         List<Integer> depositoryIdList;
 
-        public TaskTestForSelectMname(List<Long> materialTypeByCondition, String mname, String type,List<Integer> depositoryIdList) {
+        public TaskTestForSelectMname(List<Long> materialTypeByCondition, String mname, String type, List<Integer> depositoryIdList) {
             this.materialTypeIdList = materialTypeByCondition;
             this.mname = mname;
             this.type = type;
@@ -2900,11 +2900,11 @@ public class MaterialServiceImpl implements MaterialService {
                 // 如果是入库
                 materialByTypeIds = materialMapper.findMaterialByTypeIdsAndMname(paramForMnameAndMtid);
             } else if ("2".equals(type)) {
-                paramForMnameAndMtid.put("depositoryIdList",depositoryIdList);
+                paramForMnameAndMtid.put("depositoryIdList", depositoryIdList);
                 // 如果是出库
                 inventoryByTypeIdsAndMname = materialMapper.findInventoryByTypeIdsAndMname(paramForMnameAndMtid);
             } else if ("3".equals(type)) {
-                paramForMnameAndMtid.put("depositoryIdList",depositoryIdList);
+                paramForMnameAndMtid.put("depositoryIdList", depositoryIdList);
                 // 如果是盘点
                 List<Inventory> inventoryList = materialMapper.findInventoryByTypeIdsAndMname(paramForMnameAndMtid);
 

src/main/resources/application-test.yml

@@ -59,7 +59,8 @@ spring:
     static-path-pattern: /static/**
   redis:
     port: 6379
-    host: 127.0.0.1
+    host: 36.133.126.182
+#    host: 127.0.0.1
     database: 5
     jedis:
       pool:
@@ -72,7 +73,8 @@ spring:
 
 redisPool:
   port: 6379
-  host: 127.0.0.1
+#  host: 127.0.0.1
+  host: 36.133.126.182
   dbs: 5,14,15
   password:
 

src/test/java/com/dreamchaser/depository_manage/OtherTest.java

@@ -99,8 +99,7 @@ public class OtherTest {
 
     @Test
     public void someTest(){
-        String local = "HXGK_GO_ZhixingCollege:ScanCode:Authentication:LoginApi_dev_e3bfa398fe9d0e1ab78a00ff59eff788";
-        Object usertoken = redisPool.getRedisTemplateByDb(5).opsForHash().get(local, "usertoken");
+        Object usertoken = redisPool.getRedisTemplateByDb(5).opsForHash().get("HXGK_GO_ZhixingCollege:ScanCode:Authentication:LoginApi_dev_e3bfa398fe9d0e1ab78a00ff59eff788", "usertoken");
         System.out.println(usertoken);
     }