十神格局

xpgx-admin/src/main/java/com/miaxis/app/controller/birthday/BirthdayLogController.java

@@ -6,6 +6,7 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.SecurityUtils;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -69,6 +70,7 @@ public class BirthdayLogController extends BaseController{
     @PostMapping
     @ApiOperation("新增查询记录")
     public Response<Integer> add(@RequestBody BirthdayLog birthdayLog){
+        birthdayLog.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         return toResponse(birthdayLogService.saveBirthdayLog(birthdayLog) ? 1 : 0);
     }
 

xpgx-service/src/main/java/com/miaxis/birthday/domain/BirthdayLog.java

@@ -53,7 +53,7 @@ public class BirthdayLog extends BaseBusinessEntity{
     /** 查询用户ID */
     @Excel(name = "查询用户ID")
     @TableField("user_id")
-    @ApiModelProperty(value = "查询用户ID")
+    @ApiModelProperty(value = "查询用户ID", hidden = true)
     private Long userId;
 
     /** 是否付费 0：未付费 1：基础版  2：高级版 */
@@ -61,61 +61,4 @@ public class BirthdayLog extends BaseBusinessEntity{
     @TableField("is_pay")
     @ApiModelProperty(value = "是否付费 0：未付费 1：基础版  2：高级版")
     private Long isPay;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setName(String name){
-        this.name = name;
-    }
-
-    public String getName(){
-        return name;
-    }
-    public void setSex(String sex){
-        this.sex = sex;
-    }
-
-    public String getSex(){
-        return sex;
-    }
-    public void setBirthday(Date birthday){
-        this.birthday = birthday;
-    }
-
-    public Date getBirthday(){
-        return birthday;
-    }
-    public void setUserId(Long userId){
-        this.userId = userId;
-    }
-
-    public Long getUserId(){
-        return userId;
-    }
-    public void setIsPay(Long isPay){
-        this.isPay = isPay;
-    }
-
-    public Long getIsPay(){
-        return isPay;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("sex", getSex())
-            .append("birthday", getBirthday())
-            .append("userId", getUserId())
-            .append("isPay", getIsPay())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }

xpgx-service/src/main/java/com/miaxis/birthday/service/impl/BirthdayLogServiceImpl.java

@@ -42,6 +42,7 @@ public class BirthdayLogServiceImpl extends ServiceImpl<BirthdayLogMapper, Birth
     @Override
     public boolean saveBirthdayLog(BirthdayLog birthdayLog){
         int count = birthdayLogMapper.selectBirthdayLogCount(birthdayLog);
+
         if(count>0) {
             log.info("当前查询8字已存在");
             return true;

xpgx-service/src/main/java/com/miaxis/gan/service/impl/GanZhiServiceImpl.java

@@ -13,6 +13,7 @@ import com.miaxis.gan.dto.LiuNianDto;
 import com.miaxis.gan.vo.GanZhiKongWangVo;
 import com.miaxis.gan.vo.GanZhiNaYinVo;
 import com.miaxis.gan.vo.GanZhiRowVo;
+import com.miaxis.ge.domain.GeJu;
 import com.miaxis.jie.mapper.JieQiMapper;
 import com.miaxis.jie.vo.JieQiVo;
 import com.miaxis.number.domain.NumberYun;
@@ -1127,18 +1128,19 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 geju = timeGan;
             }
         }
-
+        GeJu geJu = new GeJu();
+        geJu.setShiShen(geju);
         if (qr.contains("强")) {
-
+            geJu.setQr("3,1");
         } else if (qr.contains("弱")) {
-
+            geJu.setQr("3,2");
         }
 
         String sex = list.get(4).getShiShen1();
         if ("元男".equals(sex)) {
-
+            geJu.setSex("1,3");
         } else if ("元女".equals(sex)) {
-
+            geJu.setSex("2,3");
         }