Commit 32f84c63 authored by 廖旭伟's avatar 廖旭伟

增加banner配置接口

parent c2a756a1
...@@ -44,4 +44,5 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IPar ...@@ -44,4 +44,5 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IPar
*/ */
Map<String, String> getParamBySecondOrganize(String firstOrganize,String secondOrganize, String... excludeParamKeys); Map<String, String> getParamBySecondOrganize(String firstOrganize,String secondOrganize, String... excludeParamKeys);
Long getIdByKey(String key);
} }
\ No newline at end of file
...@@ -194,4 +194,11 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par ...@@ -194,4 +194,11 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
} }
} }
@Override
public Long getIdByKey(String key) {
List<ParamEntity> list = this.getCacheList();
Map<String, Long> keyValueMap = list.parallelStream().collect(Collectors.toMap(x -> x.getParamKey(), y -> y.getId(), (o, n) -> n));
return keyValueMap.get(key);
}
} }
\ No newline at end of file
...@@ -3,15 +3,16 @@ package com.mortals.xhx.base.system.param.web; ...@@ -3,15 +3,16 @@ package com.mortals.xhx.base.system.param.web;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.RepeatSubmit; import com.mortals.framework.annotation.RepeatSubmit;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.code.PageDisplayType; import com.mortals.framework.common.code.PageDisplayType;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.util.FileUtil; import com.mortals.framework.util.FileUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.pdu.BannerPdu;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RestController;
import com.mortals.framework.web.BaseCRUDJsonMappingController; import com.mortals.framework.web.BaseCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.model.ParamEntity; import com.mortals.xhx.base.system.param.model.ParamEntity;
...@@ -21,8 +22,9 @@ import com.mortals.xhx.common.code.ModStatusEnum; ...@@ -21,8 +22,9 @@ import com.mortals.xhx.common.code.ModStatusEnum;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap; import java.util.*;
import java.util.Map;
import static com.mortals.xhx.common.key.ParamKey.SYS_PARAM_BANNER;
/** /**
* 参数信息 * 参数信息
...@@ -49,7 +51,6 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ ...@@ -49,7 +51,6 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ
model.put(KEY_RESULT_DICT, status); model.put(KEY_RESULT_DICT, status);
} }
private Map<String, Object> getPageDisplayType() { private Map<String, Object> getPageDisplayType() {
PageDisplayType[] pageDisplayTypes = PageDisplayType.values(); PageDisplayType[] pageDisplayTypes = PageDisplayType.values();
Map<String, Object> result = new HashMap<>(pageDisplayTypes.length); Map<String, Object> result = new HashMap<>(pageDisplayTypes.length);
...@@ -59,6 +60,60 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ ...@@ -59,6 +60,60 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ
return result; return result;
} }
@GetMapping("banner/info")
@UnAuth
public String getBannerInfo() {
JSONObject jsonObject = new JSONObject();
String busiDesc = "获取banner配置";
try {
String value = this.service.getValueByKey(SYS_PARAM_BANNER);
if (ObjectUtils.isEmpty(value)) {
BannerPdu pdu = new BannerPdu();
jsonObject.put(KEY_RESULT_DATA, pdu);
}else {
BannerPdu pdu = JSONObject.parseObject(value,BannerPdu.class);
jsonObject.put(KEY_RESULT_DATA, pdu);
}
recordSysLog(request, busiDesc + " 【成功】");
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
jsonObject.put(KEY_RESULT_MSG, busiDesc + "成功!");
} catch (Exception e) {
log.error("获取异常", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
}
return jsonObject.toJSONString();
}
@PostMapping("banner/save")
@UnAuth
public String saveBannerInfo(@RequestBody BannerPdu pdu) {
JSONObject jsonObject = new JSONObject();
String busiDesc = "修改banner配置";
try {
ParamEntity entity = new ParamEntity();
entity.setParamKey(SYS_PARAM_BANNER);
entity.setParamValue(JSONObject.toJSONString(pdu));
Long id = this.service.getIdByKey(SYS_PARAM_BANNER);
if(id==null){
entity.setCreateTime(new Date());
this.service.save(entity);
}else {
entity.setId(id);
entity.setUpdateTime(new Date());
this.service.update(entity);
}
recordSysLog(request, busiDesc + " 【成功】");
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
jsonObject.put(KEY_RESULT_MSG, busiDesc + "成功!");
} catch (Exception e) {
log.error("获取异常", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
}
return jsonObject.toJSONString();
}
public static void main(String[] args) { public static void main(String[] args) {
FileUtil.delete("E:\\pic\\1.png"); FileUtil.delete("E:\\pic\\1.png");
} }
......
...@@ -12,4 +12,7 @@ public class ParamKey { ...@@ -12,4 +12,7 @@ public class ParamKey {
/** 物料编码长度,默认6 */ /** 物料编码长度,默认6 */
public static final String MATERIA_CODE_LENGTH = "iot:base:param:materia:length"; public static final String MATERIA_CODE_LENGTH = "iot:base:param:materia:length";
/** banner图配置 */
public static String SYS_PARAM_BANNER = "banner";
} }
package com.mortals.xhx.common.pdu;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class BannerPdu {
private List<BannerInfo> bannerInfo;
public BannerPdu() {
bannerInfo = new ArrayList<>();
BannerInfo info = new BannerInfo();
bannerInfo.add(info);
}
}
class BannerInfo{
private String fileName = "bannerName";
private String filePath = "bannerUrl";
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getFilePath() {
return filePath;
}
public void setFilePath(String filePath) {
this.filePath = filePath;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment