新增推送设置、删除生成错的

module_kzks/src/main/java/org/jeecg/modules/demo/projectXushiCost/mapper/ProjectXushiCostMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.demo.projectXushiCost.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.projectXushiCost.entity.ProjectXushiCost;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 虚实成本
- * @Author: jeecg-boot
- * @Date:   2023-08-07
- * @Version: V1.0
- */
-public interface ProjectXushiCostMapper extends BaseMapper<ProjectXushiCost> {
-
-}

module_kzks/src/main/java/org/jeecg/modules/demo/projectXushiCost/service/IProjectXushiCostService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.demo.projectXushiCost.service;
-
-import org.jeecg.modules.demo.projectXushiCost.entity.ProjectXushiCost;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 虚实成本
- * @Author: jeecg-boot
- * @Date:   2023-08-07
- * @Version: V1.0
- */
-public interface IProjectXushiCostService extends IService<ProjectXushiCost> {
-
-}

module_kzks/src/main/java/org/jeecg/modules/demo/projectXushiCost/service/impl/ProjectXushiCostServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.demo.projectXushiCost.service.impl;
-
-import org.jeecg.modules.demo.projectXushiCost.entity.ProjectXushiCost;
-import org.jeecg.modules.demo.projectXushiCost.mapper.ProjectXushiCostMapper;
-import org.jeecg.modules.demo.projectXushiCost.service.IProjectXushiCostService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 虚实成本
- * @Author: jeecg-boot
- * @Date:   2023-08-07
- * @Version: V1.0
- */
-@Service
-public class ProjectXushiCostServiceImpl extends ServiceImpl<ProjectXushiCostMapper, ProjectXushiCost> implements IProjectXushiCostService {
-
-}

module_kzks/src/main/java/org/jeecg/modules/demo/projectXushiCost/controller/ProjectXushiCostController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.demo.projectXushiCost.controller;
+package org.jeecg.modules.projectPushSet.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ 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.demo.projectXushiCost.entity.ProjectXushiCost;
-import org.jeecg.modules.demo.projectXushiCost.service.IProjectXushiCostService;
+import org.jeecg.modules.projectPushSet.entity.ProjectPushSet;
+import org.jeecg.modules.projectPushSet.service.IProjectPushSetService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,68 +37,68 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 虚实成本
+ * @Description: 推送设置
  * @Author: jeecg-boot
- * @Date:   2023-08-07
+ * @Date:   2023-08-08
  * @Version: V1.0
  */
-@Api(tags="虚实成本")
+@Api(tags="推送设置")
 @RestController
-@RequestMapping("/projectXushiCost/projectXushiCost")
+@RequestMapping("/projectPushSet/projectPushSet")
 @Slf4j
-public class ProjectXushiCostController extends JeecgController<ProjectXushiCost, IProjectXushiCostService> {
+public class ProjectPushSetController extends JeecgController<ProjectPushSet, IProjectPushSetService> {
 	@Autowired
-	private IProjectXushiCostService projectXushiCostService;
+	private IProjectPushSetService projectPushSetService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param projectXushiCost
+	 * @param projectPushSet
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "虚实成本-分页列表查询")
-	@ApiOperation(value="虚实成本-分页列表查询", notes="虚实成本-分页列表查询")
+	//@AutoLog(value = "推送设置-分页列表查询")
+	@ApiOperation(value="推送设置-分页列表查询", notes="推送设置-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<ProjectXushiCost>> queryPageList(ProjectXushiCost projectXushiCost,
+	public Result<IPage<ProjectPushSet>> queryPageList(ProjectPushSet projectPushSet,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ProjectXushiCost> queryWrapper = QueryGenerator.initQueryWrapper(projectXushiCost, req.getParameterMap());
-		Page<ProjectXushiCost> page = new Page<ProjectXushiCost>(pageNo, pageSize);
-		IPage<ProjectXushiCost> pageList = projectXushiCostService.page(page, queryWrapper);
+		QueryWrapper<ProjectPushSet> queryWrapper = QueryGenerator.initQueryWrapper(projectPushSet, req.getParameterMap());
+		Page<ProjectPushSet> page = new Page<ProjectPushSet>(pageNo, pageSize);
+		IPage<ProjectPushSet> pageList = projectPushSetService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param projectXushiCost
+	 * @param projectPushSet
 	 * @return
 	 */
-	@AutoLog(value = "虚实成本-添加")
-	@ApiOperation(value="虚实成本-添加", notes="虚实成本-添加")
-	//@RequiresPermissions("org.jeecg.modules.demo:project_xushi_cost:add")
+	@AutoLog(value = "推送设置-添加")
+	@ApiOperation(value="推送设置-添加", notes="推送设置-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_push_set:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ProjectXushiCost projectXushiCost) {
-		projectXushiCostService.save(projectXushiCost);
+	public Result<String> add(@RequestBody ProjectPushSet projectPushSet) {
+		projectPushSetService.save(projectPushSet);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param projectXushiCost
+	 * @param projectPushSet
 	 * @return
 	 */
-	@AutoLog(value = "虚实成本-编辑")
-	@ApiOperation(value="虚实成本-编辑", notes="虚实成本-编辑")
-	//@RequiresPermissions("org.jeecg.modules.demo:project_xushi_cost:edit")
+	@AutoLog(value = "推送设置-编辑")
+	@ApiOperation(value="推送设置-编辑", notes="推送设置-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_push_set:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ProjectXushiCost projectXushiCost) {
-		projectXushiCostService.updateById(projectXushiCost);
+	public Result<String> edit(@RequestBody ProjectPushSet projectPushSet) {
+		projectPushSetService.updateById(projectPushSet);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -108,12 +108,12 @@ public class ProjectXushiCostController extends JeecgController<ProjectXushiCost
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "虚实成本-通过id删除")
-	@ApiOperation(value="虚实成本-通过id删除", notes="虚实成本-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules.demo:project_xushi_cost:delete")
+	@AutoLog(value = "推送设置-通过id删除")
+	@ApiOperation(value="推送设置-通过id删除", notes="推送设置-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_push_set:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		projectXushiCostService.removeById(id);
+		projectPushSetService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -123,12 +123,12 @@ public class ProjectXushiCostController extends JeecgController<ProjectXushiCost
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "虚实成本-批量删除")
-	@ApiOperation(value="虚实成本-批量删除", notes="虚实成本-批量删除")
-	//@RequiresPermissions("org.jeecg.modules.demo:project_xushi_cost:deleteBatch")
+	@AutoLog(value = "推送设置-批量删除")
+	@ApiOperation(value="推送设置-批量删除", notes="推送设置-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_push_set:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.projectXushiCostService.removeByIds(Arrays.asList(ids.split(",")));
+		this.projectPushSetService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -138,27 +138,27 @@ public class ProjectXushiCostController extends JeecgController<ProjectXushiCost
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "虚实成本-通过id查询")
-	@ApiOperation(value="虚实成本-通过id查询", notes="虚实成本-通过id查询")
+	//@AutoLog(value = "推送设置-通过id查询")
+	@ApiOperation(value="推送设置-通过id查询", notes="推送设置-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<ProjectXushiCost> queryById(@RequestParam(name="id",required=true) String id) {
-		ProjectXushiCost projectXushiCost = projectXushiCostService.getById(id);
-		if(projectXushiCost==null) {
+	public Result<ProjectPushSet> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectPushSet projectPushSet = projectPushSetService.getById(id);
+		if(projectPushSet==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(projectXushiCost);
+		return Result.OK(projectPushSet);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param projectXushiCost
+    * @param projectPushSet
     */
-    //@RequiresPermissions("org.jeecg.modules.demo:project_xushi_cost:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_push_set:exportXls")
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ProjectXushiCost projectXushiCost) {
-        return super.exportXls(request, projectXushiCost, ProjectXushiCost.class, "虚实成本");
+    public ModelAndView exportXls(HttpServletRequest request, ProjectPushSet projectPushSet) {
+        return super.exportXls(request, projectPushSet, ProjectPushSet.class, "推送设置");
     }
 
     /**
@@ -168,10 +168,10 @@ public class ProjectXushiCostController extends JeecgController<ProjectXushiCost
     * @param response
     * @return
     */
-    //@RequiresPermissions("project_xushi_cost:importExcel")
+    //@RequiresPermissions("kzks_project_push_set:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ProjectXushiCost.class);
+        return super.importExcel(request, response, ProjectPushSet.class);
     }
 
 }

module_kzks/src/main/java/org/jeecg/modules/demo/projectXushiCost/entity/ProjectXushiCost.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.demo.projectXushiCost.entity;
+package org.jeecg.modules.projectPushSet.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -19,37 +19,37 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 虚实成本
+ * @Description: 推送设置
  * @Author: jeecg-boot
- * @Date:   2023-08-07
+ * @Date:   2023-08-08
  * @Version: V1.0
  */
 @Data
-@TableName("project_xushi_cost")
+@TableName("kzks_project_push_set")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="project_xushi_cost对象", description="虚实成本")
-public class ProjectXushiCost implements Serializable {
+@ApiModel(value="kzks_project_push_set对象", description="推送设置")
+public class ProjectPushSet implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "id")
     private java.lang.String id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**所属部门*/

module_kzks/src/main/java/org/jeecg/modules/projectPushSet/mapper/ProjectPushSetMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.projectPushSet.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.projectPushSet.entity.ProjectPushSet;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 推送设置
+ * @Author: jeecg-boot
+ * @Date:   2023-08-08
+ * @Version: V1.0
+ */
+public interface ProjectPushSetMapper extends BaseMapper<ProjectPushSet> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/demo/projectXushiCost/mapper/xml/ProjectXushiCostMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.projectXushiCost.mapper.ProjectXushiCostMapper">
+<mapper namespace="org.jeecg.modules.projectPushSet.mapper.ProjectPushSetMapper">
 
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectPushSet/service/IProjectPushSetService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectPushSet.service;
+
+import org.jeecg.modules.projectPushSet.entity.ProjectPushSet;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 推送设置
+ * @Author: jeecg-boot
+ * @Date:   2023-08-08
+ * @Version: V1.0
+ */
+public interface IProjectPushSetService extends IService<ProjectPushSet> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectPushSet/service/impl/ProjectPushSetServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectPushSet.service.impl;
+
+import org.jeecg.modules.projectPushSet.entity.ProjectPushSet;
+import org.jeecg.modules.projectPushSet.mapper.ProjectPushSetMapper;
+import org.jeecg.modules.projectPushSet.service.IProjectPushSetService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 推送设置
+ * @Author: jeecg-boot
+ * @Date:   2023-08-08
+ * @Version: V1.0
+ */
+@Service
+public class ProjectPushSetServiceImpl extends ServiceImpl<ProjectPushSetMapper, ProjectPushSet> implements IProjectPushSetService {
+
+}