应急资源带应急物资的搜索

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/DutyReportController.java

@@ -1,31 +1,38 @@
 package com.ruoyi.web.controller.zhdd;
 
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.GatewayUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zhdd.domain.vo.DutyReportVo;
 import com.ruoyi.zhdd.domain.bo.DutyReportBo;
+import com.ruoyi.zhdd.domain.vo.DutyReportVo;
 import com.ruoyi.zhdd.service.IDutyReportService;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 值班报告信息Controller
@@ -71,7 +78,7 @@ public class DutyReportController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:query')")
     @GetMapping("/{id}")
     public AjaxResult<DutyReportVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") String id) {
+                                            @PathVariable("id") String id) {
         return AjaxResult.success(iDutyReportService.queryById(id));
     }
 
@@ -84,6 +91,10 @@ public class DutyReportController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody DutyReportBo bo) {
+        GatewayUser user = getGateWayUser();
+        if (user != null) {
+            bo.setCreateBy(user.getUsername());
+        }
         return toAjax(iDutyReportService.insertByBo(bo) ? 1 : 0);
     }
 
@@ -104,10 +115,10 @@ public class DutyReportController extends BaseController {
      */
     @ApiOperation("删除值班报告信息")
 //    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:remove')")
-    @Log(title = "值班报告信息" , businessType = BusinessType.DELETE)
+    @Log(title = "值班报告信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable String[] ids) {
+                                   @PathVariable String[] ids) {
         return toAjax(iDutyReportService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceController.java

@@ -1,19 +1,23 @@
 package com.ruoyi.web.controller.zhdd;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.GatewayUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zhdd.domain.ResourceDetail;
 import com.ruoyi.zhdd.domain.bo.ResourceBo;
 import com.ruoyi.zhdd.domain.vo.ResourceVo;
+import com.ruoyi.zhdd.service.IResourceDetailService;
 import com.ruoyi.zhdd.service.IResourceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +38,7 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +58,7 @@ import java.util.stream.Collectors;
 public class ResourceController extends BaseController {
 
     private final IResourceService iResourceService;
+    private final IResourceDetailService iResourceDetailService;
 
     /**
      * 查询应急资源列表
@@ -61,7 +67,23 @@ public class ResourceController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:resource:list')")
     @GetMapping("/list")
     public TableDataInfo<ResourceVo> list(@Validated(QueryGroup.class) ResourceBo bo) {
-        GatewayUser user = getGateWayUser();
+        if (bo.getResourceType() != null && bo.getResourceType() == 1 && StrUtil.isNotBlank(bo.getGoodsName())) {
+            // 模糊查询有哪些仓库存在此物资
+            List<Object> objects = iResourceDetailService.listObjs(new QueryWrapper<ResourceDetail>()
+                .select("distinct resource_id")
+                .like("name", bo.getGoodsName()));
+            if (objects != null && objects.size() > 0) {
+                bo.setResourceIds(objects);
+            } else {
+                TableDataInfo<ResourceVo> rspData = new TableDataInfo<>();
+                rspData.setCode(HttpStatus.HTTP_OK);
+                rspData.setMsg("查询成功");
+                rspData.setRows(Collections.emptyList());
+                rspData.setTotal(0);
+                return rspData;
+            }
+        }
+//        GatewayUser user = getGateWayUser();
         return iResourceService.queryPageList(bo);
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -37,8 +37,6 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
             authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
             SecurityContextHolder.getContext().setAuthentication(authenticationToken);
         }
-//        response.addHeader("Access-Control-Allow-Origin", "*");
-//        response.addHeader("Access-Control-Allow-Headers", "*");
         chain.doFilter(request, response);
     }
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/ResourceBo.java

@@ -1,18 +1,17 @@
 package com.ruoyi.zhdd.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
-import java.util.Date;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
-import com.ruoyi.common.core.domain.BaseEntity;
-
 /**
  * 应急资源业务对象 b_resource
  *
@@ -29,25 +28,25 @@ public class ResourceBo extends BaseEntity {
      * $column.columnComment
      */
     @ApiModelProperty(value = "$column.columnComment")
-    @NotBlank(message = "id不能为空", groups = { EditGroup.class })
+    @NotBlank(message = "id不能为空", groups = {EditGroup.class})
     private String id;
 
     /**
      * 资源类型。1-仓库。2-队伍.3-车辆
      */
     @ApiModelProperty(value = "资源类型。1-仓库。2-队伍.3-车辆")
-    @NotNull(message = "resourceType不能为空", groups = { AddGroup.class })
+    @NotNull(message = "resourceType不能为空", groups = {AddGroup.class})
     private Integer resourceType;
 
     @ApiModelProperty(value = "位置类型")
-    @NotBlank(message = "locationType不能为空", groups = { AddGroup.class })
+    @NotBlank(message = "locationType不能为空", groups = {AddGroup.class})
     private String locationType;
 
     /**
      * 名称
      */
     @ApiModelProperty(value = "名称")
-    @NotBlank(message = "name不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "name不能为空", groups = {AddGroup.class, EditGroup.class})
     private String name;
 
     /**
@@ -72,7 +71,7 @@ public class ResourceBo extends BaseEntity {
      * 管理单位
      */
     @ApiModelProperty(value = "管理单位")
-    @NotBlank(message = "manageUnit不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "manageUnit不能为空", groups = {AddGroup.class, EditGroup.class})
     private String manageUnit;
 
     /**
@@ -91,7 +90,7 @@ public class ResourceBo extends BaseEntity {
      * 联系人
      */
     @ApiModelProperty(value = "联系人")
-    @NotBlank(message = "contactName不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "contactName不能为空", groups = {AddGroup.class, EditGroup.class})
     private String contactName;
 
     private String carType;
@@ -100,7 +99,7 @@ public class ResourceBo extends BaseEntity {
      * 联系电话
      */
     @ApiModelProperty(value = "联系电话")
-    @NotBlank(message = "contactPhone不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "contactPhone不能为空", groups = {AddGroup.class, EditGroup.class})
     private String contactPhone;
 
     /**
@@ -136,4 +135,10 @@ public class ResourceBo extends BaseEntity {
 
     private List<ResourceDetailBo> resourceDetailList;
 
+    /**
+     * 应急仓库中应急物资名称
+     */
+    private String goodsName;
+
+    private List<Object> resourceIds;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zhdd.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -73,6 +74,7 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
         lqw.eq(StringUtils.isNotBlank(bo.getCarryGoods()), Resource::getCarryGoods, bo.getCarryGoods());
         lqw.like(StringUtils.isNotBlank(bo.getContactName()), Resource::getContactName, bo.getContactName());
         lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), Resource::getContactPhone, bo.getContactPhone());
+        lqw.in(ObjectUtil.isNotEmpty(bo.getResourceIds()), Resource::getId, bo.getResourceIds());
         return lqw;
     }