a

wwk
1 parent 4aba9b59
Showing 15 changed files with 142 additions and 24 deletions
antis-ncc-admin/.env.production
antis-ncc-admin/src/utils/define.js
antis-ncc-admin/src/views/tbMemCode/index.vue
antis-ncc-net-core/ClassLibrary1/打卡记录/Dto/TbPunchListOutput.cs
antis-ncc-net-core/ClassLibrary1/打卡记录/Dto/TbPunchListQueryInput.cs
antis-ncc-net-core/ClassLibrary1/打卡资讯/Dto/TbPunchInfoListOutput.cs
antis-ncc-net-core/ClassLibrary1/测评信息/Dto/TbEvaluationListOutput.cs
antis-ncc-net-core/ClassLibrary1/首页信息/Dto/TbHomeInfoListOutput.cs
antis-ncc-net-core/NCC.Education/打卡记录/TbPunchService.cs
antis-ncc-net-core/NCC.Education/打卡资讯/TbPunchInfoService.cs
antis-ncc-net-core/NCC.Education/测评信息/TbEvaluationService.cs
antis-ncc-net-core/NCC.Education/首页信息/TbHomeInfoService.cs
antis-ncc-net-core/src/Application/NCC.API/appsettings.json
antis-ncc-net-core/src/Modularity/OAuth/NCC.OAuth/Service/OAuthService.cs
antis-ncc-net-core/src/Modularity/System/NCC.System/Service/Permission/UsersService.cs
 #　生产默认配置
 ENV = 'production'
-VUE_APP_BASE_API = 'http://8.130.38.56:8066'
-VUE_APP_BASE_WSS = 'ws://8.130.38.56:8066/websocket'
+VUE_APP_BASE_API = 'https://www.xiaoxiangsuanshu.com'
+VUE_APP_BASE_WSS = 'ws://www.xiaoxiangsuanshu.com/websocket'
@@ -2,7 +2,8 @@
 // JAVA Boot版本对应后端接口地址
 // JAVA Cloud对应网关地址
 // const APIURl = 'http://localhost:8061'
-const APIURl = 'http://8.130.38.56:8066'
+// const APIURl = 'http://8.130.38.56:8066'
+const APIURl = 'https://www.xiaoxiangsuanshu.com'
 module.exports = {
   APIURl: APIURl,
@@ -51,7 +51,7 @@
 					<el-table-column label="状态" prop="type" align="left">
 						<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
 					</el-table-column>
-					<el-table-column prop="expire" label="到期时间截至" align="left" />
+					<el-table-column prop="expire" label="到期时间截至" align="left" :formatter="ncc.tableDateFormat"/>
 					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
 					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
 					<el-table-column label="操作" fixed="right" width="100">
-using NCC.System.Entitys.Permission;
+using Aspose.Words.Lists;
+using NCC.Common.Model;
+using NCC.System.Entitys.Permission;
+using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 namespace NCC.Education.Entitys.Dto.TbPunch
 {
@@ -27,6 +31,20 @@ namespace NCC.Education.Entitys.Dto.TbPunch
         /// </summary>
         public DateTime? exerciseDate { get; set; }
+        public string imgList { get; set; }
+
+        public List<FileControlsModel> ImgList { get
+            {
+                try
+                {
+                    return JsonConvert.DeserializeObject<List<FileControlsModel>>(imgList);
+                }catch(Exception ex)
+                {
+                    return new List<FileControlsModel>();
+                }
+            } }
+
+
         /// <summary>
         /// 编号
         /// </summary>
@@ -38,6 +38,9 @@ namespace NCC.Education.Entitys.Dto.TbPunch
         /// 状态  1--已打卡  2--缺卡
         /// </summary>
         public string type { get; set; }
-        
+        /// <summary>
+        /// 打卡时间
+        /// </summary>
+        public string creatorTime { get; set; }
     }
 }
-using System;
+using NCC.Common.Model;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 namespace NCC.Education.Entitys.Dto.TbPunchInfo
 {
@@ -26,6 +29,29 @@ namespace NCC.Education.Entitys.Dto.TbPunchInfo
         /// 修改时间
         /// </summary>
         public DateTime? lastModifyTime { get; set; }
+        /// <summary>
+        /// 富文本
+        /// </summary>
+        public string editors { get; set; }
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string img { get; set; }
+
+        public List<FileControlsModel> Img
+        {
+            get
+            {
+                try
+                {
+                    return JsonConvert.DeserializeObject<List<FileControlsModel>>(img);
+                }
+                catch (Exception ex)
+                {
+                    return new List<FileControlsModel>();
+                }
+            }
+        }
         /// <summary>
         /// 阅读量
-using System;
+using NCC.Common.Model;
+using Newtonsoft.Json;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
 namespace NCC.Education.Entitys.Dto.TbEvaluation
 {
@@ -16,7 +20,31 @@ namespace NCC.Education.Entitys.Dto.TbEvaluation
         /// 标题
         /// </summary>
         public string title { get; set; }
-        
+        /// <summary>
+        /// 图文信息
+        /// </summary>
+        public string editors { get; set; }
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string img { get; set; }
+
+        public List<FileControlsModel> Img
+        {
+            get
+            {
+                try
+                {
+                    return JsonConvert.DeserializeObject<List<FileControlsModel>>(img);
+                }
+                catch (Exception ex)
+                {
+                    return new List<FileControlsModel>();
+                }
+            }
+        }
+
+
         /// <summary>
         /// 创建时间
         /// </summary>
-using System;
+using NCC.Common.Model;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 namespace NCC.Education.Entitys.Dto.TbHomeInfo
 {
@@ -21,7 +24,22 @@ namespace NCC.Education.Entitys.Dto.TbHomeInfo
         /// 备注
         /// </summary>
         public string remark { get; set; }
-        
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string img { get; set; }
+
+        public List<FileControlsModel> Img { get
+            {
+                try
+                {
+                    return JsonConvert.DeserializeObject<List<FileControlsModel>>(img);
+                }catch(Exception ex)
+                {
+                    return new List<FileControlsModel>();   
+                }
+            } }
+
         /// <summary>
         /// 创建时间
         /// </summary>
@@ -117,7 +117,7 @@ namespace NCC.Education.TbPunch
         /// </summary>
         /// <param name="input">参数</param>
         /// <returns></returns>
-        [HttpPost("TbPunchCrInput")]
+        [HttpPost("StartPunch")]
         public async Task<dynamic> StartPunch([FromBody] TbPunchCrInput input)
         {
             var dbLink = await _dbLinkService.GetInfo("218239598550058245");
@@ -157,7 +157,7 @@ namespace NCC.Education.TbPunch
                 return new OutPutInfo()
                 {
                     SingleNum = model.Num.ToInt(),
-                    BothNum = bothModel.Num.ToInt(),
+                    BothNum =bothModel!=null?bothModel.Num.ToInt():0,
                     Days = sum
                 };
             }
@@ -175,7 +175,7 @@ namespace NCC.Education.TbPunch
         private void AddInterateNumBoth(TbBothSettingEntity model, TbPunchEntity entity)
         {
             //增加用户积分
-            var result = _db.Updateable<UserEntity>(it => new UserEntity { IntegralNum = it.IntegralNum.ToInt() + model.Num }).Where(o => o.Id == entity.UserId).ExecuteCommand();
+            var result = _db.Updateable<UserEntity>(it => new UserEntity { IntegralNum =SqlFunc.ToInt32(it.IntegralNum) + model.Num }).Where(o => o.Id == entity.UserId).ExecuteCommand();
             //增加积分日志
             var logResult = _db.Insertable(new TbMoneysLogEntity()
             {
@@ -192,7 +192,7 @@ namespace NCC.Education.TbPunch
         private void AddInterateNumSinge(TbSingleSettingEntity model, TbPunchEntity entity)
         {
             //增加用户积分
-            var result = _db.Updateable<UserEntity>(it => new UserEntity { IntegralNum = it.IntegralNum.ToInt() + model.Num }).Where(o => o.Id == entity.UserId).ExecuteCommand();
+            var result = _db.Updateable<UserEntity>(it => new UserEntity { IntegralNum =SqlFunc.ToInt32(it.IntegralNum)+ model.Num }).Where(o => o.Id == entity.UserId).ExecuteCommand();
             //增加积分日志
             var logResult = _db.Insertable(new TbMoneysLogEntity()
             {
@@ -283,10 +283,15 @@ namespace NCC.Education.TbPunch
             List<string> queryExerciseDate = input.exerciseDate != null ? input.exerciseDate.Split(',').ToObeject<List<string>>() : null;
             DateTime? startExerciseDate = queryExerciseDate != null ? Ext.GetDateTime(queryExerciseDate.First()) : null;
             DateTime? endExerciseDate = queryExerciseDate != null ? Ext.GetDateTime(queryExerciseDate.Last()) : null;
+            List<string> creatorTimeDate = input.creatorTime != null ? input.creatorTime.Split(',').ToObeject<List<string>>() : null;
+            DateTime? startcreatorTimeDate = creatorTimeDate != null ? Ext.GetDateTime(creatorTimeDate.First()) : null;
+            DateTime? endcreatorTimeDate = creatorTimeDate != null ? Ext.GetDateTime(creatorTimeDate.Last()) : null;
             var data = await _db.Queryable<TbPunchEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.userId), p => p.UserId.Equals(input.userId))
                 .WhereIF(queryExerciseDate != null, p => p.ExerciseDate >= new DateTime(startExerciseDate.ToDate().Year, startExerciseDate.ToDate().Month, startExerciseDate.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryExerciseDate != null, p => p.ExerciseDate <= new DateTime(endExerciseDate.ToDate().Year, endExerciseDate.ToDate().Month, endExerciseDate.ToDate().Day, 23, 59, 59))
+                 .WhereIF(creatorTimeDate != null, p => p.CreatorTime >= new DateTime(startcreatorTimeDate.ToDate().Year, startcreatorTimeDate.ToDate().Month, startcreatorTimeDate.ToDate().Day, 0, 0, 0))
+                .WhereIF(creatorTimeDate != null, p => p.CreatorTime <= new DateTime(endcreatorTimeDate.ToDate().Year, endcreatorTimeDate.ToDate().Month, endcreatorTimeDate.ToDate().Day, 23, 59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.code), p => p.Code.Contains(input.code))
                 .WhereIF(!string.IsNullOrEmpty(input.type), p => p.Type.Equals(input.type))
                 .Select(it=> new TbPunchListOutput
@@ -299,6 +304,7 @@ namespace NCC.Education.TbPunch
                     creatorTime=it.CreatorTime,
                     lastModifyTime=it.LastModifyTime,
                     type=it.Type,
+                    imgList=it.ImgList,
                 }).MergeTable().Mapper(p => {
                     p.user = _db.Queryable<UserEntity>().Where(o => o.Id == p.userId).First();
                 }).OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
@@ -105,6 +105,8 @@ namespace NCC.Education.TbPunchInfo
                     title=it.Title,
                     creatorTime=it.CreatorTime,
                     lastModifyTime=it.LastModifyTime,
+                    editors= it.Editors,
+                    img=it.Img,
                 }).MergeTable().Mapper(p =>
                 {
                     //当前用户阅读数量
@@ -105,6 +105,8 @@ namespace NCC.Education.TbEvaluation
                     title=it.Title,
                     creatorTime=it.CreatorTime,
                     lastModifyTime=it.LastModifyTime,
+                    editors = it.Editors,
+                    img =it.Img,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<TbEvaluationListOutput>.SqlSugarPageResult(data);
         }
@@ -106,6 +106,7 @@ namespace NCC.Education.TbHomeInfo
                     remark=it.Remark,
                     creatorTime=it.CreatorTime,
                     lastModifyTime=it.LastModifyTime,
+                    img=it.Img,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<TbHomeInfoListOutput>.SqlSugarPageResult(data);
         }
@@ -99,15 +99,15 @@
       "WEPAY_APP_URL": "",
       "WEPAY_APP_KEY": "",
       //公众号平台配置
-      "WEPAY_WEB_APPID": "wx2ad028e8f5a3e6c0",
+      "WEPAY_WEB_APPID": "wx5b2942cc4a832ca4",
       "WEPAY_WEB_MCH_ID": "1635119465", //商户号 
       "WEPAY_WEB_NOTIFY_URL": "http://localhost:8061/api/Hairdressing/tbuserorder/WePayNotifyUserOrder", //微信支付回调地址
       "WEPAY_WEB_URL": "https://uu365.t1j2.com/",
       "WEPAY_WEB_KEY": "QvzO0StUx5hpvYsNY0sRMSldYmtGY2bE", //微信商户秘钥 
       //小程序 
-      "APPLETE_APPSECRET": "ca62af33bb382ac9688907db01740b15",
-      "APPLETE_APPID": "wx2ad028e8f5a3e6c0"
+      "APPLETE_APPSECRET": "f065790516f790f0ae935524d3fed203",
+      "APPLETE_APPID": "wx5b2942cc4a832ca4"
     },
     /*  支付宝支付配置  */
@@ -164,8 +164,8 @@
   "NCC_App": {
     "CodeAreasName": "Education",
     //系统文件路径(末尾必须带斜杆)
-    //"SystemPath": "C:\\web\\NCC\\uu-resources\\",
-    "SystemPath": "C:\\inetpub\\wwwroot\\教育小程序\\UploadFile\\",
+    "SystemPath": "C:\\web\\NCC\\uu-resources\\",
+    //"SystemPath": "C:\\inetpub\\wwwroot\\教育小程序\\UploadFile\\",
     //微信公众号允许上传文件类型
     "MPUploadFileType": "bmp,png,jpeg,jpg,gif,mp3,wma,wav,amr,mp4",
     //微信允许上传文件类型
@@ -169,8 +169,8 @@ namespace NCC.OAuth.Service
             if (user.DeleteMark == 1)
                 throw NCCException.Oh(ErrorCode.D1017);
             // app权限验证
-            if (NetUtil.isMobileBrowser && user.IsAdministrator == 0 && !ExistRoleByApp(user.RoleId))
-                throw NCCException.Oh(ErrorCode.D1022);
+            //if (NetUtil.isMobileBrowser && user.IsAdministrator == 0 && !ExistRoleByApp(user.RoleId))
+            //    throw NCCException.Oh(ErrorCode.D1022);
             //登录成功时 判断单点登录信息
@@ -259,7 +259,8 @@ namespace NCC.OAuth.Service
             return new LoginOutput()
             {
                 theme = user.Theme == null ? "classic" : user.Theme,
-                token = "Bearer " + accessToken
+                token = "Bearer " + accessToken,
+                user=user
             };
         }
@@ -31,6 +31,7 @@ using System.Threading.Tasks;
 using UAParser;
 using NCC.Common.Model;
 using Yitter.IdGenerator;
+using NPOI.OpenXmlFormats;
 namespace NCC.System.Service.Permission
 {
@@ -120,6 +121,14 @@ namespace NCC.System.Service.Permission
             /// 入学年份
             /// </summary>
             public string year { get; set; }
+            /// <summary>
+            /// 头像
+            /// </summary>
+            public string headIcon { get; set; }
+            /// <summary>
+            /// 是否首次登录 1--非首次登录  2--首次登录
+            /// </summary>
+            public string status { get; set; }
             #endregion
         }
         /// <summary>
@@ -130,6 +139,7 @@ namespace NCC.System.Service.Permission
         [HttpPost("GetUserInfoByUserId")]
         public async Task<dynamic> GetUserInfoByUserId(string UserId)
         {
+            var user = _userRepository.Context.Queryable<UserEntity>().Where(o => o.Id == UserId).First();
             var model = _userRepository.Context.Queryable<UserEntity>().Where(o => o.Id == UserId).Select(it => new UserInfoCustom
             {
                 id = it.Id,
@@ -142,7 +152,9 @@ namespace NCC.System.Service.Permission
                 postalAddress = it.PostalAddress,
                 realName = it.RealName,
                 type = it.Type,
-                year = it.Year.ToString()
+                year = it.Year.ToString(),
+                headIcon = it.HeadIcon,
+                status = user.Type == "1" ? "2" : "1"
             }).First();
             return model;
         }