From 06b371a8a24020c867493adc891c7be75b9d7db2 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 24 Sep 2025 09:13:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9F=BA=E7=A1=80=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- admin-hanhai-vue/.env | 2 +- admin-hanhai-vue/.env.development | 3 +- admin-hanhai-vue/.env.production | 3 +- admin-hanhai-vue/public/index.html | 4 +- admin-hanhai-vue/src/assets/logo.png | Bin 7749 -> 9309 bytes .../src/components/layouts/TabLayout.vue | 2 +- .../src/components/layouts/UserLayout.vue | 2 +- .../src/components/page/GlobalHeader.vue | 4 +- admin-hanhai-vue/src/components/tools/Logo.vue | 2 +- assessment-admin.iml | 4 +- .../src/main/resources/pay_weixin.properties | 19 +- .../system/api/fallback/SysBaseAPIFallback.java | 6 + .../main/java/org/jeecg/common/api/CommonAPI.java | 7 + .../main/java/org/jeecg/config/Swagger2Config.java | 2 +- .../java/org/jeecg/config/shiro/ShiroConfig.java | 2 + .../java/org/jeecg/config/shiro/ShiroRealm.java | 30 ++ .../controller/AssessmentAnswerLogController.java | 2 +- .../entity/AssessmentAnswerLog.java | 4 +- .../mapper/AssessmentAnswerLogMapper.java | 2 +- .../service/IAssessmentAnswerLogService.java | 2 +- .../impl/AssessmentAnswerLogServiceImpl.java | 2 +- .../vue/AssessmentAnswerLogList.vue | 4 +- .../vue/modules/AssessmentAnswerLogForm.vue | 4 +- .../vue3/AssessmentAnswerLog.data.ts | 4 +- .../entity/AssessmentQuestion.java | 9 + .../controller/AssessmentReportUserController.java | 171 +++++++++ .../entity/AssessmentReportUser.java | 75 ++++ .../mapper/AssessmentReportUserMapper.java | 17 + .../mapper/xml/AssessmentReportUserMapper.xml | 5 + .../service/IAssessmentReportUserService.java | 14 + .../impl/AssessmentReportUserServiceImpl.java | 19 + .../vue/AssessmentReportUserList.vue | 202 ++++++++++ .../vue/modules/AssessmentReportUserForm.vue | 133 +++++++ .../AssessmentReportUserModal.Style#Drawer.vue | 84 +++++ .../vue/modules/AssessmentReportUserModal.vue | 60 +++ .../vue3/AssessmentReportUser.api.ts | 61 +++ .../vue3/AssessmentReportUser.data.ts | 82 ++++ .../vue3/AssessmentReportUserList.vue | 162 ++++++++ .../vue3/components/AssessmentReportUserModal.vue | 58 +++ jeecg-boot-module-system/pom.xml | 1 + .../api/assessmentController/ConfigController.java | 48 +++ .../api/assessmentController/ExamController.java | 75 ++++ .../assessmentController/LoginApiController.java | 41 ++ .../api/assessmentController/ReportController.java | 50 +++ .../assessmentController/UserInfoController.java | 59 +++ .../java/org/jeecg/modules/api/bean/PageBean.java | 19 + .../jeecg/modules/api/service/ConfigService.java | 21 ++ .../org/jeecg/modules/api/service/ExamService.java | 34 ++ .../jeecg/modules/api/service/LoginApiService.java | 14 + .../jeecg/modules/api/service/ReportService.java | 22 ++ .../jeecg/modules/api/service/UserInfoService.java | 26 ++ .../api/service/impl/ConfigServiceImpl.java | 132 +++++++ .../modules/api/service/impl/ExamServiceImpl.java | 414 +++++++++++++++++++++ .../api/service/impl/LoginApiServiceImpl.java | 174 +++++++++ .../api/service/impl/ReportServiceImpl.java | 246 ++++++++++++ .../api/service/impl/UserInfoServiceImpl.java | 169 +++++++++ .../org/jeecg/modules/api/utils/CommonUtils.java | 45 +++ .../system/service/impl/SysBaseApiImpl.java | 17 + .../src/main/resources/application-dev.yml | 2 +- 60 files changed, 2840 insertions(+), 39 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/controller/AssessmentReportUserController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/entity/AssessmentReportUser.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/mapper/AssessmentReportUserMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/mapper/xml/AssessmentReportUserMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/IAssessmentReportUserService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/impl/AssessmentReportUserServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/AssessmentReportUserList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUserList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/components/AssessmentReportUserModal.vue create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ExamController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/LoginApiController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ReportController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/UserInfoController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/PageBean.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExamService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ReportService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/CommonUtils.java diff --git a/README.md b/README.md index 006219f..2a567d6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # assessment-admin -风险测评后端代码仓库 \ No newline at end of file +易税通财税风险检测后端代码仓库 \ No newline at end of file diff --git a/admin-hanhai-vue/.env b/admin-hanhai-vue/.env index 1d3d222..f75e04e 100644 --- a/admin-hanhai-vue/.env +++ b/admin-hanhai-vue/.env @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_PLATFORM_NAME=风险测评 +VUE_APP_PLATFORM_NAME=易税通财税风险检测 # 开启单点登录 VUE_APP_SSO=false # 开启微应用模式 diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index 33a8515..36dbd49 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,6 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8000/assessment-admin/ +//VUE_APP_API_BASE_URL=https://assessment.augcl.com/assessment-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/assessment-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 237f6e3..a6bd0ab 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,5 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8000/assessment-admin/ +//VUE_APP_API_BASE_URL=https://assessment.augcl.com/assessment-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/assessment-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-hanhai-vue/public/index.html b/admin-hanhai-vue/public/index.html index b393a77..692ad26 100644 --- a/admin-hanhai-vue/public/index.html +++ b/admin-hanhai-vue/public/index.html @@ -5,7 +5,7 @@ - 风险测评 + 易税通财税风险检测 \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserForm.vue new file mode 100644 index 0000000..ef798e6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserForm.vue @@ -0,0 +1,133 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.Style#Drawer.vue new file mode 100644 index 0000000..004ca0e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.vue new file mode 100644 index 0000000..5ff941d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/modules/AssessmentReportUserModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.api.ts new file mode 100644 index 0000000..44ef939 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/assessmentReportUser/assessmentReportUser/list', + save='/assessmentReportUser/assessmentReportUser/add', + edit='/assessmentReportUser/assessmentReportUser/edit', + deleteOne = '/assessmentReportUser/assessmentReportUser/delete', + deleteBatch = '/assessmentReportUser/assessmentReportUser/deleteBatch', + importExcel = '/assessmentReportUser/assessmentReportUser/importExcel', + exportXls = '/assessmentReportUser/assessmentReportUser/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts new file mode 100644 index 0000000..d1e08d6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts @@ -0,0 +1,82 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '报告标题', + align:"center", + dataIndex: 'title' + }, + { + title: '批次标识', + align:"center", + dataIndex: 'batchNo' + }, + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '手机号', + align:"center", + dataIndex: 'phone' + }, + { + title: '公司名称', + align:"center", + dataIndex: 'company' + }, + { + title: '关联用户', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '报告标题', + field: 'title', + component: 'Input', + }, + { + label: '批次标识', + field: 'batchNo', + component: 'Input', + }, + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '手机号', + field: 'phone', + component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: false}, + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + ]; + }, + }, + { + label: '公司名称', + field: 'company', + component: 'Input', + }, + { + label: '关联用户', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUserList.vue new file mode 100644 index 0000000..7eecc4b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUserList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/components/AssessmentReportUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/components/AssessmentReportUserModal.vue new file mode 100644 index 0000000..32adbf4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/components/AssessmentReportUserModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/pom.xml b/jeecg-boot-module-system/pom.xml index 4ae1645..37e366d 100644 --- a/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot-module-system/pom.xml @@ -77,6 +77,7 @@ + assessment-admin org.springframework.boot diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java new file mode 100644 index 0000000..85b03c9 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ConfigController.java @@ -0,0 +1,48 @@ +package org.jeecg.modules.api.assessmentController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.ConfigService; +import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="系统配置-相关接口") +@RestController +@RequestMapping("/assessment/config") +@Slf4j +public class ConfigController { + + /******************************************************************************************************************/ + //配置信息 + @Resource + private ConfigService configService; + /******************************************************************************************************************/ + + //查看系统配置列表 + @ApiOperation(value="系统配置-查询系统配置列表", notes="系统配置-查询系统配置列表") + @RequestMapping(value = "/queryConfigList", method = {RequestMethod.GET}) + public Result queryConfigList(PageBean pageBean){ + return configService.queryConfigList(pageBean); + } + + //查看系统配置详情 + @ApiOperation(value="系统配置-查询系统配置详情", notes="系统配置-查询系统配置详情") + @RequestMapping(value = "/queryConfigByParamCode", method = {RequestMethod.GET}) + public Result queryConfigByParamCode(String paramCode){ + return configService.queryConfigByParamCode(paramCode); + } + + @ApiOperation(value="首页-查询banner图列表", notes="type：0-首页") + @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET}) + public Result queryBannerList(AssessmentBanner assessmentBanner, PageBean pageBean){ + return configService.queryBannerList(assessmentBanner, pageBean); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ExamController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ExamController.java new file mode 100644 index 0000000..3ace238 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ExamController.java @@ -0,0 +1,75 @@ +package org.jeecg.modules.api.assessmentController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.ConfigService; +import org.jeecg.modules.api.service.ExamService; +import org.jeecg.modules.assessmentAnswerLog.entity.AssessmentAnswerLog; +import org.jeecg.modules.assessmentPayLog.entity.AssessmentPayLog; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags="测评-相关接口") +@RestController +@RequestMapping("/assessment/exam") +@Slf4j +public class ExamController { + + /******************************************************************************************************************/ + //配置信息 + @Resource + private ExamService examService; + /******************************************************************************************************************/ + //查询题库列表 + @ApiOperation(value="测评-开始测评(查询题库列表)", notes="测评-查询题库列表") + @RequestMapping(value = "/queryCategoryList", method = {RequestMethod.GET}) + public Result queryCategoryList(PageBean pageBean){ + return examService.queryCategoryList(pageBean); + } + + //查询答题列表 + @ApiOperation(value="测评-开始答题(查询题目列表)", notes="categories：以;分隔题库id") + @RequestMapping(value = "/queryQuestionList", method = {RequestMethod.GET}) + public Result queryQuestionList(@RequestHeader("X-Access-Token") String token, String categories){ + return examService.queryQuestionList(token, categories); + } + + //测评-提交答案 + @ApiOperation(value="测评-提交答案", notes="测评-提交答案") + @RequestMapping(value = "/updateAnswer", method = {RequestMethod.GET}) + public Result updateAnswer(@RequestHeader("X-Access-Token") String token, AssessmentAnswerLog assessmentAnswerLog){ + return examService.updateAnswer(token, assessmentAnswerLog); + } + + //我的-我的答题 + @ApiOperation(value="我的-我的答题", notes="我的-我的答题") + @RequestMapping(value = "/queryExamLogList", method = {RequestMethod.GET}) + public Result queryExamLogList(@RequestHeader("X-Access-Token") String token, String isFinished, PageBean pageBean){ + return examService.queryExamLogList(token, isFinished, pageBean); + } + + //测评-继续答题 + @ApiOperation(value="测评-继续答题", notes="测评-继续答题") + @RequestMapping(value = "/queryExamById", method = {RequestMethod.GET}) + public Result queryExamById(@RequestHeader("X-Access-Token") String token, String examId){ + return examService.queryExamById(token, examId); + } + + //支付-创建订单 + @ApiOperation(value="支付-立即支付(创建订单)", notes="支付-立即支付(创建订单)") + @RequestMapping(value = "/createOrder", method = {RequestMethod.POST}) + public Result createOrder(@RequestHeader("X-Access-Token") String token, AssessmentPayLog assessmentPayLog){ + return examService.createOrder(token, assessmentPayLog); + } + + //支付回调 + @PostMapping("/payOrderNotify") + public Object payOrderNotify(@RequestBody String requestBody){ + return examService.payOrderNotify(requestBody); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/LoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/LoginApiController.java new file mode 100644 index 0000000..35ef632 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/LoginApiController.java @@ -0,0 +1,41 @@ +package org.jeecg.modules.api.assessmentController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.service.LoginApiService; +import org.jeecg.modules.bean.LoginReq; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="登录-相关接口") +@RestController +@RequestMapping("/assessment/login") +@Slf4j +public class LoginApiController { + + /******************************************************************************************************************/ + //登录信息 + @Resource + private LoginApiService loginApiService; + /******************************************************************************************************************/ + + //小程序-微信授权登录接口 + @ApiOperation(value="小程序-微信授权登录接口", notes="小程序-微信授权登录接口") + @GetMapping("/login") + public Result login(LoginReq loginReq){ + return loginApiService.login(loginReq); + } + + //绑定手机号码 + @ApiOperation(value="小程序-绑定手机号码", notes="小程序-绑定手机号码") + @GetMapping(value = "/bindPhone") + public Result bindPhone(String phoneCode){ + return loginApiService.bindPhone(phoneCode); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ReportController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ReportController.java new file mode 100644 index 0000000..b6a25ca --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/ReportController.java @@ -0,0 +1,50 @@ +package org.jeecg.modules.api.assessmentController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.ConfigService; +import org.jeecg.modules.api.service.ReportService; +import org.jeecg.modules.assessmentReportUser.entity.AssessmentReportUser; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="报告-相关接口") +@RestController +@RequestMapping("/assessment/report") +@Slf4j +public class ReportController { + + /******************************************************************************************************************/ + //配置信息 + @Resource + private ReportService reportService; + /******************************************************************************************************************/ + //新增测评报告基本信息 + @ApiOperation(value="测评-新增测评报告基本信息", notes="测评-新增报告基本信息") + @RequestMapping(value = "/addReport", method = {RequestMethod.POST}) + public Result addReport(@RequestHeader("X-Access-Token") String token, AssessmentReportUser assessmentReportUser){ + return reportService.addReport(token, assessmentReportUser); + } + + //查看报告列表 + @ApiOperation(value="报告-查询报告列表", notes="报告-查询报告列表") + @RequestMapping(value = "/queryReportList", method = {RequestMethod.GET}) + public Result queryReportList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return reportService.queryReportList(token, pageBean); + } + + //查看报告详情 + @ApiOperation(value="报告-查询报告详情", notes="报告-查询报告详情") + @RequestMapping(value = "/queryReportById", method = {RequestMethod.GET}) + public Result queryReportById(@RequestHeader("X-Access-Token") String token, String batchNo){ + return reportService.queryReportById(token, batchNo); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/UserInfoController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/UserInfoController.java new file mode 100644 index 0000000..93755b0 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/assessmentController/UserInfoController.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.api.assessmentController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.UserInfoService; +import org.jeecg.modules.assessmentFeedback.entity.AssessmentFeedback; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="我的-相关接口") +@RestController +@RequestMapping("/assessment/userInfo") +@Slf4j +public class UserInfoController { + + /******************************************************************************************************************/ + @Resource + private UserInfoService userInfoService; + /******************************************************************************************************************/ + + //获取个人信息 + @ApiOperation(value="我的资料-获取个人信息", notes="我的资料-获取个人信息") + @RequestMapping(value = "/queryUser", method = {RequestMethod.GET}) + public Result queryUser(@RequestHeader("X-Access-Token") String token){ + return userInfoService.queryUserInfo(token); + } + + //修改个人信息 + @ApiOperation(value="我的资料-修改个人信息", notes="我的资料-修改个人信息") + @RequestMapping(value = "/updateUser", method = {RequestMethod.POST}) + public Result updateUser(@RequestHeader("X-Access-Token") String token, HanHaiMember member){ + return userInfoService.updateUserInfo(token, member); + } + + //咨询客服-常见问题列表 + @ApiOperation(value="咨询客服-常见问题列表", notes="咨询客服-常见问题列表") + @RequestMapping(value = "/queryFaqList", method = {RequestMethod.GET}) + public Result queryFaqList(PageBean pageBean){ + return userInfoService.queryFaqList(pageBean); + } + + //我的-意见反馈 + @ApiOperation(value="我的-意见反馈", notes="我的-意见反馈") + @RequestMapping(value = "/addFeedback", method = {RequestMethod.POST}) + public Result addFeedback(@RequestHeader("X-Access-Token") String token, AssessmentFeedback assessmentFeedback){ + return userInfoService.addFeedback(token, assessmentFeedback); + } + + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/PageBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/PageBean.java new file mode 100644 index 0000000..e2fe1a1 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/PageBean.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.api.bean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PageBean { + /**显示条数*/ + @ApiModelProperty(value = "显示条数" ) + private Integer pageSize; + /**当前页*/ + @ApiModelProperty(value = "当前页" ) + private Integer pageNo; + + public PageBean() { + this.pageNo = 1; + this.pageSize = 1000; + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java new file mode 100644 index 0000000..08aa6f0 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.api.service; + +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +public interface ConfigService { + + //查询系统配置列表 + public Result queryConfigList(PageBean pageBean); + + //查询系统配置详情 + public Result queryConfigByParamCode(String paramCode); + + //首页-查询banner图列表 + public Result queryBannerList(AssessmentBanner assessmentBanner, PageBean pageBean); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExamService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExamService.java new file mode 100644 index 0000000..4816dfa --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExamService.java @@ -0,0 +1,34 @@ +package org.jeecg.modules.api.service; + +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.assessmentAnswerLog.entity.AssessmentAnswerLog; +import org.jeecg.modules.assessmentPayLog.entity.AssessmentPayLog; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +public interface ExamService { + + //查询题库列表 + public Result queryCategoryList(PageBean pageBean); + + //查询答题列表 + public Result queryQuestionList(String token, String categories); + + //测评-提交答案 + public Result updateAnswer(String token, AssessmentAnswerLog assessmentAnswerLog); + + //我的-我的答题 + public Result queryExamLogList(String token, String isFinished, PageBean pageBean); + + //测评-继续答题 + public Result queryExamById(String token, String examId); + + //支付-创建订单 + public Result createOrder(String token, AssessmentPayLog assessmentPayLog); + + //支付回调 + Object payOrderNotify(String requestBody); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java new file mode 100644 index 0000000..2971225 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.api.service; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.bean.LoginReq; + +public interface LoginApiService { + + //小程序-微信授权登录接口 + public Result login(LoginReq loginReq); + + //绑定手机号码 + public Result bindPhone(String phoneCode); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ReportService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ReportService.java new file mode 100644 index 0000000..0891c90 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ReportService.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.api.service; + +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.assessmentReportUser.entity.AssessmentReportUser; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +public interface ReportService { + + //新增测评报告基本信息 + public Result addReport(@RequestHeader("X-Access-Token") String token, AssessmentReportUser assessmentReportUser); + + //查看报告列表 + public Result queryReportList(@RequestHeader("X-Access-Token") String token, PageBean pageBean); + + //查看报告详情 + public Result queryReportById(@RequestHeader("X-Access-Token") String token, String batchNo); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java new file mode 100644 index 0000000..b262780 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.api.service; + +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.assessmentFeedback.entity.AssessmentFeedback; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +public interface UserInfoService { + + //获取个人信息 + Result queryUserInfo(String token); + + //修改个人信息 + Result updateUserInfo(String token, HanHaiMember member); + + //咨询客服-常见问题列表 + public Result queryFaqList(PageBean pageBean); + + //我的-意见反馈 + public Result addFeedback(@RequestHeader("X-Access-Token") String token, AssessmentFeedback assessmentFeedback); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java new file mode 100644 index 0000000..8dc5db1 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java @@ -0,0 +1,132 @@ +package org.jeecg.modules.api.service.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.ConfigService; +import org.jeecg.modules.assessmentBanner.entity.AssessmentBanner; +import org.jeecg.modules.assessmentBanner.service.IAssessmentBannerService; +import org.jeecg.modules.assessmentConfig.entity.AssessmentConfig; +import org.jeecg.modules.assessmentConfig.service.IAssessmentConfigService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +@Slf4j +public class ConfigServiceImpl implements ConfigService { + + /******************************************************************************************************************/ + //配置信息 + @Resource + private IAssessmentConfigService assessmentConfigService; + //轮播图信息 + @Resource + private IAssessmentBannerService assessmentBannerService; + /******************************************************************************************************************/ + + //查询系统配置列表 + @Override + public Result queryConfigList(PageBean pageBean) { + log.info("开始查询系统配置列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = assessmentConfigService + .lambdaQuery(); + + //组装查询条件 + //按照创建时间降序排列 + query.orderByDesc(AssessmentConfig::getCreateTime); + + //获取系统配置列表信息 + pageList = query.page(page); + + log.info("系统配置查询结束"); + return Result.OK("系统配置列表", pageList); + }catch (Exception e){ + log.error("系统配置查询失败"); + e.printStackTrace(); + return Result.error("系统配置列表查询失败"); + } + } + + //查询系统配置详情 + @Override + public Result queryConfigByParamCode(String paramCode) { + log.info("开始查询系统配置详情"); + //返回信息 + String massege = ""; + + try{ + AssessmentConfig config = assessmentConfigService + .lambdaQuery() + .eq(AssessmentConfig::getParamCode, paramCode) + .one(); + + log.info("系统配置详情查询结束"); + return Result.OK("配置详情", config); + }catch (Exception e){ + log.error("系统配置详情查询失败"); + e.printStackTrace(); + return Result.error("配置详情查询失败"); + } + } + + //首页-查询banner图列表 + @Override + public Result queryBannerList(AssessmentBanner assessmentBanner, PageBean pageBean) { + log.info("开始查询轮播图列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = assessmentBannerService + .lambdaQuery(); + + //组装查询条件 + if(StringUtils.isNotBlank(assessmentBanner.getTitle())){ + //标题 + query.like(AssessmentBanner::getTitle, assessmentBanner.getTitle()); + } + if(StringUtils.isNotBlank(assessmentBanner.getType())){ + //分类 + query.eq(AssessmentBanner::getType, assessmentBanner.getType()); + } + + //按照排序编号升序排列 + query.orderByAsc(AssessmentBanner::getOrderNo); + + //获取轮播图列表 + pageList = query.page(page); + + log.info("轮播图列表查询结束"); + return Result.OK("轮播图列表", pageList); + }catch (Exception e){ + log.info("轮播图列表查询失败"); + e.printStackTrace(); + return Result.error("轮播图列表查询失败"); + } + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java new file mode 100644 index 0000000..d71ac9a --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java @@ -0,0 +1,414 @@ +package org.jeecg.modules.api.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.ExamService; +import org.jeecg.modules.api.utils.CommonUtils; +import org.jeecg.modules.assessmentAnswerLog.entity.AssessmentAnswerLog; +import org.jeecg.modules.assessmentAnswerLog.service.IAssessmentAnswerLogService; +import org.jeecg.modules.assessmentCategory.entity.AssessmentCategory; +import org.jeecg.modules.assessmentCategory.service.IAssessmentCategoryService; +import org.jeecg.modules.assessmentConfig.entity.AssessmentConfig; +import org.jeecg.modules.assessmentExamLog.entity.AssessmentExamLog; +import org.jeecg.modules.assessmentExamLog.service.IAssessmentExamLogService; +import org.jeecg.modules.assessmentExamReport.entity.AssessmentExamReport; +import org.jeecg.modules.assessmentExamReport.service.IAssessmentExamReportService; +import org.jeecg.modules.assessmentPayLog.entity.AssessmentPayLog; +import org.jeecg.modules.assessmentPayLog.service.IAssessmentPayLogService; +import org.jeecg.modules.assessmentQuestion.entity.AssessmentAnswer; +import org.jeecg.modules.assessmentQuestion.entity.AssessmentQuestion; +import org.jeecg.modules.assessmentQuestion.service.IAssessmentAnswerService; +import org.jeecg.modules.assessmentQuestion.service.IAssessmentQuestionService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.pay.MpWxPayService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.*; + +@Service +@Slf4j +public class ExamServiceImpl implements ExamService { + + /******************************************************************************************************************/ + //支付接口 + @Autowired + private MpWxPayService mpWxPayService; + //权限验证 + @Resource + private ShiroRealm shiroRealm; + //用户信息 + @Resource + private IHanHaiMemberService hanHaiMemberService; + //题库信息 + @Resource + private IAssessmentCategoryService assessmentCategoryService; + //题库题目信息 + @Resource + private IAssessmentQuestionService assessmentQuestionService; + //题目答案信息 + @Resource + private IAssessmentAnswerService assessmentAnswerService; + //用户测评答题记录信息 + @Resource + private IAssessmentExamLogService assessmentExamLogService; + //用户测评答案记录信息 + @Resource + private IAssessmentAnswerLogService assessmentAnswerLogService; + //用户测评答案记录信息 + @Resource + private IAssessmentExamReportService assessmentExamReportService; + //支付记录信息 + @Resource + private IAssessmentPayLogService assessmentPayLogService; + /******************************************************************************************************************/ + + //查询题库列表 + @Override + public Result queryCategoryList(PageBean pageBean) { + log.info("开始查询题库列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = assessmentCategoryService + .lambdaQuery(); + + //组装查询条件 + //按照创建时间降序排列 + query.orderByDesc(AssessmentCategory::getCreateTime); + + //获取题库列表信息 + pageList = query.page(page); + + log.info("题库查询结束"); + return Result.OK("题库列表", pageList); + }catch (Exception e){ + log.error("题库查询失败"); + e.printStackTrace(); + return Result.error("题库列表查询失败"); + } + } + + //查询答题列表 + @Override + public Result queryQuestionList(String token, String categories) { + log.info("开始查询答题列表"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Map map = new HashedMap(); + List pageList = null; + + try{ + query = assessmentQuestionService.lambdaQuery(); + + //组装查询条件 + //所属题库 + if(StringUtils.isNotEmpty(categories)){ + String[] categoryList = categories.split(";"); + List ids = Arrays.asList(categoryList); + query.in(AssessmentQuestion::getCategoryId, ids); + + } + + //随机排列 + query.orderByDesc(AssessmentQuestion::getCreateTime); + + //获取答题列表列表信息 + pageList = query.list(); + + //题目答案 + for (AssessmentQuestion assessmentQuestion : pageList) { + List answerList = assessmentAnswerService.lambdaQuery().eq(AssessmentAnswer::getQuestionId, assessmentQuestion.getId()).list(); + assessmentQuestion.setAnswerList(answerList); + } + + //随机排序 + Collections.shuffle(pageList); + map.put("pageList", pageList); + + + String batchNo = IdWorker.getIdStr();//生成批次标识 + map.put("batchNo", batchNo); + //生成用户测评答题记录 + AssessmentExamLog assessmentExamLog = new AssessmentExamLog(); + assessmentExamLog.setBatchNo(batchNo);//批次标识 + assessmentExamLog.setAllNum(pageList.size()); + assessmentExamLog.setFinishNum(0); + assessmentExamLog.setRemainNum(pageList.size()); + assessmentExamLog.setUserId(hanHaiMember.getId()); + boolean result1 = assessmentExamLogService.save(assessmentExamLog); + if(!result1){ + return Result.error("生成用户测评答题记录失败"); + } + + //生成用户测评答案记录 + List assessmentAnswerLogList = new ArrayList<>(); + for (AssessmentQuestion assessmentQuestion : pageList) { + AssessmentAnswerLog assessmentAnswerLog = new AssessmentAnswerLog(); + assessmentAnswerLog.setBatchNo(batchNo); + assessmentAnswerLog.setQuestionId(assessmentQuestion.getId()); + assessmentAnswerLog.setUserId(hanHaiMember.getId()); + assessmentAnswerLogList.add(assessmentAnswerLog); + } + boolean result2 = assessmentAnswerLogService.saveBatch(assessmentAnswerLogList); + if(!result2){ + return Result.error("生成用户测评答案记录失败"); + } + + log.info("答题列表查询结束"); + return Result.OK("答题列表列表", map); + }catch (Exception e){ + log.error("答题列表查询失败"); + e.printStackTrace(); + return Result.error("答题列表列表查询失败"); + } + } + + //测评-提交答案 + @Override + public Result updateAnswer(String token, AssessmentAnswerLog assessmentAnswerLog) { + log.info("开始修改用户测评答案记录"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + + try{ + //修改用户测评答案记录 + boolean result = assessmentAnswerLogService + .lambdaUpdate() + .eq(AssessmentAnswerLog::getBatchNo, assessmentAnswerLog.getBatchNo()) + .eq(AssessmentAnswerLog::getQuestionId, assessmentAnswerLog.getQuestionId()) + .eq(AssessmentAnswerLog::getUserId, hanHaiMember.getId()) + .set(AssessmentAnswerLog::getAnswerId, assessmentAnswerLog.getAnswerId()) + .update(); + if(!result){ + return Result.error("答题失败"); + } + + //修改用户测评答题记录 + AssessmentExamLog assessmentExamLog = assessmentExamLogService + .lambdaQuery() + .eq(AssessmentExamLog::getBatchNo, assessmentAnswerLog.getBatchNo()) + .eq(AssessmentExamLog::getUserId, hanHaiMember.getId()) + .one(); + int newFinishNum = assessmentExamLog.getFinishNum() + 1; + int newRemainNum = assessmentExamLog.getRemainNum() - 1; + assessmentExamLog.setFinishNum(newFinishNum); + assessmentExamLog.setRemainNum(newRemainNum); + assessmentExamLogService.updateById(assessmentExamLog); + + return Result.OK("操作成功"); + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("操作失败"); + } + } + + //我的-我的答题 + @Override + public Result queryExamLogList(String token, String isFinished, PageBean pageBean) { + log.info("开始查询答题列表"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = assessmentExamLogService + .lambdaQuery(); + + //组装查询条件 + //关联用户 + query.eq(AssessmentExamLog::getUserId, hanHaiMember.getId()); + + if(StringUtils.isNotEmpty(isFinished)){ + if("0".equals(isFinished)){ + query.eq(AssessmentExamLog::getFinishNum, 0); + }else { + query.notIn(AssessmentExamLog::getFinishNum, 0); + } + } + + //随机排列 + query.orderByDesc(AssessmentExamLog::getCreateTime); + + //获取答题列表列表信息 + pageList = query.page(page); + + log.info("答题列表查询结束"); + return Result.OK("答题列表", pageList); + }catch (Exception e){ + log.error("答题列表查询失败"); + e.printStackTrace(); + return Result.error("答题列表查询失败"); + } + } + + //测评-继续答题 + @Override + public Result queryExamById(String token, String examId) { + log.info("开始查询答题列表"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Map map = new HashedMap(); + List pageList = null; + + try{ + //1、查看答题记录 + if(StringUtils.isEmpty(examId)){ + return Result.error("答题记录id不能为空"); + } + AssessmentExamLog assessmentExamLog = assessmentExamLogService.getById(examId); + if(null == assessmentExamLog){ + return Result.error("答题记录不存在，请检查传入id"); + } + map.put("batchNo", assessmentExamLog.getBatchNo()); + + //1、查看答案记录 + List questionIds = new ArrayList<>(); + List assessmentAnswerLogList = assessmentAnswerLogService + .lambdaQuery() + .eq(AssessmentAnswerLog::getBatchNo, assessmentExamLog.getBatchNo()) + .eq(AssessmentAnswerLog::getUserId, hanHaiMember.getId()) + .isNull(AssessmentAnswerLog::getAnswerId) + .list(); + for (AssessmentAnswerLog assessmentAnswerLog : assessmentAnswerLogList) { + questionIds.add(assessmentAnswerLog.getQuestionId()); + } + + query = assessmentQuestionService.lambdaQuery(); + + //组装查询条件 + //未答完的题目 + query.in(AssessmentQuestion::getId, questionIds); + + //随机排列 + query.orderByDesc(AssessmentQuestion::getCreateTime); + + //获取答题列表列表信息 + pageList = query.list(); + + //题目答案 + for (AssessmentQuestion assessmentQuestion : pageList) { + List answerList = assessmentAnswerService.lambdaQuery().eq(AssessmentAnswer::getQuestionId, assessmentQuestion.getId()).list(); + assessmentQuestion.setAnswerList(answerList); + } + + //随机排序 + Collections.shuffle(pageList); + map.put("pageList", pageList); + + log.info("答题列表查询结束"); + return Result.OK("答题列表", map); + }catch (Exception e){ + log.error("答题列表查询失败"); + e.printStackTrace(); + return Result.error("答题列表查询失败"); + } + } + + //支付-创建订单 + @Override + public Result createOrder(String token, AssessmentPayLog assessmentPayLog) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + + try{ + //订单信息 + String payNo = IdWorker.getIdStr();//生成订单号 + assessmentPayLog.setId(payNo); + assessmentPayLog.setUserId(hanHaiMember.getId()); + + //创建订单 + assessmentPayLogService.save(assessmentPayLog); + + //订单支付 + //吊起微信支付 + BigDecimal price = assessmentPayLog.getPayAmount();//价格 + + String s = price.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买"+ "测评报告：" + assessmentPayLog.getBatchNo(), + "127.0.0.1", + assessmentPayLog.getId(), + i1, + assessmentPayLog.getId(), + hanHaiMember.getAppletOpenid(), //用户openid(小程序) + assessmentPayLog.toString()); + return Result.OK("支付成功",appOrder); + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("支付失败"); + } + } + + //订单支付回调 + public Result payOrderNotify(String requestBody){ + WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); + String outTradeNo = notify.getOutTradeNo(); + log.info("支付回调订单号码："+outTradeNo); + + try{ + //查询订单信息 + AssessmentPayLog assessmentPayLog = assessmentPayLogService.getById(outTradeNo); + //如果订单存在则修改订单状态 + if (null != assessmentPayLog){ + if("0".equals(assessmentPayLog.getStatus())){ + assessmentPayLog.setStatus("1");//订单状态 + assessmentPayLog.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 + assessmentPayLogService.updateById(assessmentPayLog); + } + } + + }catch (Exception e){ + log.info("支付回调失败，订单号码："+outTradeNo); + e.printStackTrace(); + } + return null; + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java new file mode 100644 index 0000000..8de02eb --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java @@ -0,0 +1,174 @@ +package org.jeecg.modules.api.service.impl; + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.api.service.LoginApiService; +import org.jeecg.modules.bean.HttpConf; +import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; + +@Service +@Slf4j +public class LoginApiServiceImpl implements LoginApiService { + + + /******************************************************************************************************************/ + //微信小程序appid(易税通财税风险检测) + private static final String mpAppId = "wxb7de5370f825e878"; + //微信小程序appSecret(易税通财税风险检测) + private static final String mpAppSecret = "fc9eb58b33fd3b34074417d892e59e6f"; + + @Resource + private RedisUtil redisUtil; + + @Resource + private IHanHaiMemberService hanHaiMemberService; + + @Resource + private HttpConf httpConf; + /******************************************************************************************************************/ + + @Override + public Result login(LoginReq loginReq) { + Result result = new Result<>(); + Map map = new HashMap<>(); + if (StringUtils.isBlank(loginReq.getCode())) { + throw new JeecgBootException("小程序code为空"); + } + String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + mpAppId + "&secret=" + mpAppSecret+ "&js_code=" + loginReq.getCode() + "&grant_type=authorization_code"; + //使用工具类 + JSONObject json_test = httpConf.getJSONObject(loginUrl); + String wxOpenid = json_test.getString("openid"); + String sessionKey = json_test.getString("session_key"); + if (StringUtils.isBlank(wxOpenid)) { + throw new JeecgBootException("未获取到openid"); + } + + HanHaiMember member = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,wxOpenid).one(); + if (member == null) { + //如果user等于null说明该用户第一次登录，数据库没有该用户信息。 + loginReq.setOpenid(wxOpenid); + loginReq.setSession_key(sessionKey); + member = new HanHaiMember(); +// member.setSesssionKey(sessionKey); + member.setAppletOpenid(wxOpenid); + member.setNickName(loginReq.getNickName()); + member.setHeadImage(loginReq.getHeadimgurl()); + // 生成token返回给小程序端 + String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); + hanHaiMemberService.save(member); + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + map.put("userInfo", member); + map.put("token", token); + + result.setCode(200); + result.setResult(map); + return result; + } else { +// member.setHeadImage(loginReq.getHeadimgurl()); +// member.setSessionKey(sessionKey); +// memberService.saveOrUpdate(member); + // 生成token返回给小程序端 + + String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + map.put("userInfo", member); + map.put("token", token); + //用户id做im账号 + result.setResult(map); + result.setCode(200); +// result.setMessage(member.getNickName()+"已于"+member.getCreateTime()+"注册成功！请勿重复注册！"); +// // 未绑定手机号，跳转授权绑定手机号 +// if (StringUtils.isBlank(member.getPhone())) { +// result.setMessage("该微信用户尚未绑定手机号，请授权手机进行绑定"); +// result.setCode(905); +// result.setResult(map); +// return result; +// } + } + return result; + } + + @Override + public Result bindPhone(String phoneCode) { + try { + String phoneNumber = this.getPhoneNumber(phoneCode); + return Result.OK(phoneNumber); + }catch (Exception e){ + return Result.error(e.getMessage()); + } + } + + private static final String API_URL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber"; + public String getPhoneNumber(String code) throws Exception { + URL url = new URL(API_URL + "?access_token=" + this.getAccessToken()); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Content-Type", "application/json; utf-8"); + conn.setRequestProperty("Accept", "application/json"); + conn.setDoOutput(true); + + JSONObject jsonInput = new JSONObject(); + jsonInput.put("code", code); + + try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) { + byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8); + os.write(input, 0, input.length); + } + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + //获取手机号码 + return response.toString(); + } + } + + private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; + public String getAccessToken() throws Exception { + String requestUrl = String.format(TOKEN_URL, mpAppId, mpAppSecret); + URL url = new URL(requestUrl); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), "UTF-8"))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + + org.json.JSONObject jsonResponse = new org.json.JSONObject(response.toString()); + return jsonResponse.getString("access_token"); + } + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java new file mode 100644 index 0000000..da28a70 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java @@ -0,0 +1,246 @@ +package org.jeecg.modules.api.service.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.ReportService; +import org.jeecg.modules.api.utils.CommonUtils; +import org.jeecg.modules.assessmentAnswerLog.entity.AssessmentAnswerLog; +import org.jeecg.modules.assessmentAnswerLog.service.IAssessmentAnswerLogService; +import org.jeecg.modules.assessmentExamReport.entity.AssessmentExamReport; +import org.jeecg.modules.assessmentExamReport.service.IAssessmentExamReportService; +import org.jeecg.modules.assessmentPayLog.entity.AssessmentPayLog; +import org.jeecg.modules.assessmentPayLog.service.IAssessmentPayLogService; +import org.jeecg.modules.assessmentQuestion.entity.AssessmentAnswer; +import org.jeecg.modules.assessmentQuestion.service.IAssessmentAnswerService; +import org.jeecg.modules.assessmentReportUser.entity.AssessmentReportUser; +import org.jeecg.modules.assessmentReportUser.service.IAssessmentReportUserService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class ReportServiceImpl implements ReportService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + //用户信息 + @Resource + private IHanHaiMemberService hanHaiMemberService; + //测评报告用户基本信息 + @Resource + private IAssessmentReportUserService assessmentReportUserService; + //用户测评报告信息 + @Resource + private IAssessmentExamReportService assessmentExamReportService; + //支付记录信息 + @Resource + private IAssessmentPayLogService assessmentPayLogService; + //用户测评答案记录 + @Resource + private IAssessmentAnswerLogService assessmentAnswerLogService; + //题目答案信息 + @Resource + private IAssessmentAnswerService assessmentAnswerService; + /******************************************************************************************************************/ + + //新增测评报告基本信息 + @Override + public Result addReport(String token, AssessmentReportUser assessmentReportUser) { + log.info("开始新增测评报告基本信息"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + + try{ + + //新增测评报告基本信息 + assessmentReportUser.setUserId(hanHaiMember.getId()); + String title = CommonUtils.getCurrentDate() + assessmentReportUser.getCompany() + "风险测评报告"; + assessmentReportUser.setTitle(title); + boolean result = assessmentReportUserService.save(assessmentReportUser); + + //生成报告信息 + mergeReport(assessmentReportUser.getBatchNo(), hanHaiMember.getId()); + + if(result){ + log.info("新增成功"); + return Result.OK("新增成功"); + }else { + log.info("新增失败"); + return Result.error("新增失败"); + } + + }catch (Exception e){ + log.info("新增失败"); + e.printStackTrace(); + return Result.error("新增失败"); + } + } + + //查看报告列表 + @Override + public Result queryReportList(String token, PageBean pageBean) { + log.info("开始查询测评报告列表"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = assessmentReportUserService + .lambdaQuery(); + + //组装查询条件 + //所属用户 + query.eq(AssessmentReportUser::getUserId, hanHaiMember.getId()); + + //支付状态 + //query.eq(AssessmentPayLog::getStatus, "1"); + + //按照创建时间降序排列 + query.orderByDesc(AssessmentReportUser::getCreateTime); + + //获取测评报告列表信息 + pageList = query.page(page); + + log.info("测评报告列表查询结束"); + return Result.OK("测评报告列表", pageList); + }catch (Exception e){ + log.error("测评报告列表查询失败"); + e.printStackTrace(); + return Result.error("测评报告列表查询失败"); + } + } + + //查看报告详情 + @Override + public Result queryReportById(String token, String batchNo) { + log.info("开始查询测评报告详情"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + List pageList = null; + Map map = new HashedMap(); + + try{ + //分页 + query = assessmentExamReportService + .lambdaQuery(); + + //组装查询条件 + //批次编号 + query.eq(AssessmentExamReport::getBatchNo, batchNo); + + //所属用户 + query.eq(AssessmentExamReport::getUserId, hanHaiMember.getId()); + + //按照创建时间降序排列 + query.orderByDesc(AssessmentExamReport::getCreateTime); + + //获取测评报告列表详情 + pageList = query.list(); + map.put("pageList", pageList); + + //风险等级数量 + long level0Num = assessmentExamReportService.lambdaQuery().eq(AssessmentExamReport::getUserId, hanHaiMember.getId()).eq(AssessmentExamReport::getLevel, "0").count(); + long level1Num = assessmentExamReportService.lambdaQuery().eq(AssessmentExamReport::getUserId, hanHaiMember.getId()).eq(AssessmentExamReport::getLevel, "1").count(); + long level2Num = assessmentExamReportService.lambdaQuery().eq(AssessmentExamReport::getUserId, hanHaiMember.getId()).eq(AssessmentExamReport::getLevel, "2").count(); + long level3Num = assessmentExamReportService.lambdaQuery().eq(AssessmentExamReport::getUserId, hanHaiMember.getId()).eq(AssessmentExamReport::getLevel, "3").count(); + map.put("level0Num", level0Num); + map.put("level1Num", level1Num); + map.put("level2Num", level2Num); + map.put("level3Num", level3Num); + map.put("levelAllNum", pageList.size()); + + //测评报告标题 + AssessmentReportUser report = assessmentReportUserService.lambdaQuery().eq(AssessmentReportUser::getBatchNo, batchNo).eq(AssessmentReportUser::getUserId, hanHaiMember.getId()).one(); + String title = report.getTitle(); + map.put("title", title); + + log.info("测评报告查询结束"); + return Result.OK("测评报告详情", map); + }catch (Exception e){ + log.error("测评报告查询失败"); + e.printStackTrace(); + return Result.error("测评报告详情查询失败"); + } + } + + + + //生成测评报告 + public void mergeReport(String batchNo, String userId){ + try{ + //查询答题记录 + List assessmentAnswerLogList = assessmentAnswerLogService + .lambdaQuery() + .eq(AssessmentAnswerLog::getBatchNo, batchNo) + .eq(AssessmentAnswerLog::getUserId, userId) + .list(); + + //获取答案id + List answerIds = new ArrayList<>(); + if(assessmentAnswerLogList.size() > 0){ + for (AssessmentAnswerLog assessmentAnswerLog : assessmentAnswerLogList) { + answerIds.add(assessmentAnswerLog.getAnswerId()); + } + } + + //获取答案信息 + List answerList = assessmentAnswerService + .lambdaQuery() + .in(AssessmentAnswer::getId, answerIds) + .list(); + + //生成测评报告 + List reportList = new ArrayList<>(); + for (AssessmentAnswer assessmentAnswer : answerList) { + AssessmentExamReport report = new AssessmentExamReport(); + report.setBatchNo(batchNo); + report.setRisk(assessmentAnswer.getRisk()); + report.setReason(assessmentAnswer.getReason()); + report.setLevel(assessmentAnswer.getLevel()); + report.setConsequence(assessmentAnswer.getConsequence()); + report.setUserId(userId); + reportList.add(report); + } + boolean result = assessmentExamReportService.saveBatch(reportList); + if(!result){ + log.info("测评报告生成失败"); + } + }catch (Exception e){ + e.printStackTrace(); + log.info("测评报告生成失败"); + } + + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java new file mode 100644 index 0000000..8c14ba7 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java @@ -0,0 +1,169 @@ +package org.jeecg.modules.api.service.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.UserInfoService; +import org.jeecg.modules.assessmentFaq.entity.AssessmentFaq; +import org.jeecg.modules.assessmentFaq.service.IAssessmentFaqService; +import org.jeecg.modules.assessmentFeedback.entity.AssessmentFeedback; +import org.jeecg.modules.assessmentFeedback.service.IAssessmentFeedbackService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +@Slf4j +public class UserInfoServiceImpl implements UserInfoService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + //用户信息 + @Resource + private IHanHaiMemberService hanHaiMemberService; + //常见问题 + @Resource + private IAssessmentFaqService assessmentFaqService; + //常见问题 + @Resource + private IAssessmentFeedbackService assessmentFeedbackService; + /******************************************************************************************************************/ + + //查询个人信息 + @Override + public Result queryUserInfo(String token){ + log.info("开始查询个人信息"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + + try{ + log.info("个人信息获取成功"); + return Result.OK("个人信息", hanHaiMember); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("个人信息获取失败", hanHaiMember); + } + } + + //修改个人信息 + @Override + public Result updateUserInfo(String token, HanHaiMember member){ + log.info("开始修改个人信息"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + + try{ + //用户昵称不能为空 + if(StringUtils.isBlank(member.getNickName())){ + log.error("用户昵称不能为空"); + return Result.error("用户昵称不能为空"); + } + if(StringUtils.isBlank(member.getNickName())){ + log.error("头像不能为空"); + return Result.error("头像不能为空"); + } + if(StringUtils.isNotEmpty(member.getPhone())){ + HanHaiMember one = hanHaiMemberService + .lambdaQuery() + .eq(HanHaiMember::getPhone, member.getPhone()) + .ne(HanHaiMember::getId, hanHaiMember.getId()) + .one(); + if(null != one){ + return Result.error("该号码已经有人使用，不能重复填写"); + } + } + + hanHaiMember.setNickName(member.getNickName()); + hanHaiMember.setPhone(member.getPhone()); + hanHaiMember.setHeadImage(member.getHeadImage()); + boolean result = hanHaiMemberService.updateById(hanHaiMember); + + if(result){ + log.info("个人信息修改成功"); + return Result.OK("个人信息修改成功"); + }else { + log.info("个人信息修改失败"); + return Result.error("个人信息修改失败"); + } + + }catch (Exception e){ + log.info("个人信息修改失败"); + e.printStackTrace(); + return Result.error("个人信息修改失败"); + } + } + + //客服咨询-常见问题 + @Override + public Result queryFaqList(PageBean pageBean) { + log.info("开始查询系统配置列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = assessmentFaqService + .lambdaQuery(); + + //组装查询条件 + //按照创建时间降序排列 + query.orderByAsc(AssessmentFaq::getOrderNo); + + //获取系统配置列表信息 + pageList = query.page(page); + + log.info("系统配置查询结束"); + return Result.OK("系统配置列表", pageList); + }catch (Exception e){ + log.error("系统配置查询失败"); + e.printStackTrace(); + return Result.error("系统配置列表查询失败"); + } + } + + //意见反馈 + @Override + public Result addFeedback(String token, AssessmentFeedback assessmentFeedback) { + log.info("开始提交意见反馈"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + + try{ + + assessmentFeedback.setUserId(hanHaiMember.getId()); + boolean result = assessmentFeedbackService.save(assessmentFeedback); + + if(result){ + log.info("意见反馈提交成功"); + return Result.OK("意见反馈提交成功"); + }else { + log.info("意见反馈提交失败"); + return Result.error("意见反馈提交失败"); + } + + }catch (Exception e){ + log.info("意见反馈提交失败"); + e.printStackTrace(); + return Result.error("意见反馈提交失败"); + } + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/CommonUtils.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/CommonUtils.java new file mode 100644 index 0000000..e480682 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/CommonUtils.java @@ -0,0 +1,45 @@ +package org.jeecg.modules.api.utils; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +public class CommonUtils { + + //获取当前时间 + public static Date getCurrentTime(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date now = new Date(); + String formattedDate = sdf.format(now); +// System.out.println(now); // 输出格式化后的当前时间 +// System.out.println(formattedDate); // 输出格式化后的当前时间 + return now; + } + + //获取当前日期 + public static String getCurrentDate(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日"); + Date now = new Date(); + String formattedDate = sdf.format(now); +// System.out.println(now); // 输出格式化后的当前时间 +// System.out.println(formattedDate); // 输出格式化后的当前时间 + return formattedDate; + } + + //获取延长时间 + public static Date getValidTime(Date oldTime, int month){ + // 创建Calendar实例 + Calendar cal = Calendar.getInstance(); + cal.setTime(oldTime); // 设置当前时间 + + // 在当前时间基础上加n个月 + cal.add(Calendar.MONTH, month); + Date newTime = cal.getTime(); + return newTime; + } + + public static void main(String[] args) { + System.out.println(getValidTime(getCurrentTime(), 3)); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 7dbb082..fac4cf2 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -144,6 +144,23 @@ public class SysBaseApiImpl implements ISysBaseAPI { return user; } + /** + * 公共验证--根据账号查询验证用户信息-客户端 + * @param username + * @return + * */ + @Override + public HanHaiMember getUserByNameHanHaiXcxOpenId(String username){ + if(oConvertUtils.isEmpty(username)) { + return null; + } + HanHaiMember user = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,username).one(); + if(user==null) { + return null; + } + return user; + } + @Override public String translateDictFromTable(String table, String text, String code, String key) { diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index fceeaff..e63f983 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8000 + port: 8001 tomcat: max-swallow-size: -1 error: