合并-2

jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java

-package com.junmp.jyzb.controller;
-
-import com.junmp.jyzb.api.bean.req.ProductReq;
-import com.junmp.jyzb.beanReq.CabinetReq;
-import com.junmp.jyzb.doc.CabinetDoc;
-import com.junmp.jyzb.domain.Cabinet;
-import com.junmp.jyzb.domain.PoliceFinger;
-import com.junmp.jyzb.service.CabinetService;
-import com.junmp.v2.common.bean.request.ValidationApi;
-import com.junmp.v2.common.bean.response.ApiRes;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@RestController
-@Slf4j
-@RequestMapping("/Cabinet")
-@Api(tags = "单警柜基础信息模块")
-public class CabinetController111 implements CabinetDoc {
-    @Resource
-    public CabinetService cabinetService;
-
-    @PostMapping("/AddCabinet")
-    @ApiOperation("添加单警柜")
-    public ApiRes<Boolean> addCabinet(@RequestBody @Validated(CabinetReq.add.class) CabinetReq req) throws Exception {
-        return ApiRes.success(cabinetService.addCabinet(req));
-    }
-
-
-    @PostMapping("/DeleteCabinet")
-    @ApiOperation("删除单警柜信息")
-    public ApiRes<Boolean> deleteCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req) throws Exception {
-        return ApiRes.success(cabinetService.deleteCabinet(req));
-    }
-
-    @PostMapping("/ShowCabinet")
-    @ApiOperation("查询单警柜列表")
-    public ApiRes<List<Cabinet>> showCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req,String includeLowerLevel){
-        return ApiRes.success(cabinetService.getAllCabinet(req,includeLowerLevel));
-    }
-
-
-    @PostMapping("/UpdateCabinet")
-    @ApiOperation("修改单警柜信息")
-    public ApiRes<Boolean> updateCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req) throws Exception {
-        return ApiRes.success(cabinetService.updateCabinet(req));
-    }
-
-
-//    @PostMapping("/ErrorState")
-//    @ApiOperation("单警柜状态变更")
-
-
-//   @PostMapping("/GetCabinetDetail")
-//    @ApiOperation("查询单警柜及其箱号信息")
-
-//    @PostMapping("/getCabinetBoxInfo")
-//    @ApiOperation("获取箱门列表")
-}
+//package com.junmp.jyzb.controller;
+//
+//import com.junmp.jyzb.api.bean.req.ProductReq;
+//import com.junmp.jyzb.beanReq.CabinetReq;
+//import com.junmp.jyzb.doc.CabinetDoc;
+//import com.junmp.jyzb.domain.Cabinet;
+//import com.junmp.jyzb.domain.PoliceFinger;
+//import com.junmp.jyzb.service.CabinetService;
+//import com.junmp.v2.common.bean.request.ValidationApi;
+//import com.junmp.v2.common.bean.response.ApiRes;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//import java.util.List;
+//
+//@RestController
+//@Slf4j
+//@RequestMapping("/Cabinet")
+//@Api(tags = "单警柜基础信息模块")
+//public class CabinetController111 implements CabinetDoc {
+//    @Resource
+//    public CabinetService cabinetService;
+//
+//    @PostMapping("/AddCabinet")
+//    @ApiOperation("添加单警柜")
+//    public ApiRes<Boolean> addCabinet(@RequestBody @Validated(CabinetReq.add.class) CabinetReq req) throws Exception {
+//        return ApiRes.success(cabinetService.addCabinet(req));
+//    }
+//
+//
+//    @PostMapping("/DeleteCabinet")
+//    @ApiOperation("删除单警柜信息")
+//    public ApiRes<Boolean> deleteCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req) throws Exception {
+//        return ApiRes.success(cabinetService.deleteCabinet(req));
+//    }
+//
+//    @PostMapping("/ShowCabinet")
+//    @ApiOperation("查询单警柜列表")
+//    public ApiRes<List<Cabinet>> showCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req,String includeLowerLevel){
+//        return ApiRes.success(cabinetService.getAllCabinet(req,includeLowerLevel));
+//    }
+//
+//
+//    @PostMapping("/UpdateCabinet")
+//    @ApiOperation("修改单警柜信息")
+//    public ApiRes<Boolean> updateCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req) throws Exception {
+//        return ApiRes.success(cabinetService.updateCabinet(req));
+//    }
+//
+//
+////    @PostMapping("/ErrorState")
+////    @ApiOperation("单警柜状态变更")
+//
+//
+////   @PostMapping("/GetCabinetDetail")
+////    @ApiOperation("查询单警柜及其箱号信息")
+//
+////    @PostMapping("/getCabinetBoxInfo")
+////    @ApiOperation("获取箱门列表")
+//}

jyzb-biz/src/main/resources/mapper/CabinetMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.junmp.jyzb.mapper.CabinetMapper">
-    <resultMap id="" type="">
+<!--    <resultMap id="" type="">-->
 
-    </resultMap>
+<!--    </resultMap>-->
 
 
   <sql id="Base_Column_List">

jyzb-biz/src/main/resources/mapper/InventoryMapper.xml

@@ -226,15 +226,13 @@ join base_supplier s on s.id = i.supplier_id
   </if>
 and size_id = #{sizeId}
 </select>
-    <select id="getInventoryByOrgId" resultType="java.util.Map" parameterType="java.lang.String">
-        select * from base_inventory where org_id_int = #{orgId}
-    </select>
 
-<select id="getInventoryByOrgId" resultType="Map">
-select
-  *
-from base_inventory i
-where org_id_int =#{orgId}
-</select>
+
+<!--<select id="getInventoryByOrgId" resultType="Map">-->
+<!--select-->
+<!--  *-->
+<!--from base_inventory i-->
+<!--where org_id_int =#{orgId}-->
+<!--</select>-->
 
 </mapper>
\ No newline at end of file