Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -0,0 +1,102 @@
+package com.xjrsoft.module.asset.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.asset.dto.AddWfAssetManageDto;
+import com.xjrsoft.module.asset.dto.UpdateWfAssetManageDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
+import com.xjrsoft.module.asset.entity.WfAssetManage;
+import com.xjrsoft.module.asset.service.IWfAssetManageService;
+import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
+
+import com.xjrsoft.module.asset.vo.WfAssetManageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 资产管理
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/asset" + "/wfAssetManage")
+@Api(value = "/asset"  + "/wfAssetManage",tags = "资产管理代码")
+@AllArgsConstructor
+public class WfAssetManageController {
+
+
+    private final IWfAssetManageService wfAssetManageService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="资产管理列表(分页)")
+    @SaCheckPermission("wfassetmanage:detail")
+    public RT<PageOutput<WfAssetManagePageVo>> page(@Valid WfAssetManagePageDto dto){
+
+        LambdaQueryWrapper<WfAssetManage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(WfAssetManage::getId)
+                .select(WfAssetManage.class,x -> VoToColumnUtil.fieldsToColumns(WfAssetManagePageVo.class).contains(x.getProperty()));
+        IPage<WfAssetManage> page = wfAssetManageService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<WfAssetManagePageVo> pageOutput = ConventPage.getPageOutput(page, WfAssetManagePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询资产管理信息")
+    @SaCheckPermission("wfassetmanage:detail")
+    public RT<WfAssetManageVo> info(@RequestParam Long id){
+        WfAssetManage wfAssetManage = wfAssetManageService.getById(id);
+        if (wfAssetManage == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(wfAssetManage, WfAssetManageVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增资产管理")
+    @SaCheckPermission("wfassetmanage:add")
+    public RT<Boolean> add(@Valid @RequestBody AddWfAssetManageDto dto){
+        WfAssetManage wfAssetManage = BeanUtil.toBean(dto, WfAssetManage.class);
+        boolean isSuccess = wfAssetManageService.save(wfAssetManage);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改资产管理")
+    @SaCheckPermission("wfassetmanage:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateWfAssetManageDto dto){
+
+        WfAssetManage wfAssetManage = BeanUtil.toBean(dto, WfAssetManage.class);
+        return RT.ok(wfAssetManageService.updateById(wfAssetManage));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除资产管理")
+    @SaCheckPermission("wfassetmanage:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(wfAssetManageService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/asset/dto/AddWfAssetManageDto.java

@@ -0,0 +1,68 @@
+package com.xjrsoft.module.asset.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 资产管理
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Data
+public class AddWfAssetManageDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 资产类型
+    */
+    @ApiModelProperty("资产类型")
+    private String assetType;
+    /**
+    * 资产类别
+    */
+    @ApiModelProperty("资产类别")
+    private String assetCategory;
+    /**
+    * 资产种类
+    */
+    @ApiModelProperty("资产种类")
+    private String assetSpecies;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 所属部门[xjr_department]
+    */
+    @ApiModelProperty("所属部门[xjr_department]")
+    private Long deptId;
+    /**
+    * 使用人id[xjr_user]
+    */
+    @ApiModelProperty("使用人id[xjr_user]")
+    private Long userId;
+    /**
+    * 金额
+    */
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Short status;
+
+}

src/main/java/com/xjrsoft/module/asset/dto/UpdateWfAssetManageDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.asset.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 资产管理
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Data
+public class UpdateWfAssetManageDto extends AddWfAssetManageDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/asset/dto/WfAssetManagePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.asset.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 资产管理分页查询入参
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WfAssetManagePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/asset/entity/WfAssetManage.java

@@ -0,0 +1,118 @@
+package com.xjrsoft.module.asset.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 资产管理
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Data
+@TableName("wf_asset_manage")
+@ApiModel(value = "wf_asset_manage", description = "资产管理")
+public class WfAssetManage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 资产类型
+    */
+    @ApiModelProperty("资产类型")
+    private String assetType;
+    /**
+    * 资产类别
+    */
+    @ApiModelProperty("资产类别")
+    private String assetCategory;
+    /**
+    * 资产种类
+    */
+    @ApiModelProperty("资产种类")
+    private String assetSpecies;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 所属部门[xjr_department]
+    */
+    @ApiModelProperty("所属部门[xjr_department]")
+    private Long deptId;
+    /**
+    * 使用人id[xjr_user]
+    */
+    @ApiModelProperty("使用人id[xjr_user]")
+    private Long userId;
+    /**
+    * 金额
+    */
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Short status;
+
+
+}

src/main/java/com/xjrsoft/module/asset/mapper/WfAssetManageMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.asset.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.asset.entity.WfAssetManage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 资产管理
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Mapper
+public interface WfAssetManageMapper extends MPJBaseMapper<WfAssetManage> {
+
+}

src/main/java/com/xjrsoft/module/asset/service/IWfAssetManageService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.asset.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.asset.entity.WfAssetManage;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 资产管理
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+
+public interface IWfAssetManageService extends MPJBaseService<WfAssetManage> {
+}

src/main/java/com/xjrsoft/module/asset/service/impl/WfAssetManageServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.asset.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.asset.entity.WfAssetManage;
+import com.xjrsoft.module.asset.mapper.WfAssetManageMapper;
+import com.xjrsoft.module.asset.service.IWfAssetManageService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 资产管理
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class WfAssetManageServiceImpl extends MPJBaseServiceImpl<WfAssetManageMapper, WfAssetManage> implements IWfAssetManageService {
+}

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManagePageVo.java

@@ -0,0 +1,99 @@
+package com.xjrsoft.module.asset.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 资产管理分页列表出参
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Data
+public class WfAssetManagePageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long createUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Date createDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long modifyUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Date modifyDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer deleteMark;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer enabledMark;
+    /**
+    * 资产类型
+    */
+    @ApiModelProperty("资产类型")
+    private String assetType;
+    /**
+    * 资产类别
+    */
+    @ApiModelProperty("资产类别")
+    private String assetCategory;
+    /**
+    * 资产种类
+    */
+    @ApiModelProperty("资产种类")
+    private String assetSpecies;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 所属部门[xjr_department]
+    */
+    @ApiModelProperty("所属部门[xjr_department]")
+    private Long deptId;
+    /**
+    * 使用人id[xjr_user]
+    */
+    @ApiModelProperty("使用人id[xjr_user]")
+    private Long userId;
+    /**
+    * 金额
+    */
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Short status;
+
+}

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManageVo.java

@@ -0,0 +1,69 @@
+package com.xjrsoft.module.asset.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 资产管理表单出参
+* @Author dzx
+* @Date: 2024-03-28
+* @Version 1.0
+*/
+@Data
+public class WfAssetManageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 资产类型
+    */
+    @ApiModelProperty("资产类型")
+    private String assetType;
+    /**
+    * 资产类别
+    */
+    @ApiModelProperty("资产类别")
+    private String assetCategory;
+    /**
+    * 资产种类
+    */
+    @ApiModelProperty("资产种类")
+    private String assetSpecies;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 所属部门[xjr_department]
+    */
+    @ApiModelProperty("所属部门[xjr_department]")
+    private Long deptId;
+    /**
+    * 使用人id[xjr_user]
+    */
+    @ApiModelProperty("使用人id[xjr_user]")
+    private Long userId;
+    /**
+    * 金额
+    */
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Short status;
+
+
+
+}

src/main/java/com/xjrsoft/module/base/controller/ClassroomController.java

@@ -9,6 +9,7 @@ import com.xjrsoft.module.base.service.IBaseClassroomService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,7 +33,7 @@ public class ClassroomController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value="修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("classroom:detail")
     public RT<Boolean> changeStatus(@Valid @RequestBody BaseClassroomChangeStatusDto dto) throws Exception {
         BaseClassroom classroom = baseClassroomService.getById(dto.getId());
         if(classroom == null){
@@ -42,4 +43,11 @@ public class ClassroomController {
         baseClassroomService.updateById(classroom);
         return RT.ok(true);
     }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除")
+    @SaCheckPermission("classroom:delete")
+    public RT<Boolean> delete(@Valid @RequestBody Long id){
+        return RT.ok(baseClassroomService.removeById(id));
+    }
 }

src/main/java/com/xjrsoft/module/base/controller/OfficeBuildController.java

@@ -9,6 +9,7 @@ import com.xjrsoft.module.base.service.IBaseOfficeBuildService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,4 +43,11 @@ public class OfficeBuildController {
         baseOfficeBuildService.updateById(officeBuild);
         return RT.ok(true);
     }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除")
+    @SaCheckPermission("officebuild:delete")
+    public RT<Boolean> delete(@Valid @RequestBody Long id){
+        return RT.ok(baseOfficeBuildService.removeById(id));
+    }
 }

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -2429,4 +2429,35 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
 
     }
+
+    /**
+     * 攀宝学期对应配置表
+     *
+     * @throws IOException
+     */
+    @Test
+    public void gcWfAssetManage() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("wf_asset_manage");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("asset");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+
+    }
 }