extra信息设置

ch-admin-api/src/main/java/com/wwdz/ch/admin/config/ShiroConfig.java

@@ -75,6 +75,7 @@ public class ShiroConfig {
 	public RedisSessionDAO redisSessionDAO() {
 		RedisSessionDAO redisSessionDAO = new RedisSessionDAO();
 		redisSessionDAO.setRedisManager(redisManager());
+		redisSessionDAO.setExpire(60*60*12);
 		return redisSessionDAO;
 	}
 

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ItemServiceImpl.java

@@ -103,8 +103,10 @@ public class ItemServiceImpl implements ItemService {
             //查询原有的数据
             Item oldItem = itemManager.findDetails(coinRequestDto.getId());
             String extra = oldItem.getExtra();
+            Map<String, Object> map = new HashMap<>();
             if (StringUtils.hasLength(extra)) {
-                Map<String, Object> map = JsonUtils.toMap(extra);
+                map = JsonUtils.toMap(extra);
+            }
             //直径
             map.put("diameter", coinRequestDto.getDiameter());
             //厚度
@@ -113,7 +115,6 @@ public class ItemServiceImpl implements ItemService {
             map.put("weight", coinRequestDto.getWeight());
             String extraInfo = JsonUtils.fromMap(map);
             item.setExtra(extraInfo);
-            }
             String imgBaseStr = coinRequestDto.getImgBaseStr();
             String keyName = String.valueOf(coinRequestDto.getId()) + System.currentTimeMillis() + IMG_SUFFIX ;
             Map<String, Object> paramMap = new HashMap<>();
@@ -130,8 +131,8 @@ public class ItemServiceImpl implements ItemService {
             itemManager.setCoin(item);
 
             //记录钱币设置的操作日志
-            OperateLog operateLog = OperateLog.of(coinRequestDto.getId(), CommonEnum.OperateTypeEnum.COIN_SET.getDes(),
-                    CommonEnum.OperateTypeEnum.COIN_SET.getCode(), AuthSupport.adminId(), AuthSupport.userName(), JsonUtils.fromMap(paramMap));
+            OperateLog operateLog = OperateLog.of(coinRequestDto.getId(), CommonEnum.OperateTypeEnum.ITEM_SET.getDes(),
+                    CommonEnum.OperateTypeEnum.ITEM_SET.getCode(), AuthSupport.adminId(), AuthSupport.userName(), JsonUtils.fromMap(paramMap));
             operateLogService.insert(operateLog);
         } catch (Exception e) {
             logger.error("钱币设置 error :{}", e);

ch-core/src/main/java/com/wwdz/ch/core/consts/CommonEnum.java

@@ -3,7 +3,7 @@ package com.wwdz.ch.core.consts;
 public class CommonEnum {
 
     public enum OperateTypeEnum {
-        COIN_SET(1, "钱币设置"),
+        ITEM_SET(1, "商品设置"),
         ;
 
         private int code;
@@ -34,4 +34,38 @@ public class CommonEnum {
 
     }
 
+
+    public enum SourceTypeEnum {
+        SYSTEM_GET(1, "系统获取"),
+        USER_UPLOAD(2, "用户上传"),
+        ;
+
+        private int code;
+        private String des;
+
+        SourceTypeEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+
+            for (SourceTypeEnum sourceTypeEnum : SourceTypeEnum.values()) {
+                if (code == sourceTypeEnum.getCode()) {
+                    return sourceTypeEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+
 }