Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/depositRecord.vue

@@ -37,8 +37,8 @@
     </a-table>
   </div>
 </template>
-            
-  <script>
+
+<script>
 import { mapState } from "vuex";
 import storage from "@/utils/js/Storage";
 import { export2Excel } from "@/utils/js/exportExcel";
@@ -100,7 +100,7 @@ export default {
         title: "取件人联系电话",
         dataIndex: "phone",
         width: 150,
-        customRender: (text) => text.phone || "--",
+        customRender: (text) => text || "--",
       },
       {
         title: "取件码",
@@ -297,6 +297,5 @@ export default {
   },
 };
 </script>
-            
-  <style lang="less" scoped>
-</style>
\ No newline at end of file
+
+<style lang="less" scoped></style>

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue

@@ -26,8 +26,8 @@
     </a-table>
   </div>
 </template>
-            
-  <script>
+
+<script>
 import { mapState } from "vuex";
 import storage from "@/utils/js/Storage";
 import { export2Excel } from "@/utils/js/exportExcel";
@@ -40,7 +40,7 @@ const tHeader = [
   "箱号",
   "联系电话",
   "取件时间",
-  "邮递员",
+  "操作人身份",
   "存件时间",
 ]; // 导出的表头名信息
 const filterVal = [
@@ -51,9 +51,14 @@ const filterVal = [
   "boxNo",
   "phone",
   "update_time",
-  "courier",
+  "userType",
   "create_time",
 ]; // 导出的表头字段名，需要导出表格字段名
+let userType = {
+  1: "用户",
+  2: "管理员",
+  3: "邮递员",
+};
 export default {
   components: {},
   data() {
@@ -83,7 +88,7 @@ export default {
         title: "联系电话",
         dataIndex: "phone",
         width: 150,
-        customRender: (text) => text.phone || "--",
+        customRender: (text) => text || "--",
       },
       {
         title: "取件方式",
@@ -122,9 +127,11 @@ export default {
       },
       {
         title: "操作人身份",
-        dataIndex: "courier",
+        dataIndex: "userType",
         width: 150,
-        customRender: (text) => text || "--",
+        customRender: (text) => {
+          return this.userType[text];
+        },
       },
       {
         title: "存件时间",
@@ -136,6 +143,7 @@ export default {
     return {
       baseurl: process.env.VUE_APP_API_PHP_URL,
       siteId: storage.get(2, "siteId"),
+      userType,
       columns,
       tHeader,
       filterVal,
@@ -242,11 +250,8 @@ export default {
         // 深度克隆避免影响页面表格展示
         let data = this.$_.cloneDeep(this.excelData);
         for (let item of data) {
-          Object.keys(obj).forEach((key) => {
-            if (item.type == key) {
-              item.type = obj[key];
-            }
-          });
+          item.type = obj[item.type];
+          item.userType = this.userType[item.userType];
         }
         export2Excel(
           this.tHeader,
@@ -261,11 +266,8 @@ export default {
             return;
           }
           for (let item of data) {
-            Object.keys(obj).forEach((key) => {
-              if (item.type == key) {
-                item.type = obj[key];
-              }
-            });
+            item.type = obj[item.type];
+            item.userType = this.userType[item.userType];
           }
           export2Excel(
             this.tHeader,
@@ -305,6 +307,5 @@ export default {
   },
 };
 </script>
-            
-  <style lang="less" scoped>
-</style>
\ No newline at end of file
+
+<style lang="less" scoped></style>

portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageEventServiceImpl.java

@@ -318,6 +318,7 @@ public class PageEventServiceImpl extends AbstractCRUDServiceImpl<PageEventDao,
                     }
                 }
                 for (Map.Entry<String, List<String>> entry : group.entrySet()) {
+
                     PageCensusPdu query = new PageCensusPdu();
                     query.setDeviceNumList(entry.getValue());
                     List<PageEventCensusVo> list = dao.getPageClickEventCensus(query);
@@ -329,6 +330,12 @@ public class PageEventServiceImpl extends AbstractCRUDServiceImpl<PageEventDao,
                     List<PageEventCensusVo> listDay = dao.getPageClickEventCensus(query);
                     if(CollectionUtils.isNotEmpty(listDay)) {
                         cacheService.hset(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE_DAY, entry.getKey(), listDay.get(0));
+                    }else {
+                        PageEventCensusVo init = new PageEventCensusVo();
+                        init.setTotal(0);
+                        init.setEventCode("Click");
+                        init.setEventName("点击");
+                        cacheService.hset(RedisKey.KEY_DEVICE_EVENT_CLICK_CACHE_DAY, entry.getKey(), init);
                     }
                 }
             }

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -357,4 +357,17 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
             return Rest.fail("初始化用户数据异常!");
         }
     }
+
+    @PostMapping(value = "gust")
+    @UnAuth
+    public Rest<String> guestUser(@RequestBody UserEntity user) {
+
+        try {
+            service.save(user);
+            return Rest.ok("添加用户成功！");
+        } catch (Exception e) {
+            log.error("添加用户错误", e);
+            return Rest.fail("添加用户异常!");
+        }
+    }
 }
\ No newline at end of file