南昌市物联网技防平台-后台
zengh
2021-03-10 fa9ffa9012d7b1df7692bb99e71be6592f48cd4b
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
@@ -25,20 +25,20 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.jfpt.catalog.entitly.catalog;
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.catalog.vo.catalogVO;
import org.springblade.system.vo.DeptVO;
import org.springframework.web.bind.annotation.*;
import org.springblade.jfpt.catalog.wrapper.catalogWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;
/**
 *  控制器
@@ -226,8 +226,34 @@
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      List<Map<String, Object>> list = catalogService.selectWar();
      return R.data(list);
      SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
      List<Map<String, Object>> listc = new ArrayList<>();
      String[] str={"内部","周边","挟持","救护","旁路","火警","紧急","出入","防拆"};
      Map<String, Object> map = new HashMap<String, Object>();
      String endTime = df.format(new Date());// new Date()为获取当前系统时间
      String beginTime = getPastDate(7);
      List<Map<String, Object>> list = catalogService.selectWar(beginTime,endTime);
      map.put("lists",list);
      map.put("type",str);
      listc.add(map);
      return R.data(listc);
   }
   public static String getPastDate(int past) {
      Calendar calendar = Calendar.getInstance();
      calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
      Date today = calendar.getTime();
      SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
      String result = format.format(today);
      return result;
   }
   /**
    * 懒加载获取部门树形结构
    */
   @GetMapping("/lazy-tree")
   public R<List<catalogVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
      List<catalogVO> tree = catalogService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
      return R.data(tree);
   }
}