jiequan.bi 4 лет назад
Родитель
Сommit
359407aad5

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/adlab/controller/CreateAdlabController.java

@@ -199,7 +199,7 @@ public class CreateAdlabController {
                     repoTemp.put("code",0);
                     repoTemp.put("accountId",convert2Map.get("accountId"));
                     repoTemp.put("groupId",repo.getJSONObject("data").getLong("group_id"));
-                    repoTemp.put("userId",repo.getString("userId"));
+                    repoTemp.put("userId",convert2Map.get("userId"));
                 }else{
                     repoTemp.put("code",500);
                     repoTemp.put("message",repo.getString("message"));

+ 127 - 123
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/adlab/controller/CtopAdlabProjectDetailController.java

@@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
- /**
+/**
  * 投放管家项目详情
  */
 @Slf4j
@@ -31,134 +31,138 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/adlab/ctopAdlabProjectDetail")
 public class CtopAdlabProjectDetailController {
 
-	@Autowired
-	private ICtopAdlabProjectDetailService ctopAdlabProjectDetailService;
+    @Autowired
+    private ICtopAdlabProjectDetailService ctopAdlabProjectDetailService;
 
-	@Autowired
-	private IUpdateProjectService updateProjectService;
+    @Autowired
+    private IUpdateProjectService updateProjectService;
 
-	@Autowired
-	private ICtopOauthTokenService oauthTokenService;
+    @Autowired
+    private ICtopOauthTokenService oauthTokenService;
 
-	/**
-	  * 分页列表查询
-	 */
-	@PostMapping(value = "/list")
-	public Result<IPage<CtopAdlabProjectDetail>> queryPageList(@RequestBody JSONObject requestBody,
-															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-															   HttpServletRequest req) {
-		Result<IPage<CtopAdlabProjectDetail>> result = new Result<>();
-		QueryWrapper<CtopAdlabProjectDetail> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("user_id",requestBody.getString("userId"));
-		if(!requestBody.getString("name").isEmpty()){
-			queryWrapper.eq("name",requestBody.getString("name"));
-		}
-		if(!requestBody.getJSONArray("accountIds").isEmpty()){
-			queryWrapper.in("account_id",requestBody.getJSONArray("accountIds"));
-		}
-		if(requestBody.getInteger("optStatus")!=0){
-			queryWrapper.eq("opt_status",requestBody.getInteger("optStatus"));
-		}
-		if(!requestBody.getJSONArray("createTime").isEmpty()){
-			queryWrapper.ge("create_time",requestBody.getJSONArray("createTime").get(0));
-			queryWrapper.ne("create_time",requestBody.getJSONArray("createTime").get(1));
-		}
-		Page<CtopAdlabProjectDetail> page = new Page<>(pageNo, pageSize);
-		IPage<CtopAdlabProjectDetail> pageList = ctopAdlabProjectDetailService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
+    /**
+     * 分页列表查询
+     */
+    @PostMapping(value = "/list")
+    public Result<IPage<CtopAdlabProjectDetail>> queryPageList(@RequestBody JSONObject requestBody,
+                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               HttpServletRequest req) {
+        Result<IPage<CtopAdlabProjectDetail>> result = new Result<>();
+        QueryWrapper<CtopAdlabProjectDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", requestBody.getString("userId"));
+        if (!requestBody.getString("name").isEmpty()) {
+            queryWrapper.eq("name", requestBody.getString("name"));
+        }
+        if (!requestBody.getJSONArray("accountIds").isEmpty()) {
+            queryWrapper.in("account_id", requestBody.getJSONArray("accountIds"));
+        }
+        if (requestBody.getInteger("optStatus") != 0) {
+            queryWrapper.eq("opt_status", requestBody.getInteger("optStatus"));
+        }
+        if (!requestBody.getJSONArray("createTime").isEmpty()) {
+            queryWrapper.ge("create_time", requestBody.getJSONArray("createTime").get(0));
+            queryWrapper.ne("create_time", requestBody.getJSONArray("createTime").get(1));
+        }
+        Page<CtopAdlabProjectDetail> page = new Page<>(pageNo, pageSize);
+        IPage<CtopAdlabProjectDetail> pageList = ctopAdlabProjectDetailService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
 
-	/**
-	  *   添加
-	 */
-	@PostMapping(value = "/add")
-	public Result<CtopAdlabProjectDetail> add(@RequestBody CtopAdlabProjectDetail ctopAdlabProjectDetail) {
-		Result<CtopAdlabProjectDetail> result = new Result<>();
-		try {
-			ctopAdlabProjectDetailService.save(ctopAdlabProjectDetail);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
+    /**
+     * 添加
+     */
+    @PostMapping(value = "/add")
+    public Result<CtopAdlabProjectDetail> add(@RequestBody CtopAdlabProjectDetail ctopAdlabProjectDetail) {
+        Result<CtopAdlabProjectDetail> result = new Result<>();
+        try {
+            ctopAdlabProjectDetailService.save(ctopAdlabProjectDetail);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
 
-	/**
-	  *  编辑
-	 */
-	@PostMapping(value = "/edit")
-	public Result<CtopAdlabProjectDetail> edit(@RequestBody JSONArray requestBody) {
-		Result<CtopAdlabProjectDetail> result = new Result<>();
-		if(requestBody.isEmpty()){
-			result.error500("请选择数据");
-		}else {
-			CtopAdlabProjectDetail ctopAdlabProjectDetail=new CtopAdlabProjectDetail();
-			ctopAdlabProjectDetail.setOptStatus((String) ((Map)requestBody.get(0)).get("optStatus"));
-			requestBody.forEach(it->{
-				Map<String,Object> temp= (Map<String,Object>)it;
-				//先更新头条后台数据
-				JSONObject repo = updateProjectService.updateGroupStatus(oauthTokenService.getTokenByAccountId((Long) temp.get("accountId")), temp);
-				List<JSONObject> params=new ArrayList<>();
-				JSONObject  jsonObject=new JSONObject();
-				jsonObject.put("accountId",temp.get("accountId"));
-				jsonObject.put("groupId",temp.get("groupId"));
-				jsonObject.put("userId",temp.get("userId"));
-				params.add(jsonObject);
-				if(repo.getInteger("code")==0){
-					ctopAdlabProjectDetailService.putStorage(params);
-				}else {
-					result.error500(repo.getString("message"));
-				}
-			});
-		}
-		return result;
-	}
+    /**
+     * 编辑
+     */
+    @PostMapping(value = "/edit")
+    public Result<CtopAdlabProjectDetail> edit(@RequestBody JSONArray requestBody) {
+        Result<CtopAdlabProjectDetail> result = new Result<>();
+        if (requestBody.isEmpty()) {
+            result.error500("请选择数据");
+        } else {
+            CtopAdlabProjectDetail ctopAdlabProjectDetail = new CtopAdlabProjectDetail();
+            ctopAdlabProjectDetail.setOptStatus((String) ((Map) requestBody.get(0)).get("optStatus"));
+            requestBody.forEach(it -> {
+                Map<String, Object> temp = (Map<String, Object>) it;
+                //先更新头条后台数据
+                JSONObject repo = updateProjectService.updateGroupStatus(oauthTokenService.getTokenByAccountId((Long) temp.get("accountId")), temp);
+                List<JSONObject> params = new ArrayList<>();
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("accountId", temp.get("accountId"));
+                jsonObject.put("groupId", temp.get("groupId"));
+                jsonObject.put("userId", temp.get("userId"));
+                params.add(jsonObject);
+                if (repo.getInteger("code") == 0) {
+                    if (((Map<String, Object>) it).get("optStatus").equals("DELETED")) {
+                    	ctopAdlabProjectDetailService.removeById((Long) temp.get("groupId"));
+                    } else {
+                        ctopAdlabProjectDetailService.putStorage(params);
+                    }
+                } else {
+                    result.error500(repo.getString("message"));
+                }
+            });
+        }
+        return result;
+    }
 
-	/**
-	  *   通过id删除
-	 */
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			ctopAdlabProjectDetailService.removeById(id);
-		} catch (Exception e) {
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
+    /**
+     * 通过id删除
+     */
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            ctopAdlabProjectDetailService.removeById(id);
+        } catch (Exception e) {
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
 
-	/**
-	  *  批量删除
-	 */
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<CtopAdlabProjectDetail> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<CtopAdlabProjectDetail> result = new Result<>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.ctopAdlabProjectDetailService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
+    /**
+     * 批量删除
+     */
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<CtopAdlabProjectDetail> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<CtopAdlabProjectDetail> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.ctopAdlabProjectDetailService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
 
-	/**
-	  * 通过id查询
-	 */
-	@GetMapping(value = "/queryById")
-	public Result<CtopAdlabProjectDetail> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<CtopAdlabProjectDetail> result = new Result<>();
-		CtopAdlabProjectDetail ctopAdlabProjectDetail = ctopAdlabProjectDetailService.getById(id);
-		if(ctopAdlabProjectDetail==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(ctopAdlabProjectDetail);
-			result.setSuccess(true);
-		}
-		return result;
-	}
+    /**
+     * 通过id查询
+     */
+    @GetMapping(value = "/queryById")
+    public Result<CtopAdlabProjectDetail> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<CtopAdlabProjectDetail> result = new Result<>();
+        CtopAdlabProjectDetail ctopAdlabProjectDetail = ctopAdlabProjectDetailService.getById(id);
+        if (ctopAdlabProjectDetail == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(ctopAdlabProjectDetail);
+            result.setSuccess(true);
+        }
+        return result;
+    }
 }

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/controller/ParseInstallPackageController.java

@@ -31,7 +31,7 @@ public class ParseInstallPackageController {
         Result<Map<String, String>> result = new Result<>();
         //在此不需要判断安装包类型拼接后缀
         //String installPath="C:\\Users\\Arc\\Desktop\\install"+System.currentTimeMillis();
-        String installPath="\\data\\webpackage\\install"+System.currentTimeMillis();
+        String installPath="/data/webpackage/install"+System.currentTimeMillis();
         byte[] bytes = restTemplate.postForObject(installUrl, null, byte[].class);
         if (null == bytes || bytes.length == 0) {
             result.error500("请输入正确的下载链接");