diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 6ef5388..951e0a6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: 用户表 + * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2025-09-18 * @Version: V1.0 */ -@Api(tags="用户表") +@Api(tags="han_hai_member") @RestController @RequestMapping("/hanHaiMember/hanHaiMember") @Slf4j @@ -59,8 +59,8 @@ public class HanHaiMemberController extends JeecgController> queryPageList(HanHaiMember hanHaiMember, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController add(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.save(hanHaiMember); @@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController edit(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.updateById(hanHaiMember); @@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { hanHaiMemberService.removeById(id); @@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { HanHaiMember hanHaiMember = hanHaiMemberService.getById(id); @@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index 2d71e42..4f2f5e1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 用户表 + * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index f03b897..bc81d07 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 用户表 + * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2025-09-18 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 7a138c3..4a5278e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -4,26 +4,6 @@
- - - - - - - - - - - - - 查询 - 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - - -
@@ -32,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -119,7 +99,6 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import HanHaiMemberModal from './modules/HanHaiMemberModal' - import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'HanHaiMemberList', @@ -129,7 +108,7 @@ }, data () { return { - description: '用户表管理页面', + description: 'han_hai_member管理页面', // 表头 columns: [ { @@ -142,12 +121,6 @@ return parseInt(index)+1; } }, - { - title:'创建日期', - align:"center", - sorter: true, - dataIndex: 'createTime' - }, { title:'昵称', align:"center", @@ -162,34 +135,25 @@ { title:'手机号码', align:"center", - sorter: true, dataIndex: 'phone' }, - { - title:'公众号openid', - align:"center", - dataIndex: 'officialOpenid' - }, { title:'邀请人', align:"center", - dataIndex: 'vid_dictText' + dataIndex: 'vid' }, { title:'邀请时间', align:"center", - dataIndex: 'vtime' - }, - { - title:'性别', - align:"center", - dataIndex: 'sex' + dataIndex: 'vtime', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } }, { - title:'是否分销商', + title:'余额', align:"center", - dataIndex: 'isDai', - customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isDai'], text) : ''), + dataIndex: 'price' }, { title: '操作', @@ -213,7 +177,6 @@ } }, created() { - this.$set(this.dictOptions, 'isDai', [{text:'是',value:'Y'},{text:'否',value:'N'}]) this.getSuperFieldList(); }, computed: { @@ -226,16 +189,12 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) - fieldList.push({type:'string',value:'token',text:'登录TOEKN',dictCode:''}) - fieldList.push({type:'string',value:'officialOpenid',text:'公众号openid',dictCode:''}) - fieldList.push({type:'sel_search',value:'vid',text:'邀请人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) - fieldList.push({type:'datetime',value:'vtime',text:'邀请时间'}) - fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) - fieldList.push({type:'switch',value:'isDai',text:'是否分销商'}) + fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''}) + fieldList.push({type:'date',value:'vtime',text:'邀请时间'}) + fieldList.push({type:'BigDecimal',value:'price',text:'余额',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index c9f56eb..1fb962c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -18,34 +18,19 @@ - - - - - - - - - - - + - - - - - - + - - + + @@ -85,6 +70,10 @@ }, confirmLoading: false, validatorRules: { + phone: [ + { required: false}, + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + ], }, url: { add: "/hanHaiMember/hanHaiMember/add", diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index 7f55387..2502114 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -5,12 +5,6 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '创建日期', - align:"center", - sorter: true, - dataIndex: 'createTime' - }, - { title: '昵称', align:"center", dataIndex: 'nickName' @@ -24,55 +18,29 @@ export const columns: BasicColumn[] = [ { title: '手机号码', align:"center", - sorter: true, dataIndex: 'phone' }, - { - title: '公众号openid', - align:"center", - dataIndex: 'officialOpenid' - }, { title: '邀请人', align:"center", - dataIndex: 'vid_dictText' + dataIndex: 'vid' }, { title: '邀请时间', align:"center", - dataIndex: 'vtime' - }, - { - title: '性别', - align:"center", - dataIndex: 'sex' + dataIndex: 'vtime', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, }, { - title: '是否分销商', + title: '余额', align:"center", - dataIndex: 'isDai', - customRender:({text}) => { - return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) - }, + dataIndex: 'price' }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ - { - label: "昵称", - field: "nickName", - component: 'Input', - colProps: {span: 6}, - }, - { - label: "邀请人", - field: "vid", - component: 'JSearchSelect', - componentProps:{ - dict:"han_hai_member,nick_name,id" - }, - colProps: {span: 6}, - }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -92,40 +60,26 @@ export const formSchema: FormSchema[] = [ label: '手机号码', field: 'phone', component: 'Input', - }, - { - label: '登录TOEKN', - field: 'token', - component: 'Input', - }, - { - label: '公众号openid', - field: 'officialOpenid', - component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: false}, + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + ]; + }, }, { label: '邀请人', field: 'vid', - component: 'JSearchSelect', - componentProps:{ - dict:"han_hai_member,nick_name,id" - }, + component: 'Input', }, { label: '邀请时间', field: 'vtime', - component: 'Input', - }, - { - label: '性别', - field: 'sex', - component: 'Input', + component: 'DatePicker', }, { - label: '是否分销商', - field: 'isDai', - component: 'JSwitch', - componentProps:{ - }, + label: '余额', + field: 'price', + component: 'InputNumber', }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue index adff966..d91d68c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue @@ -53,7 +53,7 @@ //注册table数据 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ tableProps:{ - title: '用户表', + title: 'han_hai_member', api: list, columns, canResize:false, @@ -70,7 +70,7 @@ }, }, exportConfig: { - name:"用户表", + name:"han_hai_member", url: getExportUrl, }, importConfig: { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/controller/StudytourMedalController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/controller/StudytourMedalController.java index 6b972af..c493543 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/controller/StudytourMedalController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/controller/StudytourMedalController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 成就勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ @Api(tags="成就勋章表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/entity/StudytourMedal.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/entity/StudytourMedal.java index 32a0990..e54254e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/entity/StudytourMedal.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/entity/StudytourMedal.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 成就勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ @Data @@ -51,8 +51,12 @@ public class StudytourMedal implements Serializable { @Excel(name = "成就名称", width = 15) @ApiModelProperty(value = "成就名称") private java.lang.String title; - /**图标*/ - @Excel(name = "图标", width = 15) - @ApiModelProperty(value = "图标") - private java.lang.String icon; + /**彩色图标*/ + @Excel(name = "彩色图标", width = 15) + @ApiModelProperty(value = "彩色图标") + private java.lang.String icon1; + /**灰色图标*/ + @Excel(name = "灰色图标", width = 15) + @ApiModelProperty(value = "灰色图标") + private java.lang.String icon2; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/mapper/StudytourMedalMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/mapper/StudytourMedalMapper.java index 3538f14..2cfd2e9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/mapper/StudytourMedalMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/mapper/StudytourMedalMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 成就勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface StudytourMedalMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/IStudytourMedalService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/IStudytourMedalService.java index bc478f7..65e2dce 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/IStudytourMedalService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/IStudytourMedalService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 成就勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface IStudytourMedalService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/impl/StudytourMedalServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/impl/StudytourMedalServiceImpl.java index a354f3a..ac7471f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/impl/StudytourMedalServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/impl/StudytourMedalServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 成就勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/StudytourMedalList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/StudytourMedalList.vue index f0440eb..9aa3fc6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/StudytourMedalList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/StudytourMedalList.vue @@ -127,9 +127,15 @@ dataIndex: 'title' }, { - title:'图标', + title:'彩色图标', align:"center", - dataIndex: 'icon', + dataIndex: 'icon1', + scopedSlots: {customRender: 'imgSlot'} + }, + { + title:'灰色图标', + align:"center", + dataIndex: 'icon2', scopedSlots: {customRender: 'imgSlot'} }, { @@ -167,7 +173,8 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'成就名称',dictCode:''}) - fieldList.push({type:'Text',value:'icon',text:'图标',dictCode:''}) + fieldList.push({type:'Text',value:'icon1',text:'彩色图标',dictCode:''}) + fieldList.push({type:'Text',value:'icon2',text:'灰色图标',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/modules/StudytourMedalForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/modules/StudytourMedalForm.vue index 98fabd5..30a1617 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/modules/StudytourMedalForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/modules/StudytourMedalForm.vue @@ -9,8 +9,13 @@ - - + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue3/StudytourMedal.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue3/StudytourMedal.data.ts index a2b68c5..76c052c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue3/StudytourMedal.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue3/StudytourMedal.data.ts @@ -10,9 +10,15 @@ export const columns: BasicColumn[] = [ dataIndex: 'title' }, { - title: '图标', + title: '彩色图标', align:"center", - dataIndex: 'icon', + dataIndex: 'icon1', + customRender:render.renderAvatar, + }, + { + title: '灰色图标', + align:"center", + dataIndex: 'icon2', customRender:render.renderAvatar, }, ]; @@ -27,8 +33,15 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '图标', - field: 'icon', + label: '彩色图标', + field: 'icon1', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '灰色图标', + field: 'icon2', component: 'JImageUpload', componentProps:{ }, diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/controller/StudytourMedalActivityController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/controller/StudytourMedalActivityController.java new file mode 100644 index 0000000..3271e29 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/controller/StudytourMedalActivityController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.studytourMedalActivity.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.studytourMedalActivity.entity.StudytourMedalActivity; +import org.jeecg.modules.studytourMedalActivity.service.IStudytourMedalActivityService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 活动勋章表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +@Api(tags="活动勋章表") +@RestController +@RequestMapping("/studytourMedalActivity/studytourMedalActivity") +@Slf4j +public class StudytourMedalActivityController extends JeecgController { + @Autowired + private IStudytourMedalActivityService studytourMedalActivityService; + + /** + * 分页列表查询 + * + * @param studytourMedalActivity + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "活动勋章表-分页列表查询") + @ApiOperation(value="活动勋章表-分页列表查询", notes="活动勋章表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(StudytourMedalActivity studytourMedalActivity, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourMedalActivity, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = studytourMedalActivityService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param studytourMedalActivity + * @return + */ + @AutoLog(value = "活动勋章表-添加") + @ApiOperation(value="活动勋章表-添加", notes="活动勋章表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody StudytourMedalActivity studytourMedalActivity) { + studytourMedalActivityService.save(studytourMedalActivity); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param studytourMedalActivity + * @return + */ + @AutoLog(value = "活动勋章表-编辑") + @ApiOperation(value="活动勋章表-编辑", notes="活动勋章表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody StudytourMedalActivity studytourMedalActivity) { + studytourMedalActivityService.updateById(studytourMedalActivity); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "活动勋章表-通过id删除") + @ApiOperation(value="活动勋章表-通过id删除", notes="活动勋章表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + studytourMedalActivityService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "活动勋章表-批量删除") + @ApiOperation(value="活动勋章表-批量删除", notes="活动勋章表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.studytourMedalActivityService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "活动勋章表-通过id查询") + @ApiOperation(value="活动勋章表-通过id查询", notes="活动勋章表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + StudytourMedalActivity studytourMedalActivity = studytourMedalActivityService.getById(id); + if(studytourMedalActivity==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(studytourMedalActivity); + } + + /** + * 导出excel + * + * @param request + * @param studytourMedalActivity + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StudytourMedalActivity studytourMedalActivity) { + return super.exportXls(request, studytourMedalActivity, StudytourMedalActivity.class, "活动勋章表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, StudytourMedalActivity.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/entity/StudytourMedalActivity.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/entity/StudytourMedalActivity.java new file mode 100644 index 0000000..66fb97f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/entity/StudytourMedalActivity.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.studytourMedalActivity.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 活动勋章表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +@Data +@TableName("studytour_medal_activity") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="studytour_medal_activity对象", description="活动勋章表") +public class StudytourMedalActivity implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联活动*/ + @Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联活动") + private java.lang.String activityId; + /**关联勋章*/ + @Excel(name = "关联勋章", width = 15, dictTable = "studytour_medal", dicText = "title", dicCode = "id") + @Dict(dictTable = "studytour_medal", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联勋章") + private java.lang.String medalId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/StudytourMedalActivityMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/StudytourMedalActivityMapper.java new file mode 100644 index 0000000..fc6e80e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/StudytourMedalActivityMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.studytourMedalActivity.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.studytourMedalActivity.entity.StudytourMedalActivity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 活动勋章表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +public interface StudytourMedalActivityMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/xml/StudytourMedalActivityMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/xml/StudytourMedalActivityMapper.xml new file mode 100644 index 0000000..b75f4df --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/xml/StudytourMedalActivityMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/service/IStudytourMedalActivityService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/service/IStudytourMedalActivityService.java new file mode 100644 index 0000000..39a7d71 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/service/IStudytourMedalActivityService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.studytourMedalActivity.service; + +import org.jeecg.modules.studytourMedalActivity.entity.StudytourMedalActivity; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 活动勋章表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +public interface IStudytourMedalActivityService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/service/impl/StudytourMedalActivityServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/service/impl/StudytourMedalActivityServiceImpl.java new file mode 100644 index 0000000..f71fd79 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/service/impl/StudytourMedalActivityServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.studytourMedalActivity.service.impl; + +import org.jeecg.modules.studytourMedalActivity.entity.StudytourMedalActivity; +import org.jeecg.modules.studytourMedalActivity.mapper.StudytourMedalActivityMapper; +import org.jeecg.modules.studytourMedalActivity.service.IStudytourMedalActivityService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 活动勋章表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +@Service +public class StudytourMedalActivityServiceImpl extends ServiceImpl implements IStudytourMedalActivityService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/StudytourMedalActivityList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/StudytourMedalActivityList.vue new file mode 100644 index 0000000..ad29bcb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/StudytourMedalActivityList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityForm.vue new file mode 100644 index 0000000..ecc4cbb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.Style#Drawer.vue new file mode 100644 index 0000000..190f623 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.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/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.vue new file mode 100644 index 0000000..b824181 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.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/studytourMedalActivity/vue3/StudytourMedalActivity.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivity.api.ts new file mode 100644 index 0000000..e367736 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivity.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/studytourMedalActivity/studytourMedalActivity/list', + save='/studytourMedalActivity/studytourMedalActivity/add', + edit='/studytourMedalActivity/studytourMedalActivity/edit', + deleteOne = '/studytourMedalActivity/studytourMedalActivity/delete', + deleteBatch = '/studytourMedalActivity/studytourMedalActivity/deleteBatch', + importExcel = '/studytourMedalActivity/studytourMedalActivity/importExcel', + exportXls = '/studytourMedalActivity/studytourMedalActivity/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/studytourMedalActivity/vue3/StudytourMedalActivity.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivity.data.ts new file mode 100644 index 0000000..9e2dc7d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivity.data.ts @@ -0,0 +1,39 @@ +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: 'activityId_dictText' + }, + { + title: '关联勋章', + align:"center", + dataIndex: 'medalId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联活动', + field: 'activityId', + component: 'JSearchSelect', + componentProps:{ + dict:"studytour_activity,title,id" + }, + }, + { + label: '关联勋章', + field: 'medalId', + component: 'JSearchSelect', + componentProps:{ + dict:"studytour_medal,title,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivityList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivityList.vue new file mode 100644 index 0000000..b4f2c1f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivityList.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/studytourMedalActivity/vue3/components/StudytourMedalActivityModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/components/StudytourMedalActivityModal.vue new file mode 100644 index 0000000..5d1c840 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/components/StudytourMedalActivityModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java index 9e2a729..5c33ee2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ @Api(tags="用户勋章表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java index f585096..86db813 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ @Data @@ -47,11 +47,27 @@ public class StudytourMedalUser implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**关联活动*/ + @Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联活动") + private java.lang.String activityId; /**关联勋章id*/ @Excel(name = "关联勋章id", width = 15, dictTable = "studytour_medal", dicText = "title", dicCode = "id") @Dict(dictTable = "studytour_medal", dicText = "title", dicCode = "id") @ApiModelProperty(value = "关联勋章id") private java.lang.String metalId; + /**是否点亮*/ + @Excel(name = "是否点亮", width = 15, dicCode = "is_true") + @Dict(dicCode = "is_true") + @ApiModelProperty(value = "是否点亮") + private java.lang.String isLight; + /**点亮日期*/ + @Excel(name = "点亮日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "点亮日期") + private java.util.Date lightDate; /**关联用户id*/ @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java index 61afba0..547bf4e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface StudytourMedalUserMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java index 9d25ed8..e5bf04b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface IStudytourMedalUserService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java index 5967fa4..e9fc951 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-18 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue index c516526..e124510 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue @@ -122,11 +122,29 @@ return parseInt(index)+1; } }, + { + title:'关联活动', + align:"center", + dataIndex: 'activityId_dictText' + }, { title:'关联勋章id', align:"center", dataIndex: 'metalId_dictText' }, + { + title:'是否点亮', + align:"center", + dataIndex: 'isLight_dictText' + }, + { + title:'点亮日期', + align:"center", + dataIndex: 'lightDate', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } + }, { title:'关联用户id', align:"center", @@ -166,7 +184,10 @@ }, getSuperFieldList(){ let fieldList=[]; + fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'}) fieldList.push({type:'string',value:'metalId',text:'关联勋章id',dictCode:"studytour_medal,title,id"}) + fieldList.push({type:'string',value:'isLight',text:'是否点亮',dictCode:'is_true'}) + fieldList.push({type:'date',value:'lightDate',text:'点亮日期'}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue index d6b2e3f..a4443f6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue @@ -3,11 +3,26 @@ + + + + + + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts index d26b393..970d558 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts @@ -5,10 +5,28 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { + title: '关联活动', + align:"center", + dataIndex: 'activityId_dictText' + }, + { title: '关联勋章id', align:"center", dataIndex: 'metalId_dictText' }, + { + title: '是否点亮', + align:"center", + dataIndex: 'isLight_dictText' + }, + { + title: '点亮日期', + align:"center", + dataIndex: 'lightDate', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, { title: '关联用户id', align:"center", @@ -20,6 +38,14 @@ export const searchFormSchema: FormSchema[] = [ ]; //表单数据 export const formSchema: FormSchema[] = [ + { + label: '关联活动', + field: 'activityId', + component: 'JSearchSelect', + componentProps:{ + dict:"studytour_activity,title,id" + }, + }, { label: '关联勋章id', field: 'metalId', @@ -28,6 +54,19 @@ export const formSchema: FormSchema[] = [ dictCode:"studytour_medal,title,id" }, }, + { + label: '是否点亮', + field: 'isLight', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"is_true" + }, + }, + { + label: '点亮日期', + field: 'lightDate', + component: 'DatePicker', + }, { label: '关联用户id', field: 'userId', diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/HttpClientUtil.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/HttpClientUtil.java new file mode 100644 index 0000000..8c858c2 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/HttpClientUtil.java @@ -0,0 +1,1122 @@ +package org.jeecg.modules.api.bean; + + + + +import com.alibaba.fastjson.JSON; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.CookieStore; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.*; +import org.apache.http.client.utils.HttpClientUtils; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLContextBuilder; +import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.Charset; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 通过url获取数据 + * + * @author zc + * + */ +public class HttpClientUtil { + + /** + * 设置可访问https + * @return + */ + public static CloseableHttpClient createSSLClientDefault() { + try { + SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() { + //信任所有 + public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { + return true; + } + }).build(); + SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + + return HttpClients.custom().setSSLSocketFactory(sslsf).build(); + } catch (KeyManagementException e) { + e.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } catch (KeyStoreException e) { + e.printStackTrace(); + } + return HttpClients.createDefault(); + } +/*************************************Get**********************************************/ + /** + * 一般查询用doget + * @param url + * @param param + * @param + * @return + */ + public static String doGet(String url, Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpclient = createSSLClientDefault();//调用createSSLClientDefault + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + CookieStore cookieStore = new BasicCookieStore(); + httpclient = HttpClients.custom().setDefaultCookieStore(cookieStore).build(); + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// if (parameter != null) { +// //签名 +// httpGet.addHeader("Sign",parameter.getSign()); +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet(String url) { + return doGet(url, null); + } + + public static String doGet3(String url, Map param) { + // 创建Httpclient对象 + //调用createSSLClientDefault + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// if (parameter != null) { +// //签名 +// httpGet.addHeader("Sign",parameter.getSign()); +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 上传文件的doGet + * @param url + * @param param + * @param + * @return + */ + public static String doGet2(String url, Map param) { + + // 创建Httpclient对象 + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); +// if (parameter != null) { +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id()); +// httpGet.addHeader("Product_id", parameter.getProduct_id()); +// httpGet.addHeader("Sign", parameter.getSign()); +// httpGet.addHeader("requestCode", parameter.getRequestCode()); +// httpGet.addHeader("Content-Type", "application/json;charset=UTF-8"); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + // 执行请求 + response = httpclient.execute(httpGet); + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet2(String url) { + return doGet2(url, null); + + } + + public static String doGet4(String url, Map param) { + // 创建Httpclient对象 + //调用createSSLClientDefault + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// httpGet.addHeader(""); +// if (parameter != null) { +// //签名 +// httpGet.addHeader("Sign",parameter.getSign()); +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet5(String url, Map param) { + // 创建Httpclient对象 + //调用createSSLClientDefault + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// httpGet.addHeader(""); +// if (parameter != null) { +// httpGet.addHeader("Accept","application/json, text/javascript, */*; q=0.01"); +// httpGet.addHeader("Accept-Encoding","gzip, deflate, br"); +// httpGet.addHeader("Accept-Language","zh-CN,zh;q=0.9"); +// httpGet.addHeader("Connection","keep-alive"); + httpGet.addHeader("Cookie","PHPSESSID=b1epvn4gilmvlqd63gb71sgb4m"); +// httpGet.addHeader("Host","www.5577yc.com"); +// httpGet.addHeader("Referer","https://www.5577yc.com/pc/member/index.html"); +// httpGet.addHeader("Sec-Fetch-Mode","cors"); +// httpGet.addHeader("Sec-Fetch-Site","same-origin"); +// httpGet.addHeader("User-Agent","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36"); + httpGet.addHeader("X-Requested-With","XMLHttpRequest"); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet5(String url) { + return doGet5(url, null); + + } + /*************************************Get**********************************************/ + + /*************************************Post**********************************************/ + /** + * 原始doPost 基本不用 + * @param url + * @param param + * @param + * @return + */ + public static String doPost(String url, Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList); + httpPost.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPost); + + + + + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * 项目经常用的doPost2 + * @param url + * @param param + * @param + * @return + */ + public static String doPost2(String url, Map param){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + httpPost.setHeader("Content-type", "application/x-www-form-urlencoded"); +// httpPost.setHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)"); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList,"UTF-8"); + entity.setContentEncoding("UTF-8"); + entity.setContentType("application/x-www-form-urlencoded"); + httpPost.setEntity(entity); + + } + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * .net登录post + * @param url + * @param param + * @param + * @return + */ + public static String doPost3(String url, Map param){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8")); + entity.setContentEncoding("UTF-8"); + httpPost.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + + + /** + * 微信文件上传 + * @param url + * @param content + * @param fileName + * @return + */ + public static String doPost6(String url, byte[] content,String fileName){ + + String resultString = null; + //创建HttpClient + CloseableHttpClient httpClient = HttpClients.createDefault(); + HttpPost httpPost = new HttpPost(url); + org.apache.http.entity.mime.MultipartEntityBuilder builder = org.apache.http.entity.mime.MultipartEntityBuilder.create(); + /*绑定文件参数，传入文件流和contenttype，此处也可以继续添加其他formdata参数*/ + builder.addBinaryBody("file",content, ContentType.MULTIPART_FORM_DATA,fileName); + HttpEntity entity = builder.build(); + httpPost.setEntity(entity); + HttpResponse response = null; + //执行提交 + try{ + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + HttpClientUtils.closeQuietly(httpClient); + HttpClientUtils.closeQuietly(response); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + + /** + * 微信公众号文件上传 + * @param url + * @param content + * @param fileName + * @return + */ + public static String doPost7(String url, byte[] content,String fileName){ + + String resultString = null; + //创建HttpClient + CloseableHttpClient httpClient = HttpClients.createDefault(); + HttpPost httpPost = new HttpPost(url); + org.apache.http.entity.mime.MultipartEntityBuilder builder = org.apache.http.entity.mime.MultipartEntityBuilder.create(); + /*绑定文件参数，传入文件流和contenttype，此处也可以继续添加其他formdata参数*/ + builder.addBinaryBody("media",content, ContentType.MULTIPART_FORM_DATA,fileName); + HttpEntity entity = builder.build(); + httpPost.setEntity(entity); + HttpResponse response = null; + //执行提交 + try{ + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + HttpClientUtils.closeQuietly(httpClient); + HttpClientUtils.closeQuietly(response); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * 项目经常用的doPost4 + * @param url + * @param param + * @return + */ + public static String doPost4(String url, Map param){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + StringBuffer cookie = new StringBuffer(); + Map map = new HashMap<>(); + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + httpPost.addHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8"); + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8")); + httpPost.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return resultString; + } + + + /** + * 项目经常用的doPost4 + * @param url + * @param param + * @param parameter + * @return + */ + public static String doPost5(String url, Map param,String parameter){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + StringBuffer cookie = new StringBuffer(); + Map map = new HashMap<>(); + try { + // 创建uri + CookieStore cookieStore = new BasicCookieStore(); + httpClient = HttpClients.custom().setDefaultCookieStore(cookieStore).build(); + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + httpPost.addHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8"); + httpPost.addHeader("Host","www.www7945.com"); + httpPost.addHeader("Origin","https://www.www7945.com"); + httpPost.addHeader("Referer","https://www.www7945.com/mobile/"); + httpPost.addHeader("User-Agent:","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); + httpPost.addHeader("Connection","keep-alive"); + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8")); + entity.setContentEncoding("UTF-8"); + httpPost.setEntity(entity); + } + if(parameter!=null){ + httpPost.addHeader("Cookie",parameter); + } + // 执行http请求 + response = httpClient.execute(httpPost); + String tokenStr = null; + + if (response != null) { + int statusCode = response.getStatusLine().getStatusCode(); + if (statusCode == HttpStatus.SC_OK) { + // 获得Cookies + List cookies = cookieStore.getCookies(); + for (org.apache.http.cookie.Cookie c : cookies) { + cookie.append(c.getName()).append("=").append(c.getValue()).append(";"); + if (c.getName().contains("token")) { + tokenStr = c.getValue(); + } + } + } + } + map.put("token",tokenStr); + map.put("cookie",cookie.toString()); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + map.put("resultString",JSON.parse(resultString)); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + if(parameter!=null){ + return resultString; + } + return JSON.toJSONString(map); + } + + + + public static String doPost5(String url) { + return doPost5(url, null,null); + } + + public static String doPost4(String url) { + return doPost4(url, null); + } + + public static String doPost2(String url) { + return doPost2(url); + } + + + public static String doPost(String url) { + return doPost(url, null); + } + + /** + * 当数据需要以JSON格式传输 + * @param url + * @param json + * @param + * @return + */ + public static String doPostJson(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_JSON); + httpPost.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return resultString; + } + + + public static String doPostJson3(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_FORM_URLENCODED); + httpPost.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 文件上传 + * @param url + * @param json + * @param + * @return + */ + public static String doPostJson2(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_JSON); + httpPost.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /*************************************Post**********************************************/ + + + + + + + + + /*************************************Delete**********************************************/ + /** + * 原始删除 基本不怎么用 + * @param url + * @return + */ + public static String doDelete(String url) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建Http Post请求 + HttpDelete httpPost = new HttpDelete(url); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 常用删除 + * @param url + * @param param + * @param + * @return + */ + public static String doDelete2(String url,Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Delete请求 + HttpDelete httpDelete = new HttpDelete(uri); + // 执行http请求 + response = httpClient.execute(httpDelete); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 上传文件删除 + * @param url + * @param param + * @param + * @return + */ + public static String doDelete3(String url,Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Delete请求 + HttpDelete httpDelete = new HttpDelete(uri); + // 执行http请求 + response = httpClient.execute(httpDelete); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /*************************************Delete**********************************************/ + + + + + + + + + + /*************************************Put**********************************************/ + public static String doPut(String url) { + return doPut(url, null); + } + + /** + * 修改 + * @param url + * @param param + * @param + * @return + */ + public static String doPut(String url, Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Put请求 + HttpPut httpPut = new HttpPut(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8"));//Charset.forName("UTF-8")解决乱码 + entity.setContentEncoding("UTF-8"); + httpPut.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPut); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * 以JSON格式修改 + * @param url + * @param json + * @param parameter + * @return + */ + public static String doPutJson(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPut httpPut = new HttpPut(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_JSON); + httpPut.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPut); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + return resultString; + } + + + +} + diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/WxQrCodeVo.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/WxQrCodeVo.java new file mode 100644 index 0000000..ab45cd4 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/WxQrCodeVo.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.api.bean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WxQrCodeVo { + /**图片地址*/ + @ApiModelProperty(value = "图片地址") + private String url; + + @ApiModelProperty(value = "名称") + private String name; +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/MetalServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/MetalServiceImpl.java new file mode 100644 index 0000000..ed518ec --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/MetalServiceImpl.java @@ -0,0 +1,128 @@ +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.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.service.MetalService; +import org.jeecg.modules.api.utils.CommonUtils; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.studytourImage.entity.StudytourImage; +import org.jeecg.modules.studytourMedal.service.IStudytourMedalService; +import org.jeecg.modules.studytourMedalUser.entity.StudytourMedalUser; +import org.jeecg.modules.studytourMedalUser.service.IStudytourMedalUserService; +import org.jeecg.modules.studytourRecord.entity.StudytourRecord; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Slf4j +public class MetalServiceImpl implements MetalService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + //用户信息 + @Resource + private IHanHaiMemberService hanHaiMemberService; + //勋章信息 + @Resource + private IStudytourMedalService studytourMedalService; + //用户勋章信息 + @Resource + private IStudytourMedalUserService studytourMedalUserService; + /******************************************************************************************************************/ + + //我的成就-查询勋章列表 + @Override + public Result queryMedalList(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 = studytourMedalUserService + .lambdaQuery(); + + //组装查询条件 + + //所属用户 + query.eq(StudytourMedalUser::getUserId, hanHaiMember.getId()); + + //按照创建时间降序排列 + query.orderByDesc(StudytourMedalUser::getCreateTime); + + //获取勋章列表 + pageList = query.page(page); + + log.info("勋章列表查询结束"); + return Result.OK("勋章列表", pageList); + }catch (Exception e){ + log.info("勋章列表查询失败"); + e.printStackTrace(); + return Result.error("勋章列表查询失败"); + } + } + + //我的成就-点亮勋章 + @Override + public Result lightMedal(String token, String medalId) { + log.info("开始点亮勋章"); + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + + try{ + + //1、查询勋章是否存在 + StudytourMedalUser one = studytourMedalUserService + .lambdaQuery() + .eq(StudytourMedalUser::getUserId, hanHaiMember.getId()) + .eq(StudytourMedalUser::getMetalId, medalId) + .one(); + if(null == one){ + return Result.error("该勋章还未获取，无法点亮"); + }else if("1".equals(one.getIsLight())){ + return Result.error("该勋章已经点亮，无需重复点亮"); + } + + //2、点亮勋章 + one.setIsLight("1"); + one.setLightDate(CommonUtils.getCurrentDate()); + boolean result = studytourMedalUserService.updateById(one); + + 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/service/Impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java index 1c5cc31..a1868a9 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java @@ -131,8 +131,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result createOrder(String token, StudytourOrder studytourOrder) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); try{ //0、校验活动信息 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java index 5759c67..927ca16 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java @@ -1,6 +1,313 @@ package org.jeecg.modules.api.service.Impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +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.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.api.bean.HttpClientUtil; +import org.jeecg.modules.api.bean.PageBean; +import org.jeecg.modules.api.bean.WxQrCodeVo; import org.jeecg.modules.api.service.PartnerService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.studytourConfig.entity.StudytourConfig; +import org.jeecg.modules.studytourConfig.service.IStudytourConfigService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.commons.CommonsMultipartFile; +import javax.annotation.Resource; +import java.io.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +@Slf4j public class PartnerServiceImpl implements PartnerService { + + /******************************************************************************************************************/ + private String appid = "wxee64675d48680dd4";//小程序appid + private String secret = "d7e3f49858350cf40b1aeeb8fa1c61eb";//小程序密钥 + @Value("${jeecg.oss.endpoint}") + private String endpoint; + @Value("${jeecg.oss.accessKey}") + private String accessKey; + @Value("${jeecg.oss.secretKey}") + private String secretKey; + @Value("${jeecg.oss.bucketName}") + private String bucketName; + @Value("${jeecg.oss.staticDomain}") + private String staticDomain; + + //权限验证 + @Resource + private ShiroRealm shiroRealm; + //用户信息 + @Resource + private IHanHaiMemberService hanHaiMemberService; + //配置信息 + @Resource + private IStudytourConfigService studytourConfigService; + /******************************************************************************************************************/ + + @Override + public Result queryDirectList(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 = hanHaiMemberService + .lambdaQuery(); + + //组装查询条件 + + //推荐用户 + query.eq(HanHaiMember::getVid, hanHaiMember.getId()); + + //按照创建时间降序排列 + query.orderByDesc(HanHaiMember::getCreateTime); + + //获取直推用户列表 + pageList = query.page(page); + + log.info("直推用户列表查询结束"); + return Result.OK("直推用户列表", pageList); + }catch (Exception e){ + log.info("直推用户列表查询失败"); + e.printStackTrace(); + return Result.error("直推用户列表查询失败"); + } + } + + @Override + public Result queryIndirectList(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{ + + //1、获取直推用户列表 + List directList = hanHaiMemberService + .lambdaQuery() + .eq(HanHaiMember::getVid, hanHaiMember.getId()) + .list(); + List ids = new ArrayList<>(); + for (HanHaiMember member : directList) { + ids.add(member.getId()); + } + + //2、获取间推用户列表 + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = hanHaiMemberService + .lambdaQuery(); + + //组装查询条件 + + //推荐用户 + query.in(HanHaiMember::getVid, ids); + + //按照创建时间降序排列 + query.orderByDesc(HanHaiMember::getCreateTime); + + //获取间推用户列表 + pageList = query.page(page); + + log.info("间推用户列表查询结束"); + return Result.OK("间推用户列表", pageList); + }catch (Exception e){ + log.info("间推用户列表查询失败"); + e.printStackTrace(); + return Result.error("间推用户列表查询失败"); + } + } + + //邀请二维码 + @Override + public Result getInviteCode(String path) { + //获取版本信息 + StudytourConfig vsion = studytourConfigService.lambdaQuery() + .eq(StudytourConfig::getParamCode, "v_sion") + .one(); + Integer vsionStr = Integer.parseInt(vsion.getParamText()); + String trial = "release"; + if(vsionStr == 0){ + trial= "release"; + }else if(vsionStr == 1){ + trial= "trial"; + }else{ + trial= "develop"; + } + + Map param = new HashMap<>(); + param.put("path", path); //跳转页面 + String accessToken = this.getAccessToken(); + RestTemplate rest = new RestTemplate(); + InputStream inputStream = null; + OutputStream outputStream = null; + File file = null; + + //存储地址 + String codeImg = "/studytour"; + + try{ + String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken; + //param.put("scene", hanHaiMember.getId()); + param.put("width", 150); + param.put("auto_color", false); + param.put("env_version", trial); + Map line_color = new HashMap<>(); + line_color.put("r", 0); + line_color.put("g", 0); + line_color.put("b", 0); + param.put("line_color", line_color); + param.put("is_hyaline", true); + MultiValueMap headers = new LinkedMultiValueMap<>(); + org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers); + ResponseEntity entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]); + byte[] result = entity.getBody(); + + inputStream = new ByteArrayInputStream(result); + String tempSave = codeImg; + String filePath = tempSave; + + file = new File(filePath); + if (!file.exists()) { + file.createNewFile(); + } + outputStream = new FileOutputStream(file); + int len = 0; + byte[] buf = new byte[1024]; + while ((len = inputStream.read(buf, 0, 1024)) != -1) { + outputStream.write(buf, 0, len); + } + outputStream.flush(); + + //将文件上传至阿里云 + DiskFileItemFactory factory = new DiskFileItemFactory(16, null); + FileItem item = factory.createItem("File", "text/plain", true, file.getName()); + int bytesRead = 0; + byte[] buffer = new byte[8192]; + try { + FileInputStream fis = new FileInputStream(file); + OutputStream os = item.getOutputStream(); + while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) { + os.write(buffer, 0, bytesRead); + } + os.close(); + fis.close(); + } catch (IOException e) { + e.printStackTrace(); + } + MultipartFile mf = new CommonsMultipartFile(item); + //返回图片下载地址 + WxQrCodeVo wxCodeVo = new WxQrCodeVo(); + wxCodeVo.setUrl(staticDomain+this.uploadAliYunOss(mf)); + + wxCodeVo.setName("二维码"); + + return Result.OK(wxCodeVo); + + } catch (Exception e) { + e.printStackTrace(); + } finally { + + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + //删除文件 + if (file.exists()) { + file.delete(); + } + } + return null; + } + + /** + * 获取令牌 + * + * @return + */ + private String getAccessToken() { + String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret; + String doGet2 = HttpClientUtil.doGet2(requestUrl); + Map map = JSON.parseObject(doGet2, new TypeReference>() { + }); + return map.get("access_token"); + } + + /** + * 上传文件至阿里云oss + * + * @return + */ + private String uploadAliYunOss(MultipartFile mf) throws Exception { + String uploadFile = "studytour"; + String fileName = new StringBuffer(mf.getOriginalFilename()).append(".png").toString();// 获取文件名 + String dbpath = uploadFile + File.separator + fileName; + if (dbpath.contains("\\")) { + dbpath = dbpath.replace("\\", "/"); + } + String endpoint = this.endpoint; + String accessKey = this.accessKey; + String secretKey = this.secretKey; + // 创建OSSClient实例。 + OSS ossClient = new OSSClientBuilder().build(endpoint, accessKey, secretKey); + // 上传Byte数组。 + byte[] content = mf.getBytes(); + String bucketName = this.bucketName; + ossClient.putObject(bucketName, dbpath, new ByteArrayInputStream(content)); + // 关闭OSSClient。 + ossClient.shutdown(); + return dbpath; + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/MetalService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/MetalService.java new file mode 100644 index 0000000..2bbe1a3 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/MetalService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.api.service; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; +import org.springframework.web.bind.annotation.RequestHeader; + +public interface MetalService { + + //我的成就-查询勋章列表 + public Result queryMedalList(String token, PageBean pageBean); + + //我的成就-点亮勋章 + public Result lightMedal(String token, String medalId); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/PartnerService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/PartnerService.java index 6e1c5f0..a4c3337 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/PartnerService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/PartnerService.java @@ -1,4 +1,17 @@ package org.jeecg.modules.api.service; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.PageBean; + public interface PartnerService { + + //我的团队-获取直推用户列表 + public Result queryDirectList(String token, PageBean pageBean); + + //我的团队-获取间推用户列表 + public Result queryIndirectList(String token, PageBean pageBean); + + //合伙人-邀请二维码 + public Result getInviteCode(String path); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java index 71218ec..f18e249 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java @@ -22,7 +22,7 @@ import javax.annotation.Resource; public class ExperienceController { /******************************************************************************************************************/ - //配置信息 + //成长档案信息 @Resource private ExperienceService experienceService; /******************************************************************************************************************/ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/MetalController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/MetalController.java new file mode 100644 index 0000000..083994d --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/MetalController.java @@ -0,0 +1,41 @@ +package org.jeecg.modules.api.studytourController; + +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.MetalService; +import org.jeecg.modules.studytourRecord.entity.StudytourRecord; +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("/studytour/metal") +@Slf4j +public class MetalController { + + /******************************************************************************************************************/ + //成长档案信息 + @Resource + private MetalService metalService; + /******************************************************************************************************************/ + + @ApiOperation(value="我的成就-查询勋章列表", notes="我的成就-查询勋章列表") + @RequestMapping(value = "/queryMedalList", method = {RequestMethod.GET}) + public Result queryMedalList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return metalService.queryMedalList(token, pageBean); + } + + @ApiOperation(value="我的成就-点亮勋章", notes="我的成就-点亮勋章") + @RequestMapping(value = "/lightMedal", method = {RequestMethod.POST}) + public Result lightMedal(@RequestHeader("X-Access-Token") String token, String medalId){ + return metalService.lightMedal(token, medalId); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/PartnerController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/PartnerController.java index d27d1c2..d891978 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/PartnerController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/PartnerController.java @@ -5,12 +5,15 @@ 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.MetalService; +import org.jeecg.modules.api.service.PartnerService; import org.jeecg.modules.studytourPartner.entity.StudytourPartner; 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; import java.math.BigDecimal; @Api(tags="合伙人-相关接口") @@ -19,28 +22,34 @@ import java.math.BigDecimal; @Slf4j public class PartnerController { - @ApiOperation(value="合伙人-申请成为合伙人", notes="合伙人-申请成为合伙人") - @RequestMapping(value = "/applyPartner", method = {RequestMethod.POST}) - public Result applyPartner(@RequestHeader("X-Access-Token") String token, StudytourPartner studytourPartner){ - return Result.OK("接口暂未处理"); - } + /******************************************************************************************************************/ + //合伙人信息 + @Resource + private PartnerService partnerService; + /******************************************************************************************************************/ + +// @ApiOperation(value="合伙人-申请成为合伙人", notes="合伙人-申请成为合伙人") +// @RequestMapping(value = "/applyPartner", method = {RequestMethod.POST}) +// public Result applyPartner(@RequestHeader("X-Access-Token") String token, StudytourPartner studytourPartner){ +// return Result.OK("接口暂未处理"); +// } @ApiOperation(value="我的团队-获取直推用户列表", notes="我的团队-获取直推用户列表") @RequestMapping(value = "/queryDirectList", method = {RequestMethod.GET}) public Result queryDirectList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return Result.OK("接口暂未处理"); + return partnerService.queryDirectList(token, pageBean); } @ApiOperation(value="我的团队-获取间推用户列表", notes="我的团队-获取间推用户列表") @RequestMapping(value = "/queryIndirectList", method = {RequestMethod.GET}) public Result queryIndirectList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return Result.OK("接口暂未处理"); + return partnerService.queryIndirectList(token, pageBean); } @ApiOperation(value="合伙人-邀请二维码", notes="合伙人-邀请二维码") @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST}) public Result getInviteCode(String path){ - return Result.OK("接口暂未处理"); + return partnerService.getInviteCode(path); } @ApiOperation(value="合伙人-提现", notes="合伙人-提现") 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 index f0c99e3..caa2e1a 100644 --- 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 @@ -16,6 +16,16 @@ public class CommonUtils { return now; } + //获取当前日期 + public static Date 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 now; + } + //获取延长时间 public static Date getValidTime(Date oldTime, int month){ // 创建Calendar实例