Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWeightController.java

@@ -21,7 +21,10 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.text.DecimalFormat;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -116,7 +119,7 @@ public class IdxBizFanWeightController extends BaseController {
 
 
     @Transactional
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<IdxBizFanWeight> update(@RequestBody List<IdxBizFanWeight> list) {
@@ -159,14 +162,18 @@ public class IdxBizFanWeightController extends BaseController {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping (value = "/list")
     @ApiOperation(httpMethod = "get", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<List<IdxBizFanWeight>> list(@RequestBody List<String> list) {
-
+    public ResponseModel<Map<String,Object>> list( String ids
+    ) {
+        List<String> list= Arrays.asList(ids.split(","));
         LambdaQueryWrapper<IdxBizFanWeight> qu=new LambdaQueryWrapper<>();
         qu.in(!list.isEmpty(),IdxBizFanWeight::getSequenceNbr,list);
         List<IdxBizFanWeight> listdata = idxBizFanWeightMapper.selectList(qu);
-        return ResponseHelper.buildResponse(listdata);
+        Map<String,Object> data=new HashMap<>();
+
+        data.put("data",listdata);
+        return ResponseHelper.buildResponse(data);
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWeightController.java

@@ -23,7 +23,10 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.text.DecimalFormat;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -167,14 +170,18 @@ public class IdxBizPvWeightController extends BaseController {
         }
         return ResponseHelper.buildResponse(null);
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping (value = "/list")
     @ApiOperation(httpMethod = "get", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<List<IdxBizPvWeight>> list(@RequestBody List<String> list) {
-
+    public ResponseModel<Map<String,Object>> list( String ids
+    ) {
+        List<String> list= Arrays.asList(ids.split(","));
         LambdaQueryWrapper<IdxBizPvWeight> qu=new LambdaQueryWrapper<>();
         qu.in(!list.isEmpty(),IdxBizPvWeight::getSequenceNbr,list);
         List<IdxBizPvWeight> listdata = idxBizPvWeightMapper.selectList(qu);
-        return ResponseHelper.buildResponse(listdata);
+        Map<String,Object> data=new HashMap<>();
+
+        data.put("data",listdata);
+        return ResponseHelper.buildResponse(data);
     }
 }