修改baseEntity,修改自动生成

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbAppUserController.java

@@ -132,17 +132,17 @@ public class TbAppUserController extends BaseController {
     public AjaxResult add(@RequestBody TbAppUser tbAppUser) {
         return toAjax(iTbAppUserService.save(tbAppUser) ? 1 : 0);
     }
-
-    /**
-     * 修改会员
-     */
-    @ApiOperation("修改会员")
-    @PreAuthorize("@ss.hasPermi('system:appUser:edit')" )
-    @Log(title = "会员" , businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TbAppUser tbAppUser) {
-        return toAjax(iTbAppUserService.updateById(tbAppUser) ? 1 : 0);
-    }
+//
+//    /**
+//     * 修改会员
+//     */
+//    @ApiOperation("修改会员")
+//    @PreAuthorize("@ss.hasPermi('system:appUser:edit')" )
+//    @Log(title = "会员" , businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody TbAppUser tbAppUser) {
+//        return toAjax(iTbAppUserService.updateById(tbAppUser) ? 1 : 0);
+//    }
     /**
      * 修改会员+家族成员
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbMyPublishController.java

@@ -29,15 +29,15 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 我的近况（我的发）Controller
+ * 我的近况（发表）
  * 
- * @author Administrator
+ * @author Alex
  * @date 2020-10-02
  */
-@Api(value = "我的近况（我的发）", tags = "我的近况（我的发）")
+@Api(value = "我的近况（发表）", tags = "我的近况（发表）")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/publish" )
+@RequestMapping("/system/publish" )
 public class TbMyPublishController extends BaseController {
 
     private final ITbMyPublishService iTbMyPublishService;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -17,6 +19,7 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
@@ -38,13 +41,16 @@ public class BaseEntity implements Serializable
 
     /** 开始时间 */
     @JsonIgnore
+    @TableField(exist = false)
     private String beginTime;
 
     /** 结束时间 */
     @JsonIgnore
+    @TableField(exist = false)
     private String endTime;
 
     /** 请求参数 */
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -54,7 +54,7 @@ public class VelocityUtils {
         velocityContext.put("datetime", DateUtils.getDate());
         velocityContext.put("pkColumn", genTable.getPkColumn());
         velocityContext.put("importList", getImportList(genTable.getColumns()));
-        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
+        velocityContext.put("permissionPrefix", getPermissionPrefix("system", businessName));
         velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
         setMenuVelocityContext(velocityContext, genTable);

ruoyi-generator/src/main/resources/vm/js/api.js.vm

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询${functionName}列表
 export function list${BusinessName}(query) {
   return request({
-    url: '/${moduleName}/${businessName}/list',
+    url: '/system/${businessName}/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function list${BusinessName}(query) {
 // 查询${functionName}详细
 export function get${BusinessName}(${pkColumn.javaField}) {
   return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    url: '/system/${businessName}/' + ${pkColumn.javaField},
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function get${BusinessName}(${pkColumn.javaField}) {
 // 新增${functionName}
 export function add${BusinessName}(data) {
   return request({
-    url: '/${moduleName}/${businessName}',
+    url: '/system/${businessName}',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function add${BusinessName}(data) {
 // 修改${functionName}
 export function update${BusinessName}(data) {
   return request({
-    url: '/${moduleName}/${businessName}',
+    url: '/system/${businessName}',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function update${BusinessName}(data) {
 // 删除${functionName}
 export function del${BusinessName}(${pkColumn.javaField}) {
   return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    url: '/system/${businessName}/' + ${pkColumn.javaField},
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function del${BusinessName}(${pkColumn.javaField}) {
 // 导出${functionName}
 export function export${BusinessName}(query) {
   return request({
-    url: '/${moduleName}/${businessName}/export',
+    url: '/system/${businessName}/export',
     method: 'get',
     params: query
   })

ruoyi-generator/src/main/resources/vm/sql/sql.vm

@@ -1,22 +1,22 @@
 -- 菜单 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单');
+values('${functionName}', '${parentMenuId}', '1', '${businessName}', 'system/${businessName}/index', 1, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', '2020-10-01', 'admin', '2020-10-01', '${functionName}菜单');
 
 -- 按钮父菜单ID
 SELECT @parentId := LAST_INSERT_ID();
 
 -- 按钮 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}查询', @parentId, '1',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:query',        '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+values('${functionName}查询', @parentId, '1',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:query',        '#', 'admin', '2020-10-01', 'admin', '2020-10-01', '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}新增', @parentId, '2',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:add',          '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+values('${functionName}新增', @parentId, '2',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:add',          '#', 'admin', '2020-10-01', 'admin', '2020-10-01', '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}修改', @parentId, '3',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:edit',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+values('${functionName}修改', @parentId, '3',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:edit',         '#', 'admin', '2020-10-01', 'admin', '2020-10-01', '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}删除', @parentId, '4',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:remove',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+values('${functionName}删除', @parentId, '4',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:remove',       '#', 'admin', '2020-10-01', 'admin', '2020-10-01', '');
 
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}导出', @parentId, '5',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:export',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+values('${functionName}导出', @parentId, '5',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:export',       '#', 'admin', '2020-10-01', 'admin', '2020-10-01', '');

ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -63,7 +63,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
+          v-hasPermi="['system:${businessName}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -73,7 +73,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['${moduleName}:${businessName}:edit']"
+          v-hasPermi="['system:${businessName}:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -83,7 +83,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['${moduleName}:${businessName}:remove']"
+          v-hasPermi="['system:${businessName}:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -92,7 +92,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['${moduleName}:${businessName}:export']"
+          v-hasPermi="['system:${businessName}:export']"
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -129,14 +129,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:edit']"
+            v-hasPermi="['system:${businessName}:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:remove']"
+            v-hasPermi="['system:${businessName}:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -251,7 +251,7 @@
 </template>
 
 <script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/system/${businessName}";
 #foreach($column in $columns)
 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
 import Editor from '@/components/Editor';