diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseAppController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseAppController.java new file mode 100644 index 0000000..86536a7 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseAppController.java @@ -0,0 +1,112 @@ +package com.ruoyi.base.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.base.domain.BaseApp; +import com.ruoyi.base.service.IBaseAppService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * app版本管理Controller + * + * @author vinjor-m + * @date 2025-08-25 + */ +@RestController +@RequestMapping("/base/app") +public class BaseAppController extends BaseController +{ + @Autowired + private IBaseAppService baseAppService; + + /** + * 查询app版本管理列表 + */ + @PreAuthorize("@ss.hasPermi('base:app:list')") + @GetMapping("/list") + public AjaxResult list(BaseApp baseApp, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) + { + Page page = new Page<>(pageNum, pageSize); + IPage list = baseAppService.queryListPage(baseApp,page); + return success(list); + } + + /** + * 导出app版本管理列表 + */ + @PreAuthorize("@ss.hasPermi('base:app:export')") + @Log(title = "app版本管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseApp baseApp) + { + List list = baseAppService.list(); + ExcelUtil util = new ExcelUtil(BaseApp.class); + util.exportExcel(response, list, "app版本管理数据"); + } + + /** + * 获取app版本管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:app:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(baseAppService.getById(id)); + } + + /** + * 新增app版本管理 + */ + @PreAuthorize("@ss.hasPermi('base:app:add')") + @Log(title = "app版本管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseApp baseApp) + { + return toAjax(baseAppService.save(baseApp)); + } + + /** + * 修改app版本管理 + */ + @PreAuthorize("@ss.hasPermi('base:app:edit')") + @Log(title = "app版本管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseApp baseApp) + { + return toAjax(baseAppService.updateById(baseApp)); + } + + /** + * 删除app版本管理 + */ + @PreAuthorize("@ss.hasPermi('base:app:remove')") + @Log(title = "app版本管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + List list = new ArrayList<>(Arrays.asList(ids)); + return toAjax(baseAppService.removeByIds(list)); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java index 8359be2..c41baa6 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java @@ -5,13 +5,11 @@ import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.domain.BaseApp; import com.ruoyi.base.domain.BaseInquiry; import com.ruoyi.base.domain.BasePic; import com.ruoyi.base.domain.BaseSiteInfo; -import com.ruoyi.base.service.IBaseInquiryService; -import com.ruoyi.base.service.IBaseNationalService; -import com.ruoyi.base.service.IBasePicService; -import com.ruoyi.base.service.IBaseSiteInfoService; +import com.ruoyi.base.service.*; import com.ruoyi.busi.domain.*; import com.ruoyi.busi.service.*; import com.ruoyi.busi.utils.CommonUtils; @@ -75,6 +73,8 @@ public class WebController extends BaseController { private CommonUtils commonUtils; @Autowired private ISysDictDataService dictDataService; + @Autowired + private IBaseAppService appService; /** * 导航栏接口--所有分类 @@ -376,8 +376,6 @@ public class WebController extends BaseController { @GetMapping("/inquirySet") public R inquirySet(@RequestParam(required = true) String tenantId, HttpServletRequest request) { String ip = CommonUtils.getIpAddr(request); - System.out.println(ip); - System.out.println(CommonUtils.getAddr(ip)); return R.ok(baseInquiryService.getInquiry(tenantId)); } @@ -498,4 +496,10 @@ public class WebController extends BaseController { public R getCatgIdApp(@RequestParam(required = true) String catgName) { return R.ok(dictDataService.selectDictLabel(APP_MENU_KEY,catgName)); } + + @ApiOperation("查询最新版本APP") + @GetMapping("/getNewApp") + public R getNewApp() { + return R.ok(appService.selectNewApp()); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseApp.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseApp.java new file mode 100644 index 0000000..5e51028 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseApp.java @@ -0,0 +1,44 @@ +package com.ruoyi.base.domain; + +import java.math.BigDecimal; +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; +import com.ruoyi.common.core.domain.DlBaseEntity; + +/** + * app版本管理对象 dl_base_app + * + * @author vinjor-m + * @date 2025-08-25 + */ +@TableName("dl_base_app") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BaseApp extends DlBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 版本 */ + @Excel(name = "版本") + private BigDecimal version; + + /** app包下载地址 */ + @Excel(name = "app包下载地址") + private String apkUrl; + + /** 本次升级描述 */ + @Excel(name = "本次升级描述") + private String content; + +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java index 5894efb..333c883 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java @@ -81,6 +81,14 @@ public class BaseSiteInfo extends DlBaseEntity @Excel(name = "站点logo") @ApiModelProperty("站点logo") private String logo; + /** 站点logo-移动端 */ + @Excel(name = "站点logo-移动端") + @ApiModelProperty("站点logo-移动端") + private String mobileLogo; + /** 询盘logo */ + @Excel(name = "询盘logo") + @ApiModelProperty("询盘logo") + private String formLogo; /** 站点二维码(或手机访问二维码) */ @Excel(name = "站点二维码", readConverterExp = "或=手机访问二维码") diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseAppMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseAppMapper.java new file mode 100644 index 0000000..e9bfd76 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseAppMapper.java @@ -0,0 +1,21 @@ +package com.ruoyi.base.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.domain.BaseApp; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * app版本管理Mapper接口 + * + * @author vinjor-m + * @date 2025-08-25 + */ +@Mapper +public interface BaseAppMapper extends BaseMapper +{ + IPage queryListPage(@Param("entity") BaseApp entity, Page page); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseAppService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseAppService.java new file mode 100644 index 0000000..c0a0dc0 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseAppService.java @@ -0,0 +1,20 @@ +package com.ruoyi.base.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.base.domain.BaseApp; + +/** + * app版本管理Service接口 + * + * @author vinjor-m + * @date 2025-08-25 + */ +public interface IBaseAppService extends IService +{ + IPage queryListPage(BaseApp pageReqVO, Page page); + + BaseApp selectNewApp(); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseAppServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseAppServiceImpl.java new file mode 100644 index 0000000..1522cdd --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseAppServiceImpl.java @@ -0,0 +1,40 @@ +package com.ruoyi.base.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.common.core.domain.DlBaseEntity; +import com.ruoyi.common.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.base.mapper.BaseAppMapper; +import com.ruoyi.base.domain.BaseApp; +import com.ruoyi.base.service.IBaseAppService; + +/** + * app版本管理Service业务层处理 + * + * @author vinjor-m + * @date 2025-08-25 + */ +@Service +public class BaseAppServiceImpl extends ServiceImpl implements IBaseAppService +{ + @Autowired + private BaseAppMapper baseAppMapper; + + @Override + public IPage queryListPage(BaseApp pageReqVO, Page page) { + return baseAppMapper.queryListPage(pageReqVO, page); + } + + @Override + public BaseApp selectNewApp() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().orderByDesc(BaseApp::getVersion).orderByDesc(DlBaseEntity::getCreateTime); + List list = this.list(queryWrapper); + return list.isEmpty()?null:list.get(0); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/resources/application.yml b/dl_admin/ruoyi-admin/src/main/resources/application.yml index e374c89..6e973db 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/application.yml +++ b/dl_admin/ruoyi-admin/src/main/resources/application.yml @@ -57,9 +57,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 100MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 100MB # 服务模块 devtools: restart: diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseAppMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseAppMapper.xml new file mode 100644 index 0000000..b53d06f --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseAppMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + select id, version, apk_url, content, creator, create_time, updater, update_time, del_flag from dl_base_app + + + + \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml index 71e21a6..87db19f 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml @@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -29,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, company_name, fax_number, brand_name, tel, email, teams, copyright, address, icon, logo, qr_code, contact_us,company_info,company_info_app, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_site_info + select id, company_name, fax_number, brand_name, tel, email, teams, copyright, address, icon, logo,mobile_logo,form_logo, qr_code, contact_us,company_info,company_info_app, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_site_info