Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/information/controller/InformationController.java

@@ -28,16 +28,22 @@
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
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.support.Kv;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.excel.InforExcel;
import org.springblade.modules.information.excel.InforImporter;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.Valid;
import java.io.File;
@@ -101,6 +107,18 @@
      return R.data(pages);
   }


   /**
    * 培训公司信息查询
    */
   @GetMapping("/security-page")
   public R<IPage<InformationVO>> securityPage(InformationVO information, Query query) {
      IPage<InformationVO> pages = informationService.securityPage(Condition.getPage(query), information);
      return R.data(pages);
   }



   /**
    * 新增
    */
@@ -145,6 +163,15 @@
         dept.setAncestors("0,1420222961377357825");
         dept.setDeptCategory(1);
      }
      //跨区域保安公司
      if (information.getStats().equals("4")) {
         Long i = 1425366663452196865L;
         dept.setParentId(i);
         dept.setTenantId("000000");
         dept.setDeptName(information.getEnterprisename());
         dept.setAncestors("0,1425366663452196865");
         dept.setDeptCategory(1);
      }
      if (iDeptService.submit(dept)) {
         CacheUtil.clear(SYS_CACHE);
         // 返回懒加载树更新节点所需字段
@@ -154,7 +181,7 @@
         information.setDepartmentid(id);
      }
      String json=JSON.toJSONString(information);
      com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
      //com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
      //arg.test01(arg.url + "/information/save", information);
      return R.status(informationService.save(information));
   }
@@ -263,14 +290,26 @@
      return R.data(list);
   }

   public static void main(String[] args) {
      Information information = new Information();
      information.setAddress("2");
      information.setDepartmentid("123");
      String json=JSON.toJSONString(information);//关键
      com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
      System.out.println("生成文件完成！");
   /**
    * 导入单位信息
    */
   @PostMapping("import-informaton")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入单位", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      InforImporter inforImporter = new InforImporter(informationService, false);
      ExcelUtil.save(file, inforImporter, InforExcel.class);
      return R.success("操作成功");
   }

//   public static void main(String[] args) {
//      Information information = new Information();
//      information.setAddress("2");
//      information.setDepartmentid("123");
//      String json=JSON.toJSONString(information);//关键
//      com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
//      System.out.println("生成文件完成！");
//   }


}