bug
This commit is contained in:
@@ -16,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("book/point")
|
||||
@@ -172,14 +171,31 @@ public class PointController {
|
||||
return R.ok().put("points",pointEntities);
|
||||
}
|
||||
|
||||
/**
|
||||
* 时辰取穴
|
||||
* @param map
|
||||
* @return
|
||||
* @throws ParseException
|
||||
*/
|
||||
@RequestMapping("/SCQX")
|
||||
public R SCQX(@RequestBody Map<String,Object> map) throws ParseException {
|
||||
String date = map.get("date").toString();
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat();
|
||||
simpleDateFormat.applyPattern("yyyy-MM-dd hh:mm:ss");
|
||||
Date parse = simpleDateFormat.parse(date);
|
||||
pointService.ZWLZ(parse);
|
||||
|
||||
return null;
|
||||
List<Map<String,Object>> flag = new ArrayList<>();
|
||||
for (int i=0;i<24;i+=2){
|
||||
Calendar instance = Calendar.getInstance();
|
||||
instance.setTime(parse);
|
||||
instance.set(Calendar.HOUR_OF_DAY,i);
|
||||
Date time = instance.getTime();
|
||||
Map<String,Object> ff = new HashMap<>();
|
||||
ff.put("zwlz",pointService.ZWLZ(time));
|
||||
ff.put("lgbf",pointService.LGBF(time));
|
||||
ff.put("ftbf",pointService.FTBF(time));
|
||||
flag.add(ff);
|
||||
}
|
||||
return R.ok().put("flag",flag);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -19,7 +19,11 @@ public interface PointService extends IService<PointEntity> {
|
||||
|
||||
Map<String,Object> TGDZForDate(Date date);
|
||||
|
||||
List<String> ZWLZ(Date parse);
|
||||
Map<String,Object> ZWLZ(Date parse);
|
||||
|
||||
Map<String,Object> LGBF(Date parse);
|
||||
|
||||
Map<String,Object> FTBF(Date parse);
|
||||
|
||||
Map<String,Object> WYLQForDate(Date date);
|
||||
}
|
||||
|
||||
@@ -133,13 +133,116 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> ZWLZ(Date parse) {
|
||||
public Map<String,Object> ZWLZ(Date parse) {
|
||||
Map<String, Object> stringObjectMap = TGDZForDate(parse);
|
||||
char dt = stringObjectMap.get("day").toString().charAt(0);
|
||||
char hd = stringObjectMap.get("hour").toString().charAt(1);
|
||||
String check = ""+dt+hd;
|
||||
List<String> ng_list =new ArrayList<>();
|
||||
if(ngf.containsKey(check)){
|
||||
ng_list = ngf.get(check);
|
||||
}
|
||||
Map<String, Object> flag = new HashMap<>();
|
||||
flag.put("ngf",ng_list);
|
||||
flag.put("nzf",nzf.get(""+hd));
|
||||
return flag;
|
||||
}
|
||||
|
||||
return null;
|
||||
@Override
|
||||
public Map<String,Object> FTBF(Date parse){
|
||||
Map<String, Object> stringObjectMap = TGDZForDate(parse);
|
||||
String hour = stringObjectMap.get("hour").toString();
|
||||
String s = ftbf_d.get(""+hour.charAt(0));
|
||||
String k;
|
||||
if(s== "公孙"){
|
||||
k="内关";
|
||||
} else if (s=="申脉") {
|
||||
k="后溪";
|
||||
} else if (s=="照海") {
|
||||
k="列缺";
|
||||
} else if (s=="临泣") {
|
||||
k="外关";
|
||||
}else{
|
||||
k="";
|
||||
}
|
||||
HashMap<String, Object> flag = new HashMap<>();
|
||||
flag.put("KX",s) ;
|
||||
flag.put("HX",k);
|
||||
return flag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> LGBF(Date parse) {
|
||||
Map<String, Object> stringObjectMap = TGDZForDate(parse);
|
||||
String day = stringObjectMap.get("day").toString();
|
||||
String hour = stringObjectMap.get("hour").toString();
|
||||
List<String> list1 = Arrays.asList("甲", "丙", "戊", "庚", "壬");
|
||||
//确定阳日或阴日
|
||||
Integer cs;
|
||||
if(list1.contains(day.charAt(0))){
|
||||
cs = 9;
|
||||
}else {
|
||||
cs = 6;
|
||||
}
|
||||
//日天干对应的数
|
||||
int i = getrgz(day.charAt(0)) + getrgz(day.charAt(1));
|
||||
int j = getsgz(hour.charAt(0)) + getsgz(hour.charAt(1));
|
||||
int y = (i+j)%cs;
|
||||
int kx;
|
||||
if(y==0){
|
||||
if(cs==9){
|
||||
kx=8;
|
||||
}else{
|
||||
kx=5;
|
||||
}
|
||||
}else {
|
||||
kx = y;
|
||||
}
|
||||
String s = lgbf_d[kx];
|
||||
String k;
|
||||
if(s== "公孙"){
|
||||
k="内关";
|
||||
} else if (s=="申脉") {
|
||||
k="后溪";
|
||||
} else if (s=="照海") {
|
||||
k="列缺";
|
||||
} else if (s=="临泣") {
|
||||
k="外关";
|
||||
}else{
|
||||
k="";
|
||||
}
|
||||
HashMap<String, Object> flag = new HashMap<>();
|
||||
flag.put("KX",s) ;
|
||||
flag.put("HX",k);
|
||||
return flag;
|
||||
}
|
||||
|
||||
private Integer getrgz(char c){
|
||||
if(Arrays.asList("甲","己","辰","戌","丑","未").contains(""+c)){
|
||||
return 10;
|
||||
} else if (Arrays.asList("乙","庚","申","酉").contains(""+c)) {
|
||||
return 9;
|
||||
} else if (Arrays.asList("丁","壬","寅","卯").contains(""+c)) {
|
||||
return 8;
|
||||
}else {
|
||||
return 7;
|
||||
}
|
||||
}
|
||||
|
||||
private Integer getsgz(char c){
|
||||
if(Arrays.asList("甲","己","子","午").contains(""+c)){
|
||||
return 9;
|
||||
} else if (Arrays.asList("乙","庚","丑","未").contains(""+c)) {
|
||||
return 8;
|
||||
} else if (Arrays.asList("丙","辛","寅","申").contains(""+c)) {
|
||||
return 7;
|
||||
}else if (Arrays.asList("丁","壬","卯","酉").contains(""+c)) {
|
||||
return 6;
|
||||
}else if (Arrays.asList("戊","癸","辰","戌").contains(""+c)) {
|
||||
return 5;
|
||||
}else {
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user