1

label-platform/src/main/java/com/viontech/label/platform/controller/web/ReidController.java

@@ -99,7 +99,7 @@ public class ReidController {
      * @param packId     图包id
      * @param packId     图包id
      */
      */
     @GetMapping("/mergeTo")
     @GetMapping("/mergeTo")
-    public Object mergeTo(@RequestParam Long[] picIdArr, @RequestParam String personUnid, @RequestParam String currentPerson, @RequestParam Long packId) {
+    public Object mergeTo(@RequestParam Long[] picIdArr, @RequestParam String personUnid, @RequestParam(required = false) String currentPerson, @RequestParam Long packId) {
         if (picIdArr.length <= 0 || personUnid == null) {
         if (picIdArr.length <= 0 || personUnid == null) {
             return JsonMessageUtil.getErrorJsonMsg("参数错误");
             return JsonMessageUtil.getErrorJsonMsg("参数错误");
         }
         }
@@ -118,7 +118,7 @@ public class ReidController {
      * @param packId        图包id
      * @param packId        图包id
      */
      */
     @GetMapping("/mergePerson")
     @GetMapping("/mergePerson")
-    public Object mergePerson(@RequestParam String[] personUnidArr, @RequestParam String currentPerson, @RequestParam Long packId) {
+    public Object mergePerson(@RequestParam String[] personUnidArr, @RequestParam(required = false) String currentPerson, @RequestParam Long packId) {
         if (personUnidArr.length <= 1) {
         if (personUnidArr.length <= 1) {
             return JsonMessageUtil.getSuccessJsonMsg("所选项过少");
             return JsonMessageUtil.getSuccessJsonMsg("所选项过少");
         }
         }
@@ -150,7 +150,7 @@ public class ReidController {
      * @param size     获取相似的人的数量
      * @param size     获取相似的人的数量
      */
      */
     @GetMapping("/getSimilarPerson")
     @GetMapping("/getSimilarPerson")
-    public Object getSimilarPerson(@RequestParam Long[] picIdArr, @RequestParam Long packId, @RequestParam Long size, @RequestParam Integer timeInterval) {
+    public Object getSimilarPerson(@RequestParam Long[] picIdArr, @RequestParam Long packId, @RequestParam Long size, @RequestParam(required = false) Integer timeInterval) {
         Map<String, List<Pic>> similarPerson = reidService.getSimilarPerson(picIdArr, packId, size,timeInterval);
         Map<String, List<Pic>> similarPerson = reidService.getSimilarPerson(picIdArr, packId, size,timeInterval);
 
 
         return JsonMessageUtil.getSuccessJsonMsg("success", similarPerson);
         return JsonMessageUtil.getSuccessJsonMsg("success", similarPerson);