!168 打卡接口sql优化

Merge pull request !168 from 德仔/xzj

stdiet-admin/src/main/java/com/stdiet/web/controller/common/CommonController.java

@@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.net.URLDecoder;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -46,12 +47,18 @@ public class CommonController {
      * @param delete   是否删除
      */
     @GetMapping("common/download")
-    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
+    public void fileDownload(String fileName, Boolean delete, String downFileName,HttpServletResponse response, HttpServletRequest request) {
         try {
+            if(StringUtils.isEmpty(fileName)){
+                return;
+            }
+            //解码
+            fileName = URLDecoder.decode(fileName, "UTF-8");
+            downFileName = StringUtils.isEmpty(downFileName) ? null : URLDecoder.decode(downFileName, "UTF-8");
             if (!FileUtils.isValidFilename(fileName)) {
                 throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
             }
-            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String realFileName = (downFileName != null && downFileName.length() <= 200) ? downFileName : System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
             String filePath = RuoYiConfig.getDownloadPath() + fileName;
 
             response.setCharacterEncoding("utf-8");

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java

@@ -38,6 +38,8 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
     @Autowired
     private ISysCustomerService sysCustomerService;
 
+    public static final String reportDownFileNameFormat = "%s超重%s斤%s";
+
     /**
      * 查询客户健康
      *
@@ -164,8 +166,10 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
         //查询客户健康信息
         SysCustomerHealthy sysCustomerHealthy = selectSysCustomerHealthyById(healthyDetailRequest.getId());
         if(sysCustomerHealthy != null){
-            ajaxResult = PdfUtils.generatePdfFile(templatePath, filePath, getReportData(sysCustomerHealthy, healthyDetailRequest));
+            Map<String, String> reportData = getReportData(sysCustomerHealthy, healthyDetailRequest);
+            ajaxResult = PdfUtils.generatePdfFile(templatePath, filePath, reportData);
             ajaxResult.put("path", fileName);
+            ajaxResult.put("downReportFileName", reportData.get("downReportFileName")+".pdf");
         }
         return ajaxResult;
     }
@@ -235,6 +239,11 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
         }
         data.put("company","深圳胜唐体控有限公司");
         data.put("date", DateUtils.getDate());
+
+        //文件下载时的名称，名字+超重几斤+病史体征
+        String sign = StringUtils.isEmpty(healthyDetailRequest.getPhysicalSigns()) ? "" : healthyDetailRequest.getPhysicalSigns().replace("，","").replace(",","").replace("/", "");
+        String downReportFileName = String.format(reportDownFileNameFormat, healthyDetailRequest.getName(), nutritionalCalories.getOverWeight() > 0 ? nutritionalCalories.getOverWeight().toString() : "0", sign);
+        data.put("downReportFileName", downReportFileName);
         return data;
     }
 

stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml

@@ -36,14 +36,11 @@
     </select>
 
     <select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
-        select distinct user.openid, user.nick_name, user.appid, user.phone, user.avatar_url, user.sex, user.update_time from sys_wx_user_info user
+        select distinct wxuser.openid, wxuser.nick_name, wxuser.appid, wxuser.phone, wxuser.avatar_url, wxuser.sex, wxuser.update_time from sys_wx_user_info wxuser
-        right join sys_order
+        where (SELECT COUNT(wxlog.id) FROM sys_wx_user_log wxlog WHERE wxlog.openid = wxuser.openid) > 0
-        on user.phone = sys_order.phone
+        <if test="appid != null  and appid != ''">and wxuser.appid = #{appid}</if>
-        <where>
+        <if test="openid != null and openid != ''">and wxuser.openid  <![CDATA[ <> ]]> #{openid} </if>
-            <if test="appid != null  and appid != ''">and appid = #{appid}</if>
+        order by wxuser.update_time desc
-            <if test="openid != null  and openid != ''">and openid != #{openid}</if>
-        </where>
-        order by update_time desc
     </select>
 
     <select id="selectSysWxUserInfoById" parameterType="String" resultMap="SysWxUserInfoResult">

stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml

@@ -171,7 +171,7 @@
         </foreach>
     </delete>
 
-    <!-- 根据openid或手机号查询对应打卡记录 -->
+    <!-- 根据openid和手机号查询对应打卡记录 -->
     <select id="getWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo">
         SELECT wxlog.weight,wxlog.log_time,wxlog.sleep_time, wxlog.wakeup_time,wxlog.defecation, wxlog.water, wxlog.insomnia,wxlog.sport,wxlog.diet
         FROM sys_wx_user_log wxlog left join sys_wx_user_info wxinfo on wxinfo.openid  = wxlog.openid
@@ -183,4 +183,20 @@
         select id from sys_wx_user_log where to_days(log_time) = to_days(#{logTime}) and openid = #{openid} limit 1
     </select>
 
+    <!-- 根据手机号和openid查询打卡连续天数，只查询前两条 -->
+    <select id="getContinuity" parameterType="SysWxUserLog" resultType="Map">
+        SELECT yearMonth,MIN(log_time) AS minLogTime,MAX(log_time) AS maxLogTime,COUNT(*) AS continuityDayCount FROM
+          (
+            SELECT log_time,yearMonth,(days-date_rank) AS day_cha FROM
+            (
+                SELECT *,row_number() over(PARTITION BY yearMonth ORDER BY log_time) date_rank  FROM
+                (
+                    SELECT log_time,CONCAT(YEAR(log_time),'-',MONTH(log_time)) AS yearMonth,DAY(log_time) AS days
+                    FROM sys_wx_user_log wxlog left join sys_wx_user_info wxinfo on wxinfo.openid  = wxlog.openid
+                    where wxinfo.openid = #{openid} or wxinfo.phone = #{phone}
+                ) AS s ORDER BY s.log_time DESC
+            ) ss
+        ) sss GROUP BY yearMonth,day_cha LIMIT 2
+    </select>
+
 </mapper>

stdiet-ui/src/components/PhysicalSignsDialog/index.vue

@@ -785,7 +785,8 @@ export default {
           })
           .then((response) => {
             if (response.code == 200 && response.path != null) {
-              this.download(response.path);
+              //文件路径、获取下载文件名称
+              this.download(response.path, response.downReportFileName);
             }
           })
           .catch(function () {});

stdiet-ui/src/utils/ruoyi.js

@@ -98,8 +98,8 @@ export function selectDictLabels(datas, value, separator) {
 }
 
 // 通用下载方法（导出Excel,下载之后删除）
-export function download(fileName) {
+export function download(fileName, downFileName) {
-  window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
+  window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true + "&downFileName=" + (downFileName != undefined ? encodeURI(downFileName) : "");
 }
 
 // 通用下载本地资源方法

stdiet-ui/src/views/custom/wxUserLog/index.vue

@@ -1,8 +1,19 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="微信应用" prop="appid">
-        <el-select v-model="queryParams.appid" placeholder="请选择微信应用" clearable size="small">
+        <el-select
+          v-model="queryParams.appid"
+          placeholder="请选择微信应用"
+          clearable
+          size="small"
+        >
           <el-option
             v-for="dict in appidOptions"
             :key="dict.dictValue"
@@ -20,9 +31,27 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="营养师" prop="nutritionistId">
+        <el-select v-model="queryParams.nutritionistId" clearable filterable placeholder="请选择">
+          <el-option
+            v-for="dict in nutritionistIdOptions.slice(1)"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)" 
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -69,13 +98,23 @@
       <!--        >导出-->
       <!--        </el-button>-->
       <!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="wxUserLogList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="wxUserLogList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column label="用户头像" align="center" prop="avatarUrl">
         <template slot-scope="scope">
-          <el-image :src="scope.row.avatarUrl" style="width: 32px; height: 32px; border-radius: 50%"/>
+          <el-image
+            :src="scope.row.avatarUrl"
+            style="width: 32px; height: 32px; border-radius: 50%"
+          />
         </template>
       </el-table-column>
       <!--      <el-table-column type="selection" width="55" align="center" />-->
@@ -85,36 +124,81 @@
           <span>{{ `${scope.row.weight} 斤` }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="微信应用" align="center" prop="appid" width="120" :formatter="appidFormat"/>
+      <el-table-column
+        label="微信应用"
+        align="center"
+        prop="appid"
+        width="120"
+        :formatter="appidFormat"
+      />
       <el-table-column label="姓名" align="center" prop="customerName" />
 
       <el-table-column label="手机号" align="center" prop="phone" width="180" />
       <el-table-column label="营养师" align="center" prop="nutritionist" />
-      <el-table-column label="打卡日期" align="center" prop="logTime" width="120">
+      <el-table-column
+        label="打卡日期"
+        align="center"
+        prop="logTime"
+        width="120"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.logTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.logTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="睡觉时间" align="center" prop="sleepTime" width="120">
+      <el-table-column
+        label="睡觉时间"
+        align="center"
+        prop="sleepTime"
+        width="120"
+      >
         <!--                <template slot-scope="scope">-->
         <!--                  <span>{{ parseTime(scope.row.sleepTime, '{y}-{m}-{d}') }}</span>-->
         <!--                </template>-->
       </el-table-column>
-      <el-table-column label="起床时间" align="center" prop="wakeupTime" width="120">
+      <el-table-column
+        label="起床时间"
+        align="center"
+        prop="wakeupTime"
+        width="120"
+      >
         <!--        <template slot-scope="scope">-->
         <!--          <span>{{ parseTime(scope.row.wakeupTime, '{y}-{m}-{d}') }}</span>-->
         <!--        </template>-->
       </el-table-column>
-      <el-table-column label="运动锻炼" align="center" prop="sport" :formatter="sportFormat"/>
+      <el-table-column
-      <el-table-column label="按食谱" align="center" prop="diet" :formatter="dietFormat"/>
+        label="运动锻炼"
-      <el-table-column label="熬夜失眠" align="center" prop="insomnia" :formatter="insomniaFormat"/>
+        align="center"
-      <el-table-column label="起床排便" align="center" prop="defecation" :formatter="defecationFormat"/>
+        prop="sport"
+        :formatter="sportFormat"
+      />
+      <el-table-column
+        label="按食谱"
+        align="center"
+        prop="diet"
+        :formatter="dietFormat"
+      />
+      <el-table-column
+        label="熬夜失眠"
+        align="center"
+        prop="insomnia"
+        :formatter="insomniaFormat"
+      />
+      <el-table-column
+        label="起床排便"
+        align="center"
+        prop="defecation"
+        :formatter="defecationFormat"
+      />
       <el-table-column label="饮水量" align="center" prop="water">
         <template slot-scope="scope">
           <span>{{ `${scope.row.water} ml` }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -156,38 +240,50 @@
 
           <el-col :span="12">
             <el-form-item label="打卡日期" prop="logTime">
-              <el-date-picker clearable size="small" style="width: 200px"
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 200px"
                 v-model="form.logTime"
                 type="date"
                 value-format="yyyy-MM-dd"
                 :picker-options="logTimePickerOptions"
-                              placeholder="选择睡觉时间">
+                placeholder="选择睡觉时间"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="睡觉时间" prop="sleepTime">
-              <el-time-select clearable size="small" style="width: 200px"
+              <el-time-select
+                clearable
+                size="small"
+                style="width: 200px"
                 v-model="form.sleepTime"
                 :picker-options="{
                   start: '00:00',
                   step: '00:15',
-                                end: '23:45'
+                  end: '23:45',
                 }"
-                              placeholder="选择睡觉时间">
+                placeholder="选择睡觉时间"
+              >
               </el-time-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="起床时间" prop="wakeupTime">
-              <el-time-select clearable size="small" style="width: 200px"
+              <el-time-select
+                clearable
+                size="small"
+                style="width: 200px"
                 v-model="form.wakeupTime"
                 :picker-options="{
                   start: '00:00',
                   step: '00:15',
-                                end: '23:45'
+                  end: '23:45',
                 }"
-                              placeholder="选择睡觉时间">
+                placeholder="选择睡觉时间"
+              >
               </el-time-select>
             </el-form-item>
           </el-col>
@@ -247,7 +343,11 @@
 
           <el-col>
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-form>
@@ -267,8 +367,9 @@
   exportWxUserLog,
   getWxUserLog,
   listWxUserLog,
-    updateWxUserLog
+  updateWxUserLog,
 } from "@/api/custom/wxUserLog";
+import { mapGetters } from "vuex";
 
 export default {
   name: "WxUserLog",
@@ -308,6 +409,7 @@
         pageSize: 10,
         appid: null,
         phone: null,
+        nutritionistId: null
       },
       // 表单参数
       form: {},
@@ -322,27 +424,35 @@
   },
   created() {
     this.getList();
-      this.getDicts("cus_wx_app").then(response => {
+    this.getDicts("cus_wx_app").then((response) => {
       this.appidOptions = response.data;
     });
-      this.getDicts("sys_yes_no").then(response => {
+    this.getDicts("sys_yes_no").then((response) => {
       this.sportOptions = response.data;
     });
-      this.getDicts("sys_yes_no").then(response => {
+    this.getDicts("sys_yes_no").then((response) => {
       this.dietOptions = response.data;
     });
-      this.getDicts("sys_yes_no").then(response => {
+    this.getDicts("sys_yes_no").then((response) => {
       this.insomniaOptions = response.data;
     });
-      this.getDicts("sys_yes_no").then(response => {
+    this.getDicts("sys_yes_no").then((response) => {
       this.defecationOptions = response.data;
     });
   },
+  computed: {
+    ...mapGetters([
+      // 售后字典
+      "afterSaleIdOptions",
+      // 主营养师字典
+      "nutritionistIdOptions"
+    ]),
+  },
   methods: {
     /** 查询微信用户记录列表 */
     getList() {
       this.loading = true;
-        listWxUserLog(this.queryParams).then(response => {
+      listWxUserLog(this.queryParams).then((response) => {
         this.wxUserLogList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -375,7 +485,9 @@
     },
     // 表单重置
     reset() {
-        const defaultAppidType = this.appidOptions.find(opt => opt.remark === 'default');
+      const defaultAppidType = this.appidOptions.find(
+        (opt) => opt.remark === "default"
+      );
 
       this.form = {
         id: null,
@@ -396,7 +508,7 @@
         updateBy: null,
         updateTime: null,
         remark: null,
-          logTime: null
+        logTime: null,
       };
       this.resetForm("form");
     },
@@ -412,9 +524,9 @@
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.openid)
+      this.ids = selection.map((item) => item.openid);
-        this.single = selection.length !== 1
+      this.single = selection.length !== 1;
-        this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -425,8 +537,8 @@
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-        const id = row.id || this.ids
+      const id = row.id || this.ids;
-        getWxUserLog(id).then(response => {
+      getWxUserLog(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改微信用户记录";
@@ -434,11 +546,11 @@
     },
     /** 提交按钮 */
     submitForm() {
-        this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           // console.log(this.form)
           if (this.form.id != null) {
-              updateWxUserLog(this.form).then(response => {
+            updateWxUserLog(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -446,7 +558,7 @@
               }
             });
           } else {
-              addWxUserLog(this.form).then(response => {
+            addWxUserLog(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -460,32 +572,40 @@
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-        this.$confirm('是否确认删除微信用户记录编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除微信用户记录编号为"' + ids + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
-        }).then(function () {
+        }
+      )
+        .then(function () {
           return delWxUserLog(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function () {
+        })
-        });
+        .catch(function () {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有微信用户记录数据项?', "警告", {
+      this.$confirm("是否确认导出所有微信用户记录数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-          type: "warning"
+        type: "warning",
-        }).then(function () {
+      })
+        .then(function () {
           return exportWxUserLog(queryParams);
-        }).then(response => {
+        })
+        .then((response) => {
           this.download(response.msg);
-        }).catch(function () {
+        })
-        });
+        .catch(function () {});
-      }
+    },
-    }
+  },
 };
 </script>