|
@@ -1,6 +1,11 @@
|
|
package com.sky.ioc.service.information.impl;
|
|
package com.sky.ioc.service.information.impl;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.sky.ioc.entity.domain.information.FloorConfiguration;
|
|
import com.sky.ioc.entity.domain.information.FloorConfiguration;
|
|
|
|
+import com.sky.ioc.entity.domain.information.FloorConfigurationHistory;
|
|
|
|
+import com.sky.ioc.mapper.information.FloorConfigurationHistoryMapper;
|
|
import com.sky.ioc.mapper.information.FloorConfigurationMapper;
|
|
import com.sky.ioc.mapper.information.FloorConfigurationMapper;
|
|
import com.sky.ioc.service.information.FloorConfigurationService;
|
|
import com.sky.ioc.service.information.FloorConfigurationService;
|
|
import com.sky.ioc.tool.ReturnMsg;
|
|
import com.sky.ioc.tool.ReturnMsg;
|
|
@@ -8,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@@ -16,6 +22,9 @@ public class FloorConfigurationServiceImpl implements FloorConfigurationService
|
|
@Autowired
|
|
@Autowired
|
|
FloorConfigurationMapper floorConfigurationMapper;
|
|
FloorConfigurationMapper floorConfigurationMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ FloorConfigurationHistoryMapper floorConfigurationHistoryMapper;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public ReturnMsg getById(Integer id) {
|
|
public ReturnMsg getById(Integer id) {
|
|
FloorConfiguration floorConfiguration = floorConfigurationMapper.selectById(id);
|
|
FloorConfiguration floorConfiguration = floorConfigurationMapper.selectById(id);
|
|
@@ -30,7 +39,14 @@ public class FloorConfigurationServiceImpl implements FloorConfigurationService
|
|
@Override
|
|
@Override
|
|
public ReturnMsg add(FloorConfiguration floorConfiguration) {
|
|
public ReturnMsg add(FloorConfiguration floorConfiguration) {
|
|
if(StringUtils.isNotBlank(floorConfiguration.getName())){
|
|
if(StringUtils.isNotBlank(floorConfiguration.getName())){
|
|
- return ReturnMsg.ok(floorConfigurationMapper.insert(floorConfiguration));
|
|
|
|
|
|
+ floorConfigurationMapper.insert(floorConfiguration);
|
|
|
|
+ //添加历史记录
|
|
|
|
+ FloorConfigurationHistory floorConfigurationHistory = new FloorConfigurationHistory();
|
|
|
|
+ floorConfigurationHistory.setFloor_configuration(floorConfiguration.getId()+"");
|
|
|
|
+ String res = "[{'time': "+new Date() +", 'url': "+floorConfiguration.getAttachment()+", 'account': }]";
|
|
|
|
+ floorConfigurationHistory.setUrl(res);
|
|
|
|
+ floorConfigurationHistoryMapper.insert(floorConfigurationHistory);
|
|
|
|
+ return ReturnMsg.ok();
|
|
}else{
|
|
}else{
|
|
return ReturnMsg.fail("配置名不能为空");
|
|
return ReturnMsg.fail("配置名不能为空");
|
|
}
|
|
}
|
|
@@ -39,7 +55,19 @@ public class FloorConfigurationServiceImpl implements FloorConfigurationService
|
|
@Override
|
|
@Override
|
|
public ReturnMsg edit(FloorConfiguration floorConfiguration) {
|
|
public ReturnMsg edit(FloorConfiguration floorConfiguration) {
|
|
if(StringUtils.isNotBlank(floorConfiguration.getName())){
|
|
if(StringUtils.isNotBlank(floorConfiguration.getName())){
|
|
- return ReturnMsg.ok(floorConfigurationMapper.updateById(floorConfiguration));
|
|
|
|
|
|
+ floorConfigurationMapper.updateById(floorConfiguration);
|
|
|
|
+ //添加历史记录
|
|
|
|
+ FloorConfigurationHistory floorConfigurationHistory = floorConfigurationHistoryMapper
|
|
|
|
+ .selectOne(new LambdaQueryWrapper<FloorConfigurationHistory>().eq(FloorConfigurationHistory::getFloor_configuration,floorConfiguration.getId()));
|
|
|
|
+ String url = floorConfigurationHistory.getUrl();
|
|
|
|
+ JSONArray array = JSONArray.parseArray(url);
|
|
|
|
+ JSONObject json = new JSONObject();
|
|
|
|
+ json.put("time",new Date()+"");
|
|
|
|
+ json.put("url",floorConfiguration.getAttachment());
|
|
|
|
+ json.put("account",floorConfiguration.getAccount());
|
|
|
|
+ array.add(json);
|
|
|
|
+ floorConfigurationHistory.setUrl(array.toJSONString());
|
|
|
|
+ return ReturnMsg.ok();
|
|
}else{
|
|
}else{
|
|
return ReturnMsg.fail("配置名不能为空");
|
|
return ReturnMsg.fail("配置名不能为空");
|
|
}
|
|
}
|