blame | history | patch | commit | commitdiff | ignore whitespace
Administrator
2021-08-31 08363052cecb30230a2c8b3eba791ca8d1be00a5 
 src/main/java/org/springblade/modules/directive/controller/DirectiveController.java


@@ -4,16 +4,19 @@


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiParam;


import lombok.AllArgsConstructor;


import org.springblade.common.utils.arg;


import org.springblade.core.mp.support.Condition;


import org.springblade.core.mp.support.Query;


import org.springblade.core.tool.api.R;


import org.springblade.core.tool.utils.Func;


import org.springblade.modules.FTP.FtpUtil;


import org.springblade.modules.directive.entity.Directive;


import org.springblade.modules.directive.entity.DirectiveFile;


import org.springblade.modules.directive.service.DirectiveService;


import org.springblade.modules.directive.vo.DirectiveVo;


import org.springframework.web.bind.annotation.*;




import java.text.SimpleDateFormat;


import java.util.Date;




/**


@@ -55,7 +58,7 @@


    * @param directive 指令信息对象


    */


   @PostMapping("/saveDirectiveAndFile")


   public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) {


   public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) throws Exception {


      //新增指令信息


      boolean status = false;


      directive.setSendTime(new Date());


@@ -87,10 +90,12 @@


    * @param directive 指令信息对象


    */


   @PostMapping("/updateDirectiveAndFile")


   public R updateDirectiveAndFile(@RequestBody DirectiveVo directive) {


   public R updateDirectiveAndFile(@RequestBody DirectiveVo directive) throws Exception {


      //新增指令信息


      boolean update = directiveService.updateById(directive);


      boolean status = false;


      //内网新增


      //arg.test01(arg.url+"/directive/updateDirectiveAndFile",directive);


      if (update){


         //先删除图片


         int i = directiveService.deleleByDirectiveId(directive.getId());


@@ -145,6 +150,8 @@


            directiveService.deleleByDirectiveId(Long.parseLong(directiveId));


         }


      }


      //内网删除


      //arg.sendPostRemoveByIds(arg.url+"/directive/remove",ids);


      return R.status(directiveService.removeByIds(Func.toLongList(ids)));


   }