push

src/main/java/com/yxproject/start/api/AdminApi.java

@@ -320,6 +320,13 @@ public class AdminApi {
 //        }
 //        return map.toString();
 //    }
+
+    /**
+     * 添加角色
+     * @param jsonStr
+     * @param resp
+     * @return
+     */
     @RequestMapping("roleAdd")
     public Map<String, String> roleAdd(@RequestBody String jsonStr, HttpServletResponse resp) {
         resp.setCharacterEncoding("UTF-8");

src/main/java/com/yxproject/start/api/UserApi.java

@@ -187,7 +187,7 @@ public class UserApi {
      *
      * @return
      */
-    @RequestMapping(value = "/addQuickCyclesheetInfo", method = RequestMethod.GET)
+    @RequestMapping(value = "/addQuickTask", method = RequestMethod.GET)
     @RequiresPermissions("userInfo.add")//权限管理;
     @ResponseBody
     public String addQuickCyclesheetInfo(@RequestParam("id") String id, HttpServletResponse resp) {
@@ -247,7 +247,7 @@ public class UserApi {
      * @return
      */
     @RequestMapping("addFailedinfo")
-    public String addFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) {
+    public String addFailedinfo(@RequestParam("idNo") String id, HttpServletResponse resp) {
         String map = "[{\"failedinfoid\":\"20181016002\",\"failed_Reason\":1,\"groupno\":\"41108201\",\"cyclesheetid\":\"20181016001\"}]";
         JSONArray jsonArray = JSONArray.fromObject(map);
         List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
@@ -268,15 +268,17 @@ public class UserApi {
      * @return
      */
     @RequestMapping("updateFailedinfo")
-    @RequiresPermissions("userInfo.add")//权限管理;
-    public String updateFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) {
-        String map = "[{\"failedinfoid\":\"201810302\",\"failed_Reason\":1,\"groupno\":\"411081\",\"cyclesheetid\":\"20181016001\"}]";
-        JSONArray jsonArray = JSONArray.fromObject(map);
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    public String updateFailedinfo(@RequestParam("failedCardId") String id,@RequestParam("state") String state, HttpServletResponse resp) {
+        FailedCardEntity failedCardEntity = new FailedCardEntity();
+        failedCardEntity.setFailedCardId(Long.valueOf(id));
+        failedCardEntity.setState(Long.valueOf(state));
         List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
-        for (Object object : jsonArray) {
-            FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
-            failedinfoEntityList.add(o);
-        }
+//        for (Object object : jsonArray) {
+////            FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
+//            failedinfoEntityList.add(o);
+//        }
+        failedinfoEntityList.add(failedCardEntity);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         int i = failedCardService.updateFailedinfo(failedinfoEntityList);
@@ -571,7 +573,7 @@ public class UserApi {
      *
      * @return
      */
-    @RequestMapping("reviseStorageCount")
+    @RequestMapping("updateStorageCount")
 //    @RequiresPermissions("userInfo.add")//权限管理;
     public String reviseStorageCount(@RequestParam("taskId") String taskId,@RequestParam("countyCode") String countyCode,@RequestParam("inStorageCount") String inStorageCount, @RequestParam("outStorageCount") String outStorageCount, HttpServletResponse resp) {
         int i=countyListService.reviseStorageCount(taskId,countyCode, inStorageCount, outStorageCount);