Commit 4e6670e5 authored by 赵啸非's avatar 赵啸非

修改部分权限

parent 597cce4f
...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; ...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.code.SourceType;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.pdu.RespData; import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.device.DeviceMsgReqPdu; import com.mortals.xhx.common.pdu.device.DeviceMsgReqPdu;
...@@ -74,8 +75,8 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity ...@@ -74,8 +75,8 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity
SkinEntity skinEntity = new SkinEntity(); SkinEntity skinEntity = new SkinEntity();
skinEntity.initAttrValue(); skinEntity.initAttrValue();
//存相对地址 //存相对地址
newSkin.setCssFilePath("/"+ StrUtil.subAfter(newSkin.getCssFilePath(), "/", true)); newSkin.setCssFilePath("/file"+ StrUtil.subAfter(newSkin.getCssFilePath(), "/file", false));
newSkin.setPreviewImagePath("/"+StrUtil.subAfter(newSkin.getPreviewImagePath(), "/", true)); newSkin.setPreviewImagePath("/file"+StrUtil.subAfter(newSkin.getPreviewImagePath(), "/file", false));
BeanUtils.copyProperties(newSkin, skinEntity, BeanUtil.getNullPropertyNames(newSkin)); BeanUtils.copyProperties(newSkin, skinEntity, BeanUtil.getNullPropertyNames(newSkin));
return skinEntity; return skinEntity;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -113,10 +114,10 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity ...@@ -113,10 +114,10 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity
}).filter(f -> f != null).collect(Collectors.toList()); }).filter(f -> f != null).collect(Collectors.toList());
// if (!ObjectUtils.isEmpty(updateSkinLsit)) { if (!ObjectUtils.isEmpty(updateSkinLsit)) {
// log.info("皮肤更新,size:{}", updateSkinLsit.size()); log.info("皮肤更新,size:{}", updateSkinLsit.size());
// skinService.update(updateSkinLsit); this.update(updateSkinLsit);
// } }
if (!ObjectUtils.isEmpty(saveSkinList)) { if (!ObjectUtils.isEmpty(saveSkinList)) {
log.info("皮肤新增,size:{}", saveSkinList.size()); log.info("皮肤新增,size:{}", saveSkinList.size());
...@@ -131,4 +132,12 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity ...@@ -131,4 +132,12 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity
} }
} }
} }
public static void main(String[] args) {
// boolean b = StrUtil.subPre("http://192.168.0.98:11078/file/fileupload/1699947376437.png", "/file");
// System.out.println(b);
String subAfter = StrUtil.subAfter("http://192.168.0.98:11078/file/fileupload/1699947376437.png", "/file", false);
System.out.println(subAfter);
}
} }
\ No newline at end of file
...@@ -72,7 +72,7 @@ public class SkinController extends BaseCRUDJsonBodyMappingController<SkinServic ...@@ -72,7 +72,7 @@ public class SkinController extends BaseCRUDJsonBodyMappingController<SkinServic
//推送皮肤更新消息 //推送皮肤更新消息
DeviceMsgReqPdu deviceMsgReqPdu = new DeviceMsgReqPdu(); DeviceMsgReqPdu deviceMsgReqPdu = new DeviceMsgReqPdu();
deviceMsgReqPdu.setSiteid(entity.getSiteId()); deviceMsgReqPdu.setSiteid(entity.getSiteId());
deviceMsgReqPdu.setProductCode("tdj"); deviceMsgReqPdu.setProductCode("ybj");
deviceMsgReqPdu.setMessageType("edition"); deviceMsgReqPdu.setMessageType("edition");
deviceMsgReqPdu.setData("W10="); deviceMsgReqPdu.setData("W10=");
deviceMsgReqPdu.setTimestamp(System.currentTimeMillis()); deviceMsgReqPdu.setTimestamp(System.currentTimeMillis());
......
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