入库页面测试

src/main/java/com/th/demo/controller/maint/WareController.java

@@ -6,6 +6,9 @@ import com.th.demo.model.system.ResultJSON;
 import com.th.demo.model.system.Type;
 import com.th.demo.service.maint.WareService;
 import com.th.demo.tools.JSONTools;
+import org.activiti.rest.editor.model.ModelEditorJsonRestResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,6 +23,7 @@ public class WareController {
     @Autowired
     public WareService wareService;
     String result = Type.FAIL;
+    protected static final Logger logger = LoggerFactory.getLogger(ModelEditorJsonRestResource.class);
 
     @RequestMapping(value = "/query.do")//查询方法 前两个参数是分页参数
     public String query(int page,
@@ -98,5 +102,28 @@ public class WareController {
         }
     }
 //
+    @RequestMapping(value = "/queryWare.do")
+    public String queryWare(HttpServletRequest request) {
+        String result = ""; // 初始化结果变量
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+
+            // 参数校验
+            if (userId == null || belongId == null) {
+                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "用户ID或归属ID缺失");
+                return result;
+            }
+            // 调用服务并序列化结果
+
+            result = wareService.queryWare(userId,belongId);
 
+        } catch(Exception ex) { // 捕获业务异常
+            logger.error("业务逻辑异常", ex);
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            logger.info("业务逻辑正常");
+            return result;
+        }
+    }
 }

src/main/java/com/th/demo/mapping/maint/WareMapper.java

@@ -26,4 +26,5 @@ public interface WareMapper {
     Ware selectByWareName(String wareName, String userId, String belongId);
 
     Ware selectByWareId(String wareId, String userId, String belongId);
+    List<Ware> selectWare(String userId, String belongId);
 }

src/main/java/com/th/demo/service/impl/maint/WareServiceImpl.java

@@ -28,9 +28,8 @@ public class WareServiceImpl implements WareService {
     @Override
     public String query(int page, int rows, String query, String userId, String belongId) {
         PageHelper.startPage(page, rows);
-        List<Ware> list = new ArrayList<Ware>();
 
-        list = wareMapper.select(query, belongId);
+        List<Ware> list = wareMapper.select(query, belongId);
 
         PageInfo<Ware> pageInfo = new PageInfo<>(list);
         result = JSONTools.toString(pageInfo);
@@ -85,4 +84,11 @@ public class WareServiceImpl implements WareService {
         result = JSONTools.toString(list);
         return result;
     }
+
+    @Override
+    public String queryWare(String userId, String belongId) {
+        List<Ware> list = wareMapper.selectWare(userId,belongId);
+        result = JSONTools.toString(list);
+        return result;
+    }
 }

src/main/java/com/th/demo/service/maint/WareService.java

@@ -10,4 +10,6 @@ public interface WareService {
     String queryAll(String userId, String belongId);
 
     String queryByUserId(String userId, String belongId);
+    String queryWare(String userId, String belongId);
+
 }

src/main/resource/mapper/maint/WareMapper.xml

@@ -216,4 +216,14 @@ and t.id =   #{param1,jdbcType=VARCHAR}
 and  t.belong_id = #{param3,jdbcType=VARCHAR}
     and ifnull(t.cancel_flag,'0') = '0'
   </select>
+  <select id="selectWare" resultMap="BaseResultMap" >
+    select t.* from t_maint_ware t
+    where t.id in (
+      select  d.ware_id from t_maint_userware d
+       where t.id = d.ware_id
+         and d.user_id = #{param1,jdbcType=VARCHAR}
+    )
+      and  t.belong_id = #{param2,jdbcType=VARCHAR}
+      and ifnull(t.cancel_flag,'0') = '0'
+  </select>
 </mapper>