diff --git a/admin-hanhai-vue/src/views/customs/TbCustomsList.vue b/admin-hanhai-vue/src/views/customs/TbCustomsList.vue index f8aee87..6d56a6f 100644 --- a/admin-hanhai-vue/src/views/customs/TbCustomsList.vue +++ b/admin-hanhai-vue/src/views/customs/TbCustomsList.vue @@ -159,11 +159,6 @@ return parseInt(index)+1; } }, - { - title:'用户id', - align:"center", - dataIndex: 'userId' - }, { title:'角色身份', align:"center", diff --git a/admin-hanhai-vue/src/views/tbConf/TbConfList.vue b/admin-hanhai-vue/src/views/tbConf/TbConfList.vue new file mode 100644 index 0000000..79a4ee5 --- /dev/null +++ b/admin-hanhai-vue/src/views/tbConf/TbConfList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/tbConf/modules/TbConfForm.vue b/admin-hanhai-vue/src/views/tbConf/modules/TbConfForm.vue new file mode 100644 index 0000000..6c09697 --- /dev/null +++ b/admin-hanhai-vue/src/views/tbConf/modules/TbConfForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.Style#Drawer.vue new file mode 100644 index 0000000..c015084 --- /dev/null +++ b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.vue b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.vue new file mode 100644 index 0000000..b56d67b --- /dev/null +++ b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.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/product/entity/TbProduct.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java index dbc26a6..2d36aa8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java @@ -100,16 +100,16 @@ public class TbProduct implements Serializable { @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; /**所属部门*/ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java new file mode 100644 index 0000000..ff4c64c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java @@ -0,0 +1,156 @@ +package org.jeecg.modules.tbConf.controller; + +import java.util.Arrays; +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.modules.tbConf.entity.TbConf; +import org.jeecg.modules.tbConf.service.ITbConfService; + +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.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: tb_conf + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +@Api(tags="tb_conf") +@RestController +@RequestMapping("/tbConf/tbConf") +@Slf4j +public class TbConfController extends JeecgController { + @Autowired + private ITbConfService tbConfService; + + /** + * 分页列表查询 + * + * @param tbConf + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "tb_conf-分页列表查询") + @ApiOperation(value="tb_conf-分页列表查询", notes="tb_conf-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TbConf tbConf, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbConf, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = tbConfService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param tbConf + * @return + */ + @AutoLog(value = "tb_conf-添加") + @ApiOperation(value="tb_conf-添加", notes="tb_conf-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody TbConf tbConf) { + tbConfService.save(tbConf); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param tbConf + * @return + */ + @AutoLog(value = "tb_conf-编辑") + @ApiOperation(value="tb_conf-编辑", notes="tb_conf-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TbConf tbConf) { + tbConfService.updateById(tbConf); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "tb_conf-通过id删除") + @ApiOperation(value="tb_conf-通过id删除", notes="tb_conf-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + tbConfService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "tb_conf-批量删除") + @ApiOperation(value="tb_conf-批量删除", notes="tb_conf-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.tbConfService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "tb_conf-通过id查询") + @ApiOperation(value="tb_conf-通过id查询", notes="tb_conf-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TbConf tbConf = tbConfService.getById(id); + if(tbConf==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(tbConf); + } + + /** + * 导出excel + * + * @param request + * @param tbConf + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TbConf tbConf) { + return super.exportXls(request, tbConf, TbConf.class, "tb_conf"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TbConf.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/entity/TbConf.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/entity/TbConf.java new file mode 100644 index 0000000..5c68656 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/entity/TbConf.java @@ -0,0 +1,77 @@ +package org.jeecg.modules.tbConf.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: tb_conf + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +@Data +@TableName("tb_conf") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="tb_conf对象", description="tb_conf") +public class TbConf implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Integer id; + /**key*/ + @Excel(name = "key", width = 15) + @ApiModelProperty(value = "key") + private java.lang.String name; + /**配置值*/ + @Excel(name = "配置值", width = 15) + @ApiModelProperty(value = "配置值") + private java.lang.String value; + /**配置项*/ + @Excel(name = "配置项", width = 15) + @ApiModelProperty(value = "配置项") + private java.lang.String info; + /**分组*/ + @Excel(name = "分组", width = 15) + @ApiModelProperty(value = "分组") + private java.lang.String dictGroup; + /**分组说明*/ + @Excel(name = "分组说明", width = 15) + @ApiModelProperty(value = "分组说明") + private java.lang.String dictGroupInfo; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /**修改时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "修改时间") + private java.util.Date updateTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/TbConfMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/TbConfMapper.java new file mode 100644 index 0000000..39dcc51 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/TbConfMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.tbConf.mapper; + +import org.jeecg.modules.tbConf.entity.TbConf; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: tb_conf + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +public interface TbConfMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/xml/TbConfMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/xml/TbConfMapper.xml new file mode 100644 index 0000000..cc743cf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/xml/TbConfMapper.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/tbConf/service/ITbConfService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/service/ITbConfService.java new file mode 100644 index 0000000..486fcd4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/service/ITbConfService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.tbConf.service; + +import org.jeecg.modules.tbConf.entity.TbConf; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: tb_conf + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +public interface ITbConfService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/service/impl/TbConfServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/service/impl/TbConfServiceImpl.java new file mode 100644 index 0000000..a487cef --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/service/impl/TbConfServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.tbConf.service.impl; + +import org.jeecg.modules.tbConf.entity.TbConf; +import org.jeecg.modules.tbConf.mapper.TbConfMapper; +import org.jeecg.modules.tbConf.service.ITbConfService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: tb_conf + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +@Service +public class TbConfServiceImpl extends ServiceImpl implements ITbConfService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/TbConfList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/TbConfList.vue new file mode 100644 index 0000000..864b1f2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/TbConfList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfForm.vue new file mode 100644 index 0000000..6c09697 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfForm.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/tbConf/vue/modules/TbConfModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfModal.Style#Drawer.vue new file mode 100644 index 0000000..c015084 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfModal.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/tbConf/vue/modules/TbConfModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfModal.vue new file mode 100644 index 0000000..b56d67b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfModal.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/tbConf/vue3/TbConf.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConf.api.ts new file mode 100644 index 0000000..485071f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConf.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/tbConf/tbConf/list', + save='/tbConf/tbConf/add', + edit='/tbConf/tbConf/edit', + deleteOne = '/tbConf/tbConf/delete', + deleteBatch = '/tbConf/tbConf/deleteBatch', + importExcel = '/tbConf/tbConf/importExcel', + exportXls = '/tbConf/tbConf/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/tbConf/vue3/TbConf.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConf.data.ts new file mode 100644 index 0000000..510708e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConf.data.ts @@ -0,0 +1,33 @@ +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: 'value' + }, + { + title: '配置项', + align:"center", + dataIndex: 'info' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '配置值', + field: 'value', + component: 'Input', + }, + { + label: '配置项', + field: 'info', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConfList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConfList.vue new file mode 100644 index 0000000..002e33c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConfList.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/tbConf/vue3/components/TbConfModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/components/TbConfModal.vue new file mode 100644 index 0000000..fe0720d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/components/TbConfModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java index d444c1d..44dd4e4 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java @@ -131,8 +131,8 @@ public class ProductController extends JeecgController addProduct(@RequestBody ProductReq productReq, @RequestHeader("X-Access-Token") String token) { - tbProductService.addProduct(productReq, token); - return Result.OK("添加成功！"); + + return tbProductService.addProduct(productReq, token); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/IndexServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/IndexServiceImpl.java index 3cef05e..1baf703 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/IndexServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/IndexServiceImpl.java @@ -12,6 +12,8 @@ import org.jeecg.modules.banner.entity.WebBanner; import org.jeecg.modules.banner.service.IWebBannerService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.tbConf.entity.TbConf; +import org.jeecg.modules.tbConf.service.ITbConfService; import org.jeecg.modules.userRole.entity.TbUserRole; import org.jeecg.modules.userRole.service.ITbUserRoleService; import org.jeecg.modules.utils.ValidateTool; @@ -31,7 +33,7 @@ public class IndexServiceImpl implements IndexService { @Resource private IWebBannerService webBannerService; @Autowired - private IHanHaiMemberService iHanHaiMemberService; + private ITbConfService tbConfService; @Autowired private ShiroRealm shiroRealm; @Resource @@ -44,8 +46,10 @@ public class IndexServiceImpl implements IndexService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); hanHaiMember.setPasswordSalt(null); JSONObject jsonObject = new JSONObject(); - Object sys_phone = redisUtil.get("sys_phone"); - jsonObject.put("phone", ValidateTool.isNull(sys_phone) ? "19198239116" : String.valueOf(sys_phone)); + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("name","sys_phone"); + TbConf one = tbConfService.getOne(objectQueryWrapper); + jsonObject.put("phone", ValidateTool.isNull(one) ? "19198239116" : one.getValue()); jsonObject.put("my", hanHaiMember); LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java index 9f14e12..fa31377 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java @@ -24,26 +24,11 @@ import java.util.Date; public class ProductReq implements Serializable { private static final long serialVersionUID = 1L; - /**供应商名称*/ - @Excel(name = "供应商名称", width = 15) - @ApiModelProperty(value = "供应商名称") - private String companyName; - /**客户姓名*/ - @Excel(name = "客户姓名", width = 15) - @ApiModelProperty(value = "客户姓名") - private String userName; - /**客户电话*/ - @Excel(name = "客户电话", width = 15) - @ApiModelProperty(value = "客户电话") - private String phone; + /**地址id*/ @Excel(name = "地址id", width = 15) @ApiModelProperty(value = "地址id") private String addressId; - /**报价照片*/ - @Excel(name = "报价照片", width = 15) - @ApiModelProperty(value = "报价照片") - private String pic; /**单价*/ @Excel(name = "单价", width = 15) @ApiModelProperty(value = "单价") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java index 73f6a1f..894afe4 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java @@ -15,7 +15,7 @@ import org.jeecg.modules.product.entity.TbProduct; */ public interface ProductService extends IService { - void addProduct(ProductReq productReq,String token); + Result addProduct(ProductReq productReq,String token); Result addProductOrder(ProductOrderReq productReq, String token); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java index 69ea1f1..c2e3d90 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java @@ -4,10 +4,13 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.address.entity.TbAddress; +import org.jeecg.modules.address.service.ITbAddressService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.postBean.ProductOrderReq; import org.jeecg.modules.postBean.UpdateOrderReq; import org.jeecg.modules.product.entity.ProductReq; @@ -22,8 +25,6 @@ import org.jeecg.modules.userRole.service.ITbUserRoleService; import org.jeecg.modules.utils.ValidateTool; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -32,7 +33,7 @@ import java.math.BigDecimal; /** * @Description: 产品报价表 * @Author: jeecg-boot - * @Date: 2024-10-19 + * @Date: 2024-10-19 * @Version: V1.0 */ @Service @@ -47,25 +48,39 @@ public class ProductServiceImpl extends ServiceImpl private TbProductMapper tbProductMapper; @Resource private ITbProductOrderService tbProductOrderService; - + @Resource + private ITbAddressService addressService; + @Resource + private RedisUtil redisUtil; @Transactional(rollbackFor = Exception.class) @Override - public void addProduct(ProductReq productReq,String token) { - + public Result addProduct(ProductReq productReq, String token) { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); - objectLambdaQueryWrapper.eq(TbUserRole::getUserId,hanHaiMember.getId()). - eq(TbUserRole::getRole,1).eq(TbUserRole::getAuditStatus,1); + objectLambdaQueryWrapper.eq(TbUserRole::getUserId, hanHaiMember.getId()). + eq(TbUserRole::getRole, 1).eq(TbUserRole::getAuditStatus, 1); TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper); + if (ValidateTool.isNull(one1)) { + return Result.error("身份审核未通过"); + } + TbAddress byId = addressService.getById(productReq.getAddressId()); + if (ValidateTool.isNull(byId)) { + return Result.error("请选择地址"); + } + Object productPic = redisUtil.get("productPic"); TbProduct product = new TbProduct(); BeanUtils.copyProperties(productReq, product); product.setUserId(hanHaiMember.getId()); product.setCompanyName(one1.getCompanyName()); product.setAuditStatus(0); + product.setAddress(byId.getAddress()); product.setShowStatus(2); + //默认图片 + product.setPic(ValidateTool.isNull(productPic) ? "https://dianpin-img.xzaiyp.top/upload/组467843x_1729332845907.png" : String.valueOf(productPic)); product.setProductType(2); tbProductMapper.insert(product); + return Result.OK("添加成功！"); } @Transactional(rollbackFor = Exception.class) @@ -75,21 +90,21 @@ public class ProductServiceImpl extends ServiceImpl QueryWrapper productQueryWrapper = new QueryWrapper<>(); productQueryWrapper.eq("id", productReq.getProductId()); TbProduct product = tbProductService.getOne(productQueryWrapper); - if (ValidateTool.isNull(product)){ + if (ValidateTool.isNull(product)) { return Result.error("订单信息错误"); } - if (product.getAuditStatus()!=1 || product.getShowStatus()!=0){ + if (product.getAuditStatus() != 1 || product.getShowStatus() != 0) { return Result.error("订单状态异常，请刷新"); } QueryWrapper objectQueryWrapper = new QueryWrapper<>(); - objectQueryWrapper.eq("user_id",hanHaiMember.getId()).eq("role",0); + objectQueryWrapper.eq("user_id", hanHaiMember.getId()).eq("role", 0); TbUserRole one2 = tbUserRoleService.getOne(objectQueryWrapper); TbProductOrder tbProductOrder = new TbProductOrder(); BeanUtils.copyProperties(productReq, tbProductOrder); - if (ValidateTool.isNull(productReq.getNum())){ + if (ValidateTool.isNull(productReq.getNum())) { return Result.error("请选择数量"); } - if (productReq.getNum()>product.getNum()){ + if (productReq.getNum() > product.getNum()) { return Result.error("产品数量不足"); } // 总价 @@ -105,16 +120,16 @@ public class ProductServiceImpl extends ServiceImpl tbProductOrder.setPic(product.getPic()); tbProductOrder.setPrice(product.getPrice()); tbProductOrder.setTakeTime(productReq.getTakeTime()); - LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); - objectLambdaQueryWrapper.eq(TbUserRole::getUserId,product.getUserId()). - eq(TbUserRole::getRole,1).eq(TbUserRole::getAuditStatus,1); + LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); + objectLambdaQueryWrapper.eq(TbUserRole::getUserId, product.getUserId()). + eq(TbUserRole::getRole, 1).eq(TbUserRole::getAuditStatus, 1); TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper); JSONObject jsonObject = new JSONObject(); tbProductOrder.setCompanyName(one1.getCompanyName()); - jsonObject.put("bankAccount",one1.getBankAccount()); - jsonObject.put("companyName",one1.getCompanyName()); - jsonObject.put("bankName",one1.getBankNama()); - jsonObject.put("orderId",tbProductOrder.getId()); + jsonObject.put("bankAccount", one1.getBankAccount()); + jsonObject.put("companyName", one1.getCompanyName()); + jsonObject.put("bankName", one1.getBankNama()); + jsonObject.put("orderId", tbProductOrder.getId()); tbProductOrderService.save(tbProductOrder); return Result.OK(jsonObject); } @@ -123,13 +138,13 @@ public class ProductServiceImpl extends ServiceImpl @Override public Result updateOrder(UpdateOrderReq updateOrderReq, String token) { TbProductOrder order = tbProductOrderService.getById(updateOrderReq.getOrderId()); - if (ValidateTool.isNull(order)){ + if (ValidateTool.isNull(order)) { return Result.error("订单信息错误"); } - if (updateOrderReq.getType()==0){ + if (updateOrderReq.getType() == 0) { order.setOrderFlag(1); } - if (updateOrderReq.getType()==1){ + if (updateOrderReq.getType() == 1) { order.setOrderFlag(2); } tbProductOrderService.updateById(order);