czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"设备规格修改"

Browse Source
This commit is contained in:
hankaikai
2023-05-23 11:38:33 +08:00
parent 374396284d
commit b7793fe1ff
71 changed files with 4142 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
@@ -187,6 +188,7 @@ public class ActivityActivateController extends BaseNoModelController {
@RequestMapping(value = "/saveActivityActivate", method = RequestMethod.POST)
@ResponseBody
public Map<String, Object> saveActivityActivate(ActivityActivate activityActivate) {
Map<String, Object> result = new HashMap<String, Object>(16);
// 通过merchantCode查商户信息
MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();

9
pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java
View File

@@ -6,9 +6,11 @@ import cn.pluss.platform.api.Result;
import cn.pluss.platform.api.ResultGenerator;
import cn.pluss.platform.base.BaseModelController;
import cn.pluss.platform.device.DeviceGoodTagService;
import cn.pluss.platform.device.DeviceSpecService;
import cn.pluss.platform.device.DeviceTypeService;
import cn.pluss.platform.entity.DeviceGoodTag;
import cn.pluss.platform.entity.DeviceGoods;
import cn.pluss.platform.entity.DeviceSpec;
import cn.pluss.platform.entity.DeviceType;
import cn.pluss.platform.util.OssOperatUtil;
import com.alibaba.fastjson.JSONObject;
@@ -20,6 +22,7 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -70,7 +73,8 @@ public class DeviceGoodsController extends BaseModelController<DeviceGoodsServic
return data;
}
@Resource
DeviceSpecService deviceSpecService;
/**
* 数据回显
*/
@@ -82,6 +86,9 @@ public class DeviceGoodsController extends BaseModelController<DeviceGoodsServic
List<DeviceGoodTag> list = deviceGoodTagService.list();
model.addAttribute("deviceGoodTagList", list);
List<DeviceSpec> list1 = deviceSpecService.list();
model.addAttribute("list1", list1);
Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
model.addAttribute("uploadParam",uploadParam);
if (id != null) {

5
pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
View File

@@ -3,7 +3,10 @@ package cn.pluss.platform.controller.home;
import cn.pluss.platform.api.Result;
import cn.pluss.platform.api.ResultGenerator;
import cn.pluss.platform.controller.BaseNoModelController;
import cn.pluss.platform.device.DeviceSpecService;
import cn.pluss.platform.entitiy.ShiroUser;
import cn.pluss.platform.entity.DeviceSpec;
import cn.pluss.platform.entity.DeviceType;
import cn.pluss.platform.entity.MerchantChannelStatus;
import cn.pluss.platform.entity.PlatformData;
import cn.pluss.platform.home.HomeService;
@@ -17,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -166,7 +170,6 @@ public class HomeController extends BaseNoModelController {
result.put("loginName", loginName);
return result;
}
@PostMapping(value = "/getAuditData")
@ResponseBody
public Result<Object> getAuditData() {