Browse Source

入库页面测试

石岩 11 months ago
parent
commit
eefa80c480

+ 27
- 0
src/main/java/com/th/demo/controller/maint/WareController.java View File

6
 import com.th.demo.model.system.Type;
6
 import com.th.demo.model.system.Type;
7
 import com.th.demo.service.maint.WareService;
7
 import com.th.demo.service.maint.WareService;
8
 import com.th.demo.tools.JSONTools;
8
 import com.th.demo.tools.JSONTools;
9
+import org.activiti.rest.editor.model.ModelEditorJsonRestResource;
10
+import org.slf4j.Logger;
11
+import org.slf4j.LoggerFactory;
9
 import org.springframework.beans.factory.annotation.Autowired;
12
 import org.springframework.beans.factory.annotation.Autowired;
10
 import org.springframework.web.bind.annotation.RequestMapping;
13
 import org.springframework.web.bind.annotation.RequestMapping;
11
 import org.springframework.web.bind.annotation.RequestMethod;
14
 import org.springframework.web.bind.annotation.RequestMethod;
20
     @Autowired
23
     @Autowired
21
     public WareService wareService;
24
     public WareService wareService;
22
     String result = Type.FAIL;
25
     String result = Type.FAIL;
26
+    protected static final Logger logger = LoggerFactory.getLogger(ModelEditorJsonRestResource.class);
23
 
27
 
24
     @RequestMapping(value = "/query.do")//查询方法 前两个参数是分页参数
28
     @RequestMapping(value = "/query.do")//查询方法 前两个参数是分页参数
25
     public String query(int page,
29
     public String query(int page,
98
         }
102
         }
99
     }
103
     }
100
 //
104
 //
105
+    @RequestMapping(value = "/queryWare.do")
106
+    public String queryWare(HttpServletRequest request) {
107
+        String result = ""; // 初始化结果变量
108
+        try {
109
+            String userId = (String) request.getAttribute("userId");
110
+            String belongId = (String) request.getAttribute("belongId");
111
+
112
+            // 参数校验
113
+            if (userId == null || belongId == null) {
114
+                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "用户ID或归属ID缺失");
115
+                return result;
116
+            }
117
+            // 调用服务并序列化结果
118
+
119
+            result = wareService.queryWare(userId,belongId);
101
 
120
 
121
+        } catch(Exception ex) { // 捕获业务异常
122
+            logger.error("业务逻辑异常", ex);
123
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
124
+        } finally {
125
+            logger.info("业务逻辑正常");
126
+            return result;
127
+        }
128
+    }
102
 }
129
 }

+ 1
- 0
src/main/java/com/th/demo/mapping/maint/WareMapper.java View File

26
     Ware selectByWareName(String wareName, String userId, String belongId);
26
     Ware selectByWareName(String wareName, String userId, String belongId);
27
 
27
 
28
     Ware selectByWareId(String wareId, String userId, String belongId);
28
     Ware selectByWareId(String wareId, String userId, String belongId);
29
+    List<Ware> selectWare(String userId, String belongId);
29
 }
30
 }

+ 8
- 2
src/main/java/com/th/demo/service/impl/maint/WareServiceImpl.java View File

28
     @Override
28
     @Override
29
     public String query(int page, int rows, String query, String userId, String belongId) {
29
     public String query(int page, int rows, String query, String userId, String belongId) {
30
         PageHelper.startPage(page, rows);
30
         PageHelper.startPage(page, rows);
31
-        List<Ware> list = new ArrayList<Ware>();
32
 
31
 
33
-        list = wareMapper.select(query, belongId);
32
+        List<Ware> list = wareMapper.select(query, belongId);
34
 
33
 
35
         PageInfo<Ware> pageInfo = new PageInfo<>(list);
34
         PageInfo<Ware> pageInfo = new PageInfo<>(list);
36
         result = JSONTools.toString(pageInfo);
35
         result = JSONTools.toString(pageInfo);
85
         result = JSONTools.toString(list);
84
         result = JSONTools.toString(list);
86
         return result;
85
         return result;
87
     }
86
     }
87
+
88
+    @Override
89
+    public String queryWare(String userId, String belongId) {
90
+        List<Ware> list = wareMapper.selectWare(userId,belongId);
91
+        result = JSONTools.toString(list);
92
+        return result;
93
+    }
88
 }
94
 }

+ 2
- 0
src/main/java/com/th/demo/service/maint/WareService.java View File

10
     String queryAll(String userId, String belongId);
10
     String queryAll(String userId, String belongId);
11
 
11
 
12
     String queryByUserId(String userId, String belongId);
12
     String queryByUserId(String userId, String belongId);
13
+    String queryWare(String userId, String belongId);
14
+
13
 }
15
 }

+ 10
- 0
src/main/resource/mapper/maint/WareMapper.xml View File

216
 and  t.belong_id = #{param3,jdbcType=VARCHAR}
216
 and  t.belong_id = #{param3,jdbcType=VARCHAR}
217
     and ifnull(t.cancel_flag,'0') = '0'
217
     and ifnull(t.cancel_flag,'0') = '0'
218
   </select>
218
   </select>
219
+  <select id="selectWare" resultMap="BaseResultMap" >
220
+    select t.* from t_maint_ware t
221
+    where t.id in (
222
+      select  d.ware_id from t_maint_userware d
223
+       where t.id = d.ware_id
224
+         and d.user_id = #{param1,jdbcType=VARCHAR}
225
+    )
226
+      and  t.belong_id = #{param2,jdbcType=VARCHAR}
227
+      and ifnull(t.cancel_flag,'0') = '0'
228
+  </select>
219
 </mapper>
229
 </mapper>

Loading…
Cancel
Save