dev
This commit is contained in:
parent
90c4f85851
commit
c6f6509d74
|
|
@ -4,9 +4,13 @@ import com.syjiaer.clinic.server.common.util.DictoryUtil;
|
||||||
import com.syjiaer.clinic.server.common.vo.Page;
|
import com.syjiaer.clinic.server.common.vo.Page;
|
||||||
import com.syjiaer.clinic.server.common.vo.Result;
|
import com.syjiaer.clinic.server.common.vo.Result;
|
||||||
import com.syjiaer.clinic.server.controller.BaseController;
|
import com.syjiaer.clinic.server.controller.BaseController;
|
||||||
|
import com.syjiaer.clinic.server.entity.social.SocialDiagnose;
|
||||||
import com.syjiaer.clinic.server.entity.social.SocialDirectory;
|
import com.syjiaer.clinic.server.entity.social.SocialDirectory;
|
||||||
|
import com.syjiaer.clinic.server.entity.social.SocialItem;
|
||||||
import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
|
import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
|
||||||
|
import com.syjiaer.clinic.server.service.social.SocialDiagnoseService;
|
||||||
import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
|
import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
|
||||||
|
import com.syjiaer.clinic.server.service.social.SocialItemService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
|
@ -30,6 +34,10 @@ public class SocialDirectoryController extends BaseController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private SocialDirectoryService socialDirectoryService;
|
private SocialDirectoryService socialDirectoryService;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
private SocialItemService socialItemService;
|
||||||
|
@Autowired
|
||||||
|
private SocialDiagnoseService socialDiagnoseService;
|
||||||
|
@Autowired
|
||||||
private DictoryUtil dictoryUtil;
|
private DictoryUtil dictoryUtil;
|
||||||
|
|
||||||
@RequestMapping("search")
|
@RequestMapping("search")
|
||||||
|
|
@ -62,6 +70,14 @@ public class SocialDirectoryController extends BaseController {
|
||||||
result =socialDirectoryService.download(ver, type);
|
result =socialDirectoryService.download(ver, type);
|
||||||
return success(result);
|
return success(result);
|
||||||
}
|
}
|
||||||
|
if (type ==1307){
|
||||||
|
result =socialDiagnoseService.download(ver);
|
||||||
|
return success(result);
|
||||||
|
}
|
||||||
|
if (type == 1305 || type == 1321){
|
||||||
|
result =socialItemService.download(ver);
|
||||||
|
return success(result);
|
||||||
|
}
|
||||||
|
|
||||||
return error("参数 type 不正确");
|
return error("参数 type 不正确");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ public class SocialDiagnoseService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private SocialDirectoryVersionService socialDirectoryVersionService;
|
private SocialDirectoryVersionService socialDirectoryVersionService;
|
||||||
|
|
||||||
public String download( String version_name) {
|
public Map<String, Object> download( String version_name) {
|
||||||
List<String[]> tab_list = httpUtil.download(version_name, 1307);
|
List<String[]> tab_list = httpUtil.download(version_name, 1307);
|
||||||
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
|
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
|
||||||
List<SocialDiagnose> list = new ArrayList<>();
|
List<SocialDiagnose> list = new ArrayList<>();
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ public class SocialItemService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private SocialDirectoryVersionService socialDirectoryVersionService;
|
private SocialDirectoryVersionService socialDirectoryVersionService;
|
||||||
|
|
||||||
public String download( String version_name) {
|
public Map<String, Object> download( String version_name) {
|
||||||
List<String[]> tab_list = httpUtil.download(version_name, 1305);
|
List<String[]> tab_list = httpUtil.download(version_name, 1305);
|
||||||
List<SocialItem> list = new ArrayList<>();
|
List<SocialItem> list = new ArrayList<>();
|
||||||
String value = String.valueOf(1305);
|
String value = String.valueOf(1305);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue