From 37a9386333260af8c8559b78c368ae9310a4c854 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Sun, 29 Nov 2020 23:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=90=8C=E5=8F=82?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../custom/SysWxUserInfoController.java | 1 +
.../custom/SysWxUserLogController.java | 9 +-
.../custom/mapper/SysWxUserLogMapper.java | 3 +
.../com/stdiet/custom/page/WxLogInfo.java | 118 ++++++++++++++++++
.../com/stdiet/custom/page/WxServeInfo.java | 11 ++
.../custom/service/ISysWxUserLogService.java | 3 +
.../service/impl/SysContractServiceImpl.java | 6 +-
.../service/impl/SysWxUserLogServiceImpl.java | 28 ++---
.../mapper/custom/SysWxUserLogMapper.xml | 21 ++++
9 files changed, 178 insertions(+), 22 deletions(-)
create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java
diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
index 0db476160..66f2fda48 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
@@ -129,6 +129,7 @@ public class SysWxUserInfoController extends BaseController {
wxServeInfo.setServeTime(list.get(0).getServeTime());
wxServeInfo.setStartTime(list.get(list.size() - 1).getStartTime());
wxServeInfo.setWeight(list.get(list.size() - 1).getWeight());
+ wxServeInfo.setPhone(list.get(0).getPhone());
return AjaxResult.success(wxServeInfo);
}
diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
index 30c372b96..cf985ba23 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
@@ -10,6 +10,7 @@ import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.custom.domain.SysOrder;
import com.stdiet.custom.domain.SysWxUserInfo;
import com.stdiet.custom.domain.SysWxUserLog;
+import com.stdiet.custom.page.WxLogInfo;
import com.stdiet.custom.service.ISysOrderService;
import com.stdiet.custom.service.ISysWxUserInfoService;
import com.stdiet.custom.service.ISysWxUserLogService;
@@ -98,11 +99,9 @@ public class SysWxUserLogController extends BaseController {
return toAjax(sysWxUserLogService.deleteSysWxUserLogByIds(openids));
}
- @GetMapping(value = "/wx/logs/{openid}")
- public AjaxResult getLogs(@PathVariable String openId) {
- SysWxUserLog querySysWxUserLog = new SysWxUserLog();
- querySysWxUserLog.setOpenid(openId);
- List<SysWxUserLog> list = sysWxUserLogService.selectSysWxUserLogList(querySysWxUserLog);
+ @GetMapping(value = "/wx/logs/list")
+ public AjaxResult getLogs(SysWxUserLog sysWxUserLog ) {
+ List<WxLogInfo> list = sysWxUserLogService.selectWxLogInfoList(sysWxUserLog);
return AjaxResult.success(list);
}
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java
index dc9f61b78..39081d82e 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java
@@ -2,6 +2,7 @@ package com.stdiet.custom.mapper;
import java.util.List;
import com.stdiet.custom.domain.SysWxUserLog;
+import com.stdiet.custom.page.WxLogInfo;
/**
* 微信用户记录Mapper接口
@@ -27,6 +28,8 @@ public interface SysWxUserLogMapper
*/
public List<SysWxUserLog> selectSysWxUserLogList(SysWxUserLog sysWxUserLog);
+ public List<WxLogInfo> selectWxLogInfoList(SysWxUserLog sysWxUserLog);
+
/**
* 新增微信用户记录
*
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java b/stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java
new file mode 100644
index 000000000..664d9a055
--- /dev/null
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java
@@ -0,0 +1,118 @@
+package com.stdiet.custom.page;
+
+import com.stdiet.common.utils.DateUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class WxLogInfo implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String date;
+
+ private Long water;
+
+ private String sleepTime;
+
+ private String wakeupTime;
+
+ private String sport;
+
+ private BigDecimal weight;
+
+ private String diet;
+
+ private String insomnia;
+
+ private String defecation;
+
+ public String getDate() {
+ return date;
+ }
+
+ public String getDefecation() {
+ return defecation;
+ }
+
+ public String getDiet() {
+ return diet;
+ }
+
+ public String getSleepTime() {
+ return sleepTime;
+ }
+
+ public Long getWater() {
+ return water;
+ }
+
+ public String getInsomnia() {
+ return insomnia;
+ }
+
+ public String getSport() {
+ return sport;
+ }
+
+ public String getWakeupTime() {
+ return wakeupTime;
+ }
+
+ public BigDecimal getWeight() {
+ return weight;
+ }
+
+ public void setWeight(BigDecimal weight) {
+ this.weight = weight;
+ }
+
+ public void setDate(Date date) {
+ this.date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
+ }
+
+ public void setDiet(String diet) {
+ this.diet = diet == "Y" ? "是" : "否";
+ }
+
+ public void setWater(Long water) {
+ this.water = water;
+ }
+
+ public void setWakeupTime(String wakeupTime) {
+ this.wakeupTime = wakeupTime;
+ }
+
+ public void setDefecation(String defecation) {
+ this.defecation = defecation == "Y" ? "是" : "否";
+ }
+
+ public void setSport(String sport) {
+ this.sport = sport == "Y" ? "是" : "否";
+ }
+
+ public void setInsomnia(String insomnia) {
+ this.insomnia = insomnia == "Y" ? "是" : "否";
+ }
+
+ public void setSleepTime(String sleepTime) {
+ this.sleepTime = sleepTime;
+ }
+
+
+
+ @Override
+ public String toString() {
+ return "WxLogInfo{" +
+ "date='" + date + '\'' +
+ ", water='" + water + '\'' +
+ ", sleepTime='" + sleepTime + '\'' +
+ ", wakeupTime='" + wakeupTime + '\'' +
+ ", sport='" + sport + '\'' +
+ ", weight='" + weight + '\'' +
+ ", diet='" + diet + '\'' +
+ ", insomnia='" + insomnia + '\'' +
+ ", defecation='" + defecation + '\'' +
+ '}';
+ }
+}
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/page/WxServeInfo.java b/stdiet-custom/src/main/java/com/stdiet/custom/page/WxServeInfo.java
index bbc066ac4..580e761fe 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/page/WxServeInfo.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/page/WxServeInfo.java
@@ -17,6 +17,16 @@ public class WxServeInfo implements Serializable {
private String weight;
+ private String phone;
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
public String getServeTime() {
return serveTime;
}
@@ -62,6 +72,7 @@ public class WxServeInfo implements Serializable {
", serveStatus='" + serveStatus + '\'' +
", startTime='" + startTime + '\'' +
", weight='" + weight + '\'' +
+ ", phone='" + phone + '\'' +
'}';
}
}
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java
index f60121da4..e356403ed 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java
@@ -2,6 +2,7 @@ package com.stdiet.custom.service;
import java.util.List;
import com.stdiet.custom.domain.SysWxUserLog;
+import com.stdiet.custom.page.WxLogInfo;
/**
* 微信用户记录Service接口
@@ -27,6 +28,8 @@ public interface ISysWxUserLogService
*/
public List<SysWxUserLog> selectSysWxUserLogList(SysWxUserLog sysWxUserLog);
+ public List<WxLogInfo> selectWxLogInfoList(SysWxUserLog sysWxUserLog);
+
/**
* 新增微信用户记录
*
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java
index a1e48f34f..9d9400f5d 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java
@@ -102,8 +102,8 @@ public class SysContractServiceImpl implements ISysContractService {
@Override
public PdfProcessInfo signContract(SysContract sysContract) {
-// String templatePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/pdf/contract.pdf";
-// String filePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running" + sysContract.getPath();
+// String templatePath = "/Users/wonder/Documents/Workspaces/java/ShengTangMange/running/pdf/contract.pdf";
+// String filePath = "/Users/wonder/Documents/Workspaces/java/ShengTangMange/running" + sysContract.getPath();
String templatePath = "/home/workspace/ShengTangManage/running/pdf/contract.pdf";
String filePath = "/home/web/manage.shengtangdiet.com" + sysContract.getPath();
@@ -122,7 +122,7 @@ public class SysContractServiceImpl implements ISysContractService {
AcroFields form = stamper.getAcroFields();
form.addSubstitutionFont(BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED));
- form.setField("signName", sysContract.getSignName(), true);
+ form.setField("name", sysContract.getSignName(), true);
form.setField("serveTime", sysContract.getServeTimeStr(), true);
form.setField("tutor", sysContract.getTutor(), true);
form.setField("moneyUpper", sysContract.getAmountUpper(), true);
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java
index 04204985e..f5c228fb5 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java
@@ -1,7 +1,9 @@
package com.stdiet.custom.service.impl;
import java.util.List;
+
import com.stdiet.common.utils.DateUtils;
+import com.stdiet.custom.page.WxLogInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.stdiet.custom.mapper.SysWxUserLogMapper;
@@ -15,8 +17,7 @@ import com.stdiet.custom.service.ISysWxUserLogService;
* @date 2020-11-28
*/
@Service
-public class SysWxUserLogServiceImpl implements ISysWxUserLogService
-{
+public class SysWxUserLogServiceImpl implements ISysWxUserLogService {
@Autowired
private SysWxUserLogMapper sysWxUserLogMapper;
@@ -27,8 +28,7 @@ public class SysWxUserLogServiceImpl implements ISysWxUserLogService
* @return 微信用户记录
*/
@Override
- public SysWxUserLog selectSysWxUserLogById(String openid)
- {
+ public SysWxUserLog selectSysWxUserLogById(String openid) {
return sysWxUserLogMapper.selectSysWxUserLogById(openid);
}
@@ -39,11 +39,15 @@ public class SysWxUserLogServiceImpl implements ISysWxUserLogService
* @return 微信用户记录
*/
@Override
- public List<SysWxUserLog> selectSysWxUserLogList(SysWxUserLog sysWxUserLog)
- {
+ public List<SysWxUserLog> selectSysWxUserLogList(SysWxUserLog sysWxUserLog) {
return sysWxUserLogMapper.selectSysWxUserLogList(sysWxUserLog);
}
+ @Override
+ public List<WxLogInfo> selectWxLogInfoList(SysWxUserLog sysWxUserLog) {
+ return sysWxUserLogMapper.selectWxLogInfoList(sysWxUserLog);
+ }
+
/**
* 新增微信用户记录
*
@@ -51,8 +55,7 @@ public class SysWxUserLogServiceImpl implements ISysWxUserLogService
* @return 结果
*/
@Override
- public int insertSysWxUserLog(SysWxUserLog sysWxUserLog)
- {
+ public int insertSysWxUserLog(SysWxUserLog sysWxUserLog) {
sysWxUserLog.setCreateTime(DateUtils.getNowDate());
return sysWxUserLogMapper.insertSysWxUserLog(sysWxUserLog);
}
@@ -64,8 +67,7 @@ public class SysWxUserLogServiceImpl implements ISysWxUserLogService
* @return 结果
*/
@Override
- public int updateSysWxUserLog(SysWxUserLog sysWxUserLog)
- {
+ public int updateSysWxUserLog(SysWxUserLog sysWxUserLog) {
sysWxUserLog.setUpdateTime(DateUtils.getNowDate());
return sysWxUserLogMapper.updateSysWxUserLog(sysWxUserLog);
}
@@ -77,8 +79,7 @@ public class SysWxUserLogServiceImpl implements ISysWxUserLogService
* @return 结果
*/
@Override
- public int deleteSysWxUserLogByIds(String[] openids)
- {
+ public int deleteSysWxUserLogByIds(String[] openids) {
return sysWxUserLogMapper.deleteSysWxUserLogByIds(openids);
}
@@ -89,8 +90,7 @@ public class SysWxUserLogServiceImpl implements ISysWxUserLogService
* @return 结果
*/
@Override
- public int deleteSysWxUserLogById(String openid)
- {
+ public int deleteSysWxUserLogById(String openid) {
return sysWxUserLogMapper.deleteSysWxUserLogById(openid);
}
}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
index 2ecf966ef..dfa9b171e 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
@@ -24,11 +24,32 @@
<result property="remark" column="remark" />
</resultMap>
+ <resultMap type="com.stdiet.custom.page.WxLogInfo" id="WxLogInfo">
+ <result property="weight" column="weight" />
+ <result property="sleepTime" column="sleep_time" />
+ <result property="wakeupTime" column="wakeup_time" />
+ <result property="sport" column="sport" />
+ <result property="diet" column="diet" />
+ <result property="insomnia" column="insomnia" />
+ <result property="defecation" column="defecation" />
+ <result property="water" column="water" />
+ <result property="date" column="create_time" />
+ </resultMap>
+
<sql id="selectSysWxUserLogVo">
select openid, weight, appid, phone, sleep_time, wakeup_time, sport, avatar_url, diet, insomnia, defecation, water, create_by, create_time, update_by, update_time, remark from sys_wx_user_log
</sql>
<select id="selectSysWxUserLogList" parameterType="SysWxUserLog" resultMap="SysWxUserLogResult">
+ <include refid="selectSysWxUserLogVo"/>
+ <where>
+ <if test="appid != null and appid != ''"> and appid = #{appid}</if>
+ <if test="phone != null and phone != ''"> and phone = #{phone}</if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="selectWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo">
<include refid="selectSysWxUserLogVo"/>
<where>
<if test="appid != null and appid != ''"> and appid = #{appid}</if>