代码优化

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm

@@ -4,7 +4,7 @@ import ${packageName}.domain.${ClassName};
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.bo.${ClassName}Bo;
 import ${packageName}.domain.${ClassName};
-import org.dromara.server.base.IBaseService;
+import org.dromara.common.mybatis.service.IBaseService;
 
 import java.util.Collection;
 import java.util.List;

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -16,7 +16,7 @@ import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.service.I${ClassName}Service;
-import org.dromara.server.base.AbstractBaseService;
+import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 import java.util.List;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/UserProfileController.java

 package org.dromara.server.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.server.domain.bo.UserProfileBo;
+import org.dromara.server.domain.vo.UserProfileUpdateTrainInfo;
 import org.dromara.server.domain.vo.UserProfileVo;
 import org.dromara.server.service.IUserProfileService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 用户信息
  * 前端访问路由地址为:/server/profile
@@ -48,60 +39,21 @@ public class UserProfileController extends BaseController {
     }
 
     /**
-     * 导出用户信息列表
-     */
-    @SaCheckPermission("server:profile:export")
-    @Log(title = "用户信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(UserProfileBo bo, HttpServletResponse response) {
-        List<UserProfileVo> list = userProfileService.queryList(bo);
-        ExcelUtil.exportExcel(list, "用户信息", UserProfileVo.class, response);
-    }
-
-    /**
-     * 获取用户信息详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("server:profile:query")
-    @GetMapping("/{id}")
-    public R<UserProfileVo> getInfo(@NotNull(message = "主键不能为空")
-                                    @PathVariable Long id) {
-        return R.ok(userProfileService.queryById(id));
-    }
-
-    /**
-     * 新增用户信息
-     */
-    @SaCheckPermission("server:profile:add")
-    @Log(title = "用户信息", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserProfileBo bo) {
-        return toAjax(userProfileService.insertByBo(bo));
-    }
-
-    /**
-     * 修改用户信息
+     * 获取个人信息
      */
-    @SaCheckPermission("server:profile:edit")
-    @Log(title = "用户信息", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserProfileBo bo) {
-        return toAjax(userProfileService.updateByBo(bo));
+    @GetMapping("/userInfo")
+    public R<UserProfileVo> getUserInfo() {
+        return R.ok(userProfileService.getOne(new UserProfileBo().setSystemUserId(LoginHelper.getUserId())));
     }
 
     /**
-     * 删除用户信息
-     *
-     * @param ids 主键串
+     * 跟新12306账号信息
      */
-    @SaCheckPermission("server:profile:remove")
-    @Log(title = "用户信息", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(userProfileService.deleteWithValidByIds(List.of(ids), true));
+    @PostMapping("/updateTrainInfo")
+    public R<Void> updateTrainInfo(@Validated @RequestBody UserProfileUpdateTrainInfo bo) {
+        UserProfileVo up = userProfileService.getOne(new UserProfileBo().setSystemUserId(LoginHelper.getUserId()));
+        up.setTrainAccount(bo.getTrainAccount());
+        up.setTrainPassword(bo.getTrainPassword());
+        return R.ok();
     }
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/UserProfileUpdateTrainInfo.java

+package org.dromara.server.domain.vo;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+/**
+ * @author hzh
+ * @date 2025-01-14
+ **/
+@Data
+public class UserProfileUpdateTrainInfo {
+
+    /**
+     * 火车票账号
+     */
+    @NotEmpty(message = "12306账号不能为空")
+    private String trainAccount;
+
+    /**
+     * 火车票密码
+     */
+    @NotEmpty(message = "12306密码不能为空")
+    private String trainPassword;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java

@@ -50,6 +50,12 @@ public class SysTenantVo implements Serializable {
     @ExcelProperty(value = "联系电话")
     private String contactPhone;
 
+    /**
+     * 企业码
+     */
+    @ExcelProperty(value = "企业码")
+    private String companyCode;
+
     /**
      * 企业名称
      */