Bladeren bron

fix of 下单制2.0 on 2021.1.22

jiequan.bi 4 jaren geleden
bovenliggende
commit
721f4859ab

+ 9 - 38
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformScriptController.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.orderplatform.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -27,19 +29,17 @@ public class PlatformScriptController {
 	/**
 	 * 分页列表查询
 	 */
-	@GetMapping(value = "/list")
-	public Result<IPage<PlatformScript>> queryPageList(PlatformScript platformScript,
-													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-													   HttpServletRequest req) {
-		Result<IPage<PlatformScript>> result = new Result<>();
-		QueryWrapper<PlatformScript> queryWrapper = QueryGenerator.initQueryWrapper(platformScript, req.getParameterMap());
-		Page<PlatformScript> page = new Page<>(pageNo, pageSize);
+/*	@GetMapping(value = "/list")
+	public Result<PageInfo<JSONObject>> queryPageList(PlatformScript platformScript,
+													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													  HttpServletRequest req) {
+		Result<PageInfo<JSONObject>> result = new Result<>();
 		IPage<PlatformScript> pageList = platformScriptService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
-	}
+	}*/
 
 	/**
 	 *   添加
@@ -77,35 +77,6 @@ public class PlatformScriptController {
 	}
 
 	/**
-	 * 通过id删除
-	 */
-	@PostMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			platformScriptService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 */
-	@PostMapping(value = "/deleteBatch")
-	public Result<PlatformScript> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<PlatformScript> result = new Result<>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.platformScriptService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-
-	/**
 	 * 通过id查询
 	 */
 	@GetMapping(value = "/queryById")

+ 2 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformScriptService.java

@@ -1,13 +1,11 @@
 package org.jeecg.modules.orderplatform.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import org.jeecg.modules.orderplatform.entity.PlatformScript;
-import org.json.JSONObject;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 /**
  *  下单平台关联脚本
  */
@@ -15,6 +13,6 @@ public interface IPlatformScriptService extends IService<PlatformScript> {
 
     PlatformScript saveScript(MultipartFile file ,Long projectId);
 
-    PageInfo<JSONObject> page(Long projectId , String name, String creator,int pageNo,int  pageSize);
+    PageInfo<JSONObject> page(Long projectId , String name, String creator, int pageNo, int  pageSize);
 
 }

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformScriptServiceImpl.java

@@ -2,7 +2,10 @@ package org.jeecg.modules.orderplatform.service.impl;
 
 import cn.com.ctop.common.module.utils.CosUtils;
 import cn.com.ctop.common.module.vo.ResFileDTO;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.orderplatform.entity.PlatformScript;
@@ -14,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 下单平台关联脚本
  */
@@ -26,6 +31,9 @@ public class PlatformScriptServiceImpl extends ServiceImpl<PlatformScriptMapper,
     @Autowired
     private IWpsFileWatermarkService wpsFileWatermarkService;
 
+    @Autowired
+    private PlatformScriptMapper platformScriptMapper;
+
     @Override
     public PlatformScript saveScript(MultipartFile file,Long projectId) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -43,4 +51,11 @@ public class PlatformScriptServiceImpl extends ServiceImpl<PlatformScriptMapper,
         return script;
 
     }
+
+    @Override
+    public PageInfo<JSONObject> page(Long projectId, String name, String creator, int pageNo, int  pageSize) {
+        /*PageHelper.startPage(pageNo,pageSize);
+        List<JSONObject> result = platformScriptMapper.pageQuery();*/
+        return null;
+    }
 }