新增资产、库存盘点

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/AssetsController.java

@@ -0,0 +1,161 @@
+package org.jeecg.modules.oa.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.oa.entity.Assets;
+import org.jeecg.modules.oa.service.IAssetsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+ /**
+ * @Description: 新增资产
+ * @Author: jeecg-boot
+ * @Date:   2022-10-21
+ * @Version: V1.0
+ */
+@Api(tags="新增资产")
+@RestController
+@RequestMapping("/oa/assets")
+@Slf4j
+public class AssetsController extends JeecgController<Assets, IAssetsService> {
+	@Autowired
+	private IAssetsService assetsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param assets
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "新增资产-分页列表查询")
+	@ApiOperation(value="新增资产-分页列表查询", notes="新增资产-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(Assets assets,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<Assets> queryWrapper = QueryGenerator.initQueryWrapper(assets, req.getParameterMap());
+		Page<Assets> page = new Page<Assets>(pageNo, pageSize);
+		IPage<Assets> pageList = assetsService.page(page, queryWrapper);
+		return Result.ok(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param assets
+	 * @return
+	 */
+	@AutoLog(value = "新增资产-添加")
+	@ApiOperation(value="新增资产-添加", notes="新增资产-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody Assets assets) {
+		assetsService.save(assets);
+		return Result.ok("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param assets
+	 * @return
+	 */
+	@AutoLog(value = "新增资产-编辑")
+	@ApiOperation(value="新增资产-编辑", notes="新增资产-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody Assets assets) {
+		assetsService.updateById(assets);
+		return Result.ok("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "新增资产-通过id删除")
+	@ApiOperation(value="新增资产-通过id删除", notes="新增资产-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		assetsService.removeById(id);
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "新增资产-批量删除")
+	@ApiOperation(value="新增资产-批量删除", notes="新增资产-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.assetsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.ok("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "新增资产-通过id查询")
+	@ApiOperation(value="新增资产-通过id查询", notes="新增资产-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		Assets assets = assetsService.getById(id);
+		if(assets==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.ok(assets);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param assets
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, Assets assets) {
+        return super.exportXls(request, assets, Assets.class, "新增资产");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, Assets.class);
+    }
+
+	 @GetMapping(value = "/all")
+	 public Result<?> queryAll() {
+		 List<Assets> assets = assetsService.list();
+		 return Result.ok(assets);
+	 }
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/InventoryRecordsController.java

@@ -0,0 +1,159 @@
+package org.jeecg.modules.oa.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.oa.entity.InventoryRecords;
+import org.jeecg.modules.oa.service.IInventoryRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 盘点表
+ * @Author: jeecg-boot
+ * @Date:   2022-10-17
+ * @Version: V1.0
+ */
+@Api(tags="盘点表")
+@RestController
+@RequestMapping("/oa/inventoryRecords")
+@Slf4j
+public class InventoryRecordsController extends JeecgController<InventoryRecords, IInventoryRecordsService> {
+	@Autowired
+	private IInventoryRecordsService inventoryRecordsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param inventoryRecords
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "盘点表-分页列表查询")
+	@ApiOperation(value="盘点表-分页列表查询", notes="盘点表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(InventoryRecords inventoryRecords,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<InventoryRecords> queryWrapper = QueryGenerator.initQueryWrapper(inventoryRecords, req.getParameterMap());
+		Page<InventoryRecords> page = new Page<InventoryRecords>(pageNo, pageSize);
+		IPage<InventoryRecords> pageList = inventoryRecordsService.page(page, queryWrapper);
+		return Result.ok(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param inventoryRecords
+	 * @return
+	 */
+	@AutoLog(value = "盘点表-添加")
+	@ApiOperation(value="盘点表-添加", notes="盘点表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody InventoryRecords inventoryRecords) {
+		inventoryRecordsService.save(inventoryRecords);
+		return Result.ok("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param inventoryRecords
+	 * @return
+	 */
+	@AutoLog(value = "盘点表-编辑")
+	@ApiOperation(value="盘点表-编辑", notes="盘点表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody InventoryRecords inventoryRecords) {
+		inventoryRecordsService.updateById(inventoryRecords);
+		return Result.ok("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "盘点表-通过id删除")
+	@ApiOperation(value="盘点表-通过id删除", notes="盘点表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		inventoryRecordsService.removeById(id);
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "盘点表-批量删除")
+	@ApiOperation(value="盘点表-批量删除", notes="盘点表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.inventoryRecordsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.ok("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "盘点表-通过id查询")
+	@ApiOperation(value="盘点表-通过id查询", notes="盘点表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		InventoryRecords inventoryRecords = inventoryRecordsService.getById(id);
+		if(inventoryRecords==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.ok(inventoryRecords);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param inventoryRecords
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, InventoryRecords inventoryRecords) {
+        return super.exportXls(request, inventoryRecords, InventoryRecords.class, "盘点表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, InventoryRecords.class);
+    }
+
+	 @RequestMapping(value = "/exportToInventory")
+	 public ModelAndView exportToInventory(HttpServletRequest request, InventoryRecords inventoryRecords) {
+		 return super.exportXls(request, inventoryRecords, InventoryRecords.class, "盘点表");
+	 }
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/Assets.java

@@ -0,0 +1,142 @@
+package org.jeecg.modules.oa.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 新增资产
+ * @Author: jeecg-boot
+ * @Date:   2022-10-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("add_assets")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="add_assets对象", description="新增资产")
+public class Assets implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+	@Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+	@Excel(name = "所属部门", width = 15)
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**入库单号*/
+	@Excel(name = "入库单号", width = 15)
+    @ApiModelProperty(value = "入库单号")
+    private java.lang.String inputOrderid;
+	/**资产类别*/
+	@Excel(name = "资产类别", width = 15, dicCode = "assets_category")
+	@Dict(dicCode = "assets_category")
+    @ApiModelProperty(value = "资产类别")
+    private java.lang.String assetsCategory;
+	/**资产编号*/
+	@Excel(name = "资产编号", width = 15)
+    @ApiModelProperty(value = "资产编号")
+    private java.lang.String assetNumber;
+	/**资产名称*/
+	@Excel(name = "资产名称", width = 15)
+    @ApiModelProperty(value = "资产名称")
+    private java.lang.String assetName;
+	/**规格型号*/
+	@Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private java.lang.String specificationsModels;
+	/**品牌*/
+	@Excel(name = "品牌", width = 15)
+    @ApiModelProperty(value = "品牌")
+    private java.lang.String brand;
+	/**单位*/
+	@Excel(name = "单位", width = 15)
+    @ApiModelProperty(value = "单位")
+    private java.lang.String unit;
+	/**价值(元)*/
+	@Excel(name = "价值(元)", width = 15)
+    @ApiModelProperty(value = "价值(元)")
+    private java.lang.String unitPrice;
+	/**购置日期*/
+	@Excel(name = "购置日期", width = 15)
+    @ApiModelProperty(value = "购置日期")
+    private java.lang.String acquisitionDate;
+	/**厂商*/
+	@Excel(name = "厂商", width = 15)
+    @ApiModelProperty(value = "厂商")
+    private java.lang.String manufacturer;
+	/**使用部门*/
+	@Excel(name = "使用部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+	@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @ApiModelProperty(value = "使用部门")
+    private java.lang.String useDepartment;
+	/**入库时间*/
+	@Excel(name = "入库时间", width = 15)
+    @ApiModelProperty(value = "入库时间")
+    private java.lang.String inputDate;
+	/**采购人*/
+	@Excel(name = "采购人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @ApiModelProperty(value = "采购人")
+    private java.lang.String purchasingStaff;
+	/**验收人*/
+	@Excel(name = "验收人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @ApiModelProperty(value = "验收人")
+    private java.lang.String acceptPersonnel;
+	/**其他说明*/
+	@Excel(name = "其他说明", width = 15)
+    @ApiModelProperty(value = "其他说明")
+    private java.lang.String otherDescription;
+	/**采购单号*/
+	@Excel(name = "采购单号", width = 15)
+    @ApiModelProperty(value = "采购单号")
+    private java.lang.String buyid;
+	/**资产状态*/
+	@Excel(name = "资产状态", width = 15)
+    @ApiModelProperty(value = "资产状态")
+    private java.lang.String assetState;
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private java.lang.String accessory;
+	/**报错字段（表单没有该字段）*/
+	@Excel(name = "报错字段（表单没有该字段）", width = 15)
+    @ApiModelProperty(value = "报错字段（表单没有该字段）")
+    private java.lang.String isLeaders;
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/InventoryRecords.java

@@ -0,0 +1,105 @@
+package org.jeecg.modules.oa.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 盘点表
+ * @Author: jeecg-boot
+ * @Date:   2022-10-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("inventory_records")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="inventory_records对象", description="盘点表")
+public class InventoryRecords implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    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")
+    @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")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**盘点日期*/
+	@Excel(name = "盘点日期", width = 15)
+    @ApiModelProperty(value = "盘点日期")
+    private java.lang.String checkDate;
+	/**资产编码*/
+	@Excel(name = "资产编码", width = 15)
+    @ApiModelProperty(value = "资产编码")
+    private java.lang.String assetEncoding;
+	/**资产名称*/
+	@Excel(name = "资产名称", width = 15)
+    @ApiModelProperty(value = "资产名称")
+    private java.lang.String assetName;
+	/**资产类别*/
+	@Excel(name = "资产类别", width = 15)
+    @ApiModelProperty(value = "资产类别")
+    private java.lang.String assetsCategory;
+	/**规格型号*/
+	@Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private java.lang.String specificationsModels;
+	/**原值*/
+	@Excel(name = "原值", width = 15)
+    @ApiModelProperty(value = "原值")
+    private java.lang.String originalValue;
+	/**购置日期*/
+	@Excel(name = "购置日期", width = 15)
+    @ApiModelProperty(value = "购置日期")
+    private java.lang.String carAcquisitionDate;
+	/**使用年限*/
+	@Excel(name = "使用年限", width = 15)
+    @ApiModelProperty(value = "使用年限")
+    private java.lang.String durableYears;
+	/**存放地点*/
+	@Excel(name = "存放地点", width = 15)
+    @ApiModelProperty(value = "存放地点")
+    private java.lang.String storageLocation;
+	/**使用人*/
+	@Excel(name = "使用人", width = 15)
+    @ApiModelProperty(value = "使用人")
+    private java.lang.String usePersonnel;
+	/**使用部门*/
+	@Excel(name = "使用部门", width = 15)
+    @ApiModelProperty(value = "使用部门")
+    private java.lang.String useDepartment;
+	/**资产状态*/
+	@Excel(name = "资产状态", width = 15)
+    @ApiModelProperty(value = "资产状态")
+    private java.lang.String assetState;
+	/**附件*/
+    @ApiModelProperty(value = "附件")
+    private java.lang.String accessory;
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/AssetsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.oa.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.oa.entity.Assets;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 新增资产
+ * @Author: jeecg-boot
+ * @Date:   2022-10-21
+ * @Version: V1.0
+ */
+public interface AssetsMapper extends BaseMapper<Assets> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/InventoryRecordsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.oa.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.oa.entity.InventoryRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 盘点表
+ * @Author: jeecg-boot
+ * @Date:   2022-10-17
+ * @Version: V1.0
+ */
+public interface InventoryRecordsMapper extends BaseMapper<InventoryRecords> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/AssetsMapper.xml

@@ -0,0 +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.oa.mapper.AssetsMapper">
+
+</mapper>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/InventoryRecordsMapper.xml

@@ -0,0 +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.oa.mapper.InventoryRecordsMapper">
+
+</mapper>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IAssetsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.oa.service;
+
+import org.jeecg.modules.oa.entity.Assets;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 新增资产
+ * @Author: jeecg-boot
+ * @Date:   2022-10-21
+ * @Version: V1.0
+ */
+public interface IAssetsService extends IService<Assets> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IInventoryRecordsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.oa.service;
+
+import org.jeecg.modules.oa.entity.InventoryRecords;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 盘点表
+ * @Author: jeecg-boot
+ * @Date:   2022-10-17
+ * @Version: V1.0
+ */
+public interface IInventoryRecordsService extends IService<InventoryRecords> {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/AssetsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.oa.service.impl;
+
+import org.jeecg.modules.oa.entity.Assets;
+import org.jeecg.modules.oa.mapper.AssetsMapper;
+import org.jeecg.modules.oa.service.IAssetsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 新增资产
+ * @Author: jeecg-boot
+ * @Date:   2022-10-21
+ * @Version: V1.0
+ */
+@Service
+public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> implements IAssetsService {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/InventoryRecordsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.oa.service.impl;
+
+import org.jeecg.modules.oa.entity.InventoryRecords;
+import org.jeecg.modules.oa.mapper.InventoryRecordsMapper;
+import org.jeecg.modules.oa.service.IInventoryRecordsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 盘点表
+ * @Author: jeecg-boot
+ * @Date:   2022-10-17
+ * @Version: V1.0
+ */
+@Service
+public class InventoryRecordsServiceImpl extends ServiceImpl<InventoryRecordsMapper, InventoryRecords> implements IInventoryRecordsService {
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/resources/application-wsm.yml

@@ -0,0 +1,203 @@
+server:
+  port: 8081
+  tomcat:
+    max-swallow-size: -1
+  servlet:
+    context-path: /jeecg-boot
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+
+management:
+ endpoints:
+  web:
+   exposure:
+    include: metrics,httptrace
+
+spring:
+  servlet:
+     multipart:
+        max-file-size: 10MB
+        max-request-size: 10MB
+  mail:
+    host: smtp.qq.com
+    username: 350012167@qq.com
+    password: ??
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+            required: true
+  ## quartz定时任务,采用数据库方式
+  quartz:
+    job-store-type: jdbc
+  #json 时间戳统一转换
+  jackson:
+    date-format:   yyyy-MM-dd HH:mm:ss
+    time-zone:   GMT+8
+  aop:
+    proxy-target-class: true
+  #配置freemarker
+  freemarker:
+    # 设置模板后缀名
+    suffix: .ftl
+    # 设置文档类型
+    content-type: text/html
+    # 设置页面编码格式
+    charset: UTF-8
+    # 设置页面缓存
+    cache: false
+    prefer-file-system-access: false
+    # 设置ftl文件路径
+    template-loader-path:
+      - classpath:/templates
+  # 设置静态文件路径，js,css等
+  mvc:
+    static-path-pattern: /**
+  resource:
+    static-locations: classpath:/static/,classpath:/public/
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+        allow:
+      web-stat-filter:
+        enabled: true
+    dynamic:
+      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall,slf4j
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          url: jdbc:mysql://172.18.96.11:3306/wsmoa?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&useSSL=false
+          username: root
+          password: Wsm2022
+          driver-class-name: com.mysql.jdbc.Driver
+#        master:
+#          url: jdbc:mysql://106.15.206.14:3306/cd_work_flow_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&useSSL=false
+#          username: root
+#          password: CuiDian1234
+#          driver-class-name: com.mysql.jdbc.Driver
+          # 多数据源配置
+#        master2:
+#          url: jdbc:mysql://127.0.0.1:3306/cd_project_management?characterEncoding=UTF-8&useUnicode=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&allowPublicKeyRetrieval=true
+#          username: root
+#          password: root
+#          driver-class-name: com.mysql.jdbc.Driver
+  #redis 配置
+  redis:
+    database: 11
+    host: 172.18.91.54
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: ''
+    port: 27017
+  main:
+    allow-bean-definition-overriding: true
+  #Activiti property configuration
+  activiti:
+    database-schema-update: true
+    job-executor-activate: true # asyncExecutorEnabled属性设置设置true后将代替那些老的Job executor
+    history-level: full
+    db-history-used: true
+#    async-executor-activate: true
+    check-process-definitions: false # 自动部署验证设置:true-开启（默认）、false-关闭
+#mybatis plus 设置
+mybatis-plus:
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  global-config:
+    # 关闭MP3.0自带的banner
+    banner: false
+    db-config:
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+      id-type: 4
+      # 默认数据库表下划线命名
+      table-underline: true
+  configuration:
+    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 返回类型为Map,显示null对应的字段
+    call-setters-on-nulls: true
+#jeecg专用配置
+jeecg :
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: local
+  path :
+    #文件上传根目录 设置
+    upload: opt/oa/upFiles
+    #webapp文件路径
+    webapp: opt/oa/webapp
+  #短信秘钥
+  sms:
+     accessKeyId: ??
+     accessKeySecret: ??
+  shiro:
+     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**
+  #阿里云oss存储配置
+  oss:
+    endpoint: oss-cn-beijing.aliyuncs.com
+    accessKey: WegDpuKzOuPK6D3N
+    secretKey: ??
+    bucketName: jeecgos
+    staticDomain: ??
+  # ElasticSearch 设置
+  elasticsearch:
+    cluster-name: docker-cluster
+    cluster-nodes: 127.0.0.1:9200
+  # 表单设计器配置
+  desform:
+    # 主题颜色（仅支持 16进制颜色代码）
+    theme-color: "#1890ff"
+  # 在线预览文件服务器地址配置
+  file-view-domain: http://fileview.jeecg.com
+  # minio文件上传
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: ??
+
+#钉钉配置
+dingtalk:
+  appKey: dingqowvovktgfpuvhbn
+  appSecret: mzMwJgzRD0kDo3vPYmMCZcrgkymRGabHYmTceVqOQ9jQJWCPKX5rkIJO9vcaklyF
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules : debug
+    org.activiti.engine.impl.persistence.entity: debug
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas