解决冲突

bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java

+package com.bsoft.api.controller;
+
+import com.bsoft.api.common.annotations.Token;
+//import com.bsoft.api.model.SerDisease;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "疾病信息Api")
+@RestController
+public class SerDiseaseController {
+
+    /**
+     * 根据pageId查询板块数值
+     * @return
+     * @throws Exception
+     */
+//    @GetMapping("disease")
+//    @Token
+//    @ApiOperation("根据条件查询疾病信息")
+//    public  Object getBlockValuesByPageID(@RequestBody SerDisease blockValues) throws InterruptedException {
+//        return null;
+//    }
+}

bsoft-api/src/main/java/com/bsoft/api/controller/TestController.java

+package com.bsoft.api.controller;
+
+import com.bsoft.api.service.TestService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Future;
+
+@ApiIgnore
+@RestController
+public class TestController {
+
+
+    @Resource
+    TestService testServiceImpl;
+    @GetMapping("test")
+    public Object test() throws InterruptedException {
+//        List<Future<String>> list = new ArrayList<>();
+//        for(int i = 0; i<4;i++){
+//            Future<String> future = testServiceImpl.test(String.valueOf(i));
+//            list.add(future);
+//        }
+testServiceImpl.test(1);
+
+        return 1;
+    }
+}

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseDocRsMapper.java

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerDiseaseDocRs;
+
+import java.util.List;
+
+public interface SerDiseaseDocRsMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SerDiseaseDocRs record);
+
+    SerDiseaseDocRs selectByPrimaryKey(Long id);
+
+    List<SerDiseaseDocRs> selectAll();
+
+    int updateByPrimaryKey(SerDiseaseDocRs record);
+}

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseMapper.java

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerDisease;
+
+import java.util.List;
+
+public interface SerDiseaseMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SerDisease record);
+
+    SerDisease selectByPrimaryKey(Long id);
+
+    List<SerDisease> selectAll();
+
+    int updateByPrimaryKey(SerDisease record);
+
+}