新增软件著作，专利，商标

background-service/zksy-admin/src/main/java/com/zksy/web/controller/basicData/XcrPatentController.java

@@ -0,0 +1,110 @@
+package com.zksy.web.controller.basicData;
+
+import com.zksy.basicData.domain.XcrSoftWorks;
+import com.zksy.common.core.controller.BaseController;
+import com.zksy.basicData.domain.XcrPatent;
+import com.zksy.basicData.service.IXcrPatentService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.core.domain.AjaxResult;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.common.annotation.Log;
+import com.zksy.common.enums.BusinessType;
+import com.zksy.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 专利Controller
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+@RestController
+@RequestMapping("/basicData/xcrPatent")
+@Api(tags = "专利", description = "专利desc")
+public class XcrPatentController extends BaseController{
+
+    @Autowired
+    private IXcrPatentService service;
+
+    @GetMapping("/getById/{borrowId}")
+    @ApiOperation(value = "专利搜索getById")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrPatent:list')")
+    public XcrPatent getById(@PathVariable String borrowId) {
+        return service.getById(borrowId);
+    }
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "专利分页")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrPatent:list')")
+    public Page findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        return service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    @GetMapping("/getList")
+    @ApiOperation(value = "专利查询所有")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrPatent:list')")
+    public List<XcrPatent> getList(String conditionJson) throws Exception {
+        return service.list(SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    /**
+     * 新增专利
+     */
+    @PostMapping("/save")
+    @ApiOperation(value = "专利新增")
+    @Log(title = "新增专利", businessType = BusinessType.INSERT)
+    public boolean save(@RequestBody XcrPatent xcrPatent) {
+        return service.save(xcrPatent);
+    }
+
+    /**
+     * 修改专利
+     */
+    @PostMapping("/updateById")
+    @ApiOperation(value = "专利修改")
+    @Log(title = "修改专利", businessType = BusinessType.UPDATE)
+    public boolean updateById(@RequestBody XcrPatent xcrPatent) {
+        return service.updateById(xcrPatent);
+    }
+
+
+    @Log(title = "专利", businessType = BusinessType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation(value = "删除专利", notes = "删除专利")
+    public AjaxResult delete(@RequestBody List<String> ids)
+    {
+        return toAjax(service.removeByIds(ids));
+    }
+
+    /**
+     * 导出专利列表
+     */
+    @PreAuthorize("@ss.hasPermi('basicData:xcrPatent:export')")
+    @Log(title = "专利", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,String conditionJson) throws Exception
+    {
+        List<XcrPatent> list = service.list(SearchUtil.parseWhereSql(conditionJson));
+        ExcelUtil<XcrPatent> util = new ExcelUtil<XcrPatent>(XcrPatent.class);
+        util.exportExcel(response, list, "专利数据");
+    }
+    @ApiOperation(value = "专利数据导入")
+    @Log(title = "专利管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('basicData:xcrPatent:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception
+    {
+        ExcelUtil<XcrPatent> util = new ExcelUtil<XcrPatent>(XcrPatent.class);
+        List<XcrPatent> xcrPatent = util.importExcel(file.getInputStream());
+        return toAjax(service.saveBatch(xcrPatent));
+    }
+}

background-service/zksy-admin/src/main/java/com/zksy/web/controller/basicData/XcrSoftWorksController.java

@@ -0,0 +1,110 @@
+package com.zksy.web.controller.basicData;
+
+import com.zksy.common.core.controller.BaseController;
+import com.zksy.basicData.domain.XcrSoftWorks;
+import com.zksy.basicData.service.IXcrSoftWorksService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.core.domain.AjaxResult;
+import com.zksy.common.core.domain.entity.SysUser;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.common.annotation.Log;
+import com.zksy.common.enums.BusinessType;
+import com.zksy.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 软件著作权Controller
+ *
+ * @author nahida
+ * @date 2024-11-26
+ */
+@RestController
+@RequestMapping("/basicData/xcrSoftWorks")
+@Api(tags = "软件著作权", description = "软件著作权desc")
+public class XcrSoftWorksController extends BaseController{
+
+    @Autowired
+    private IXcrSoftWorksService service;
+
+    @GetMapping("/getById/{borrowId}")
+    @ApiOperation(value = "软件著作权搜索getById")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrSoftWorks:list')")
+    public XcrSoftWorks getById(@PathVariable String borrowId) {
+        return service.getById(borrowId);
+    }
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "软件著作权分页")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrSoftWorks:list')")
+    public Page findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        return service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    @GetMapping("/getList")
+    @ApiOperation(value = "软件著作权查询所有")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrSoftWorks:list')")
+    public List<XcrSoftWorks> getList(String conditionJson) throws Exception {
+        return service.list(SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    /**
+     * 新增软件著作权
+     */
+    @PostMapping("/save")
+    @ApiOperation(value = "软件著作权新增")
+    @Log(title = "新增软件著作权", businessType = BusinessType.INSERT)
+    public boolean save(@RequestBody XcrSoftWorks xcrSoftWorks) {
+        return service.save(xcrSoftWorks);
+    }
+
+    /**
+     * 修改软件著作权
+     */
+    @PostMapping("/updateById")
+    @ApiOperation(value = "软件著作权修改")
+    @Log(title = "修改软件著作权", businessType = BusinessType.UPDATE)
+    public boolean updateById(@RequestBody XcrSoftWorks xcrSoftWorks) {
+        return service.updateById(xcrSoftWorks);
+    }
+
+
+    @Log(title = "软件著作权", businessType = BusinessType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation(value = "删除软件著作权", notes = "删除软件著作权")
+    public AjaxResult delete(@RequestBody List<String> ids)
+    {
+        return toAjax(service.removeByIds(ids));
+    }
+
+    /**
+     * 导出软件著作权列表
+     */
+    @PreAuthorize("@ss.hasPermi('basicData:xcrSoftWorks:export')")
+    @Log(title = "软件著作权", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,String conditionJson) throws Exception
+    {
+        List<XcrSoftWorks> list = service.list(SearchUtil.parseWhereSql(conditionJson));
+        ExcelUtil<XcrSoftWorks> util = new ExcelUtil<XcrSoftWorks>(XcrSoftWorks.class);
+        util.exportExcel(response, list, "软件著作权数据");
+    }
+    @ApiOperation(value = "软件著作权数据导入")
+    @Log(title = "软件著作权管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('basicData:xcrSoftWorks:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception
+    {
+        ExcelUtil<XcrSoftWorks> util = new ExcelUtil<XcrSoftWorks>(XcrSoftWorks.class);
+        List<XcrSoftWorks> xcrSoftWorks = util.importExcel(file.getInputStream());
+        return toAjax(service.saveBatch(xcrSoftWorks));
+    }
+}

background-service/zksy-admin/src/main/java/com/zksy/web/controller/basicData/XcrTrademarkController.java

@@ -0,0 +1,112 @@
+package com.zksy.web.controller.basicData;
+
+import com.zksy.common.core.controller.BaseController;
+import com.zksy.basicData.domain.XcrTrademark;
+import com.zksy.basicData.service.IXcrTrademarkService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.core.domain.AjaxResult;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.common.annotation.Log;
+import com.zksy.common.enums.BusinessType;
+import com.zksy.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 商标Controller
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+@RestController
+@RequestMapping("/basicData/xcrTrademark")
+@Api(tags = "商标", description = "商标desc")
+public class XcrTrademarkController extends BaseController{
+
+    @Autowired
+    private IXcrTrademarkService service;
+
+    @GetMapping("/getById/{borrowId}")
+    @ApiOperation(value = "商标搜索getById")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrTrademark:list')")
+    public XcrTrademark getById(@PathVariable String borrowId) {
+        return service.getById(borrowId);
+    }
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "商标分页")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrTrademark:list')")
+    public Page findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        return service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    @GetMapping("/getList")
+    @ApiOperation(value = "商标查询所有")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrTrademark:list')")
+    public List<XcrTrademark> getList(String conditionJson) throws Exception {
+        return service.list(SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    /**
+     * 新增商标
+     */
+    @PostMapping("/save")
+    @ApiOperation(value = "商标新增")
+    @Log(title = "新增商标", businessType = BusinessType.INSERT)
+    public boolean save(@RequestBody XcrTrademark xcrTrademark) {
+        return service.save(xcrTrademark);
+    }
+
+    /**
+     * 修改商标
+     */
+    @PostMapping("/updateById")
+    @ApiOperation(value = "商标修改")
+    @Log(title = "修改商标", businessType = BusinessType.UPDATE)
+    public boolean updateById(@RequestBody XcrTrademark xcrTrademark) {
+        return service.updateById(xcrTrademark);
+    }
+
+
+    @Log(title = "商标", businessType = BusinessType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation(value = "删除商标", notes = "删除商标")
+    public AjaxResult delete(@RequestBody List<String> ids)
+    {
+        return toAjax(service.removeByIds(ids));
+    }
+
+    /**
+     * 导出商标列表
+     */
+    @PreAuthorize("@ss.hasPermi('basicData:xcrTrademark:export')")
+    @Log(title = "商标", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,String conditionJson) throws Exception
+    {
+        List<XcrTrademark> list = service.list(SearchUtil.parseWhereSql(conditionJson));
+        ExcelUtil<XcrTrademark> util = new ExcelUtil<XcrTrademark>(XcrTrademark.class);
+        util.exportExcel(response, list, "商标数据");
+    }
+    /**
+     * 导入商标列表
+     */
+    @ApiOperation(value = "商标导入")
+    @Log(title = "商标管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('basicData:xcrTrademark:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception
+    {
+        ExcelUtil<XcrTrademark> util = new ExcelUtil<XcrTrademark>(XcrTrademark.class);
+        List<XcrTrademark> list = util.importExcel(file.getInputStream());
+        return toAjax(service.saveBatch(list));
+    }
+}

background-service/zksy-generator/src/main/resources/vm/java/controller.java.vm

@@ -95,4 +95,17 @@ public class ${ClassName}Controller extends BaseController{
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
     }
+    /**
+     * 导入${functionName}列表
+     */
+    @ApiOperation(value = "${functionName}导入")
+    @Log(title = "${functionName}管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception
+    {
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        List<${ClassName}> list = util.importExcel(file.getInputStream());
+        return toAjax(service.saveBatch(list));
+    }
 }

background-service/zksy-system/src/main/java/com/zksy/basicData/domain/XcrPatent.java

@@ -0,0 +1,78 @@
+package com.zksy.basicData.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zksy.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.zksy.common.core.domain.BasePo;
+/**
+ * 专利对象 xcr_patent
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xcr_patent")
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "专利")
+public class XcrPatent extends BasePo {
+
+private static final long serialVersionUID=1L;
+
+    /** 企业（机构）名称 */
+            @Excel(name = "企业（机构）名称")
+            @ApiModelProperty("企业（机构）名称")
+            @TableField("ent_name")
+            @JsonProperty("entName")
+    private String entName;
+
+    /** 专利名称 */
+            @Excel(name = "专利名称")
+            @ApiModelProperty("专利名称")
+            @TableField("patent_name")
+            @JsonProperty("patentName")
+    private String patentName;
+
+    /** 专利类型 */
+            @Excel(name = "专利类型")
+            @ApiModelProperty("专利类型")
+            @TableField("patent_type")
+            @JsonProperty("patentType")
+    private String patentType;
+
+    /** 专利状态 */
+            @Excel(name = "专利状态")
+            @ApiModelProperty("专利状态")
+            @TableField("patent_status")
+            @JsonProperty("patentStatus")
+    private String patentStatus;
+
+    /** 公开（公告）日 */
+            @Excel(name = "公开（公告）日")
+            @ApiModelProperty("公开（公告）日")
+            @TableField("public_date")
+            @JsonProperty("publicDate")
+    private Date publicDate;
+
+    /** 发明（设计）人 */
+            @Excel(name = "发明（设计）人")
+            @ApiModelProperty("发明（设计）人")
+            @TableField("inventor")
+            @JsonProperty("inventor")
+    private String inventor;
+
+
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/domain/XcrSoftWorks.java

@@ -0,0 +1,80 @@
+package com.zksy.basicData.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zksy.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.zksy.common.core.domain.BasePo;
+/**
+ * 软件著作权对象 xcr_soft_works
+ *
+ * @author nahida
+ * @date 2024-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xcr_soft_works")
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "软件著作权")
+public class XcrSoftWorks extends BasePo {
+
+private static final long serialVersionUID=1L;
+
+    /** 企业（机构）名称 */
+            @Excel(name = "企业（机构）名称")
+            @ApiModelProperty("企业（机构）名称")
+            @TableField("ent_name")
+            @JsonProperty("entName")
+    private String entName;
+
+    /** 软件名称 */
+            @Excel(name = "软件名称")
+            @ApiModelProperty("软件名称")
+            @TableField("software_name")
+            @JsonProperty("softwareName")
+    private String softwareName;
+
+    /** 登记号 */
+            @Excel(name = "登记号")
+            @ApiModelProperty("登记号")
+            @TableField("registration_no")
+            @JsonProperty("registrationNo")
+    private String registrationNo;
+
+    /** 版本号 */
+            @Excel(name = "版本号")
+            @ApiModelProperty("版本号")
+            @TableField("version_no")
+            @JsonProperty("versionNo")
+    private String versionNo;
+
+    /** 首次发表日期 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "首次发表日期", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("首次发表日期")
+            @TableField("first_publication_date")
+            @JsonProperty("firstPublicationDate")
+    private Date firstPublicationDate;
+
+    /** 登记批准日期 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "登记批准日期", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("登记批准日期")
+            @TableField("registration_approval_date")
+            @JsonProperty("registrationApprovalDate")
+    private Date registrationApprovalDate;
+
+
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/domain/XcrTrademark.java

@@ -0,0 +1,79 @@
+package com.zksy.basicData.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zksy.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.zksy.common.core.domain.BasePo;
+/**
+ * 商标对象 xcr_trademark
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xcr_trademark")
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "商标")
+public class XcrTrademark extends BasePo {
+
+private static final long serialVersionUID=1L;
+
+    /** 企业（机构）名称 */
+            @Excel(name = "企业（机构）名称")
+            @ApiModelProperty("企业（机构）名称")
+            @TableField("ent_name")
+            @JsonProperty("entName")
+    private String entName;
+
+    /** 商标名称 */
+            @Excel(name = "商标名称")
+            @ApiModelProperty("商标名称")
+            @TableField("brand_name")
+            @JsonProperty("brandName")
+    private String brandName;
+
+    /** 注册号 */
+            @Excel(name = "注册号")
+            @ApiModelProperty("注册号")
+            @TableField("registration_no")
+            @JsonProperty("registrationNo")
+    private String registrationNo;
+
+    /** 国际分类 */
+            @Excel(name = "国际分类")
+            @ApiModelProperty("国际分类")
+            @TableField("international_classification")
+            @JsonProperty("internationalClassification")
+    private String internationalClassification;
+
+    /** 商标状态 */
+            @Excel(name = "商标状态")
+            @ApiModelProperty("商标状态")
+            @TableField("trademark_status")
+            @JsonProperty("trademarkStatus")
+    private String trademarkStatus;
+
+    /** 注册公告日期 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "注册公告日期", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("注册公告日期")
+            @TableField("registration_date")
+            @JsonProperty("registrationDate")
+    private Date registrationDate;
+
+
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/mapper/XcrPatentMapper.java

@@ -0,0 +1,14 @@
+package com.zksy.basicData.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.basicData.domain.XcrPatent;
+
+/**
+ * 专利Mapper接口
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+public interface XcrPatentMapper extends BaseMapper<XcrPatent> {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/mapper/XcrSoftWorksMapper.java

@@ -0,0 +1,14 @@
+package com.zksy.basicData.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.basicData.domain.XcrSoftWorks;
+
+/**
+ * 软件著作权Mapper接口
+ *
+ * @author nahida
+ * @date 2024-11-26
+ */
+public interface XcrSoftWorksMapper extends BaseMapper<XcrSoftWorks> {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/mapper/XcrTrademarkMapper.java

@@ -0,0 +1,14 @@
+package com.zksy.basicData.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.basicData.domain.XcrTrademark;
+
+/**
+ * 商标Mapper接口
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+public interface XcrTrademarkMapper extends BaseMapper<XcrTrademark> {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/service/IXcrFileService.java

@@ -2,6 +2,7 @@ package com.zksy.basicData.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zksy.basicData.domain.XcrFile;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -30,4 +31,11 @@ public interface IXcrFileService extends IService<XcrFile> {
      * @date 2024/5/20 10:13:37
      */
     List<XcrFile> selectByFid(Long fid);
+
+
+    boolean saveMinio(XcrFile crmFile, MultipartFile multipartFile);
+
+    boolean updateMinio(XcrFile crmFile, MultipartFile multipartFile);
+
+    boolean deleteFile(String id);
 }

background-service/zksy-system/src/main/java/com/zksy/basicData/service/IXcrPatentService.java

@@ -0,0 +1,14 @@
+package com.zksy.basicData.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.basicData.domain.XcrPatent;
+
+/**
+ * 专利Service接口
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+public interface IXcrPatentService extends IService<XcrPatent> {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/service/IXcrSoftWorksService.java

@@ -0,0 +1,14 @@
+package com.zksy.basicData.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.basicData.domain.XcrSoftWorks;
+
+/**
+ * 软件著作权Service接口
+ *
+ * @author nahida
+ * @date 2024-11-26
+ */
+public interface IXcrSoftWorksService extends IService<XcrSoftWorks> {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/service/IXcrTrademarkService.java

@@ -0,0 +1,14 @@
+package com.zksy.basicData.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.basicData.domain.XcrTrademark;
+
+/**
+ * 商标Service接口
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+public interface IXcrTrademarkService extends IService<XcrTrademark> {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/service/impl/XcrFileServiceImpl.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.basicData.domain.XcrFile;
 import com.zksy.basicData.mapper.XcrFileMapper;
 import com.zksy.basicData.service.IXcrFileService;
+import com.zksy.service.MinioFileStorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -19,16 +21,14 @@ import java.util.List;
  */
 @Service
 public class XcrFileServiceImpl extends ServiceImpl<XcrFileMapper, XcrFile> implements IXcrFileService {
-
     @Autowired
-    private IXcrFileService service;
+    private MinioFileStorageService minioFileStorageService;
 
     @Override
     public List<XcrFile> selectByFids(List<String> fids) {
         QueryWrapper<XcrFile> queryWrapper =new QueryWrapper<>();
         queryWrapper.in("fid",fids);
-        BaseMapper<XcrFile> baseMapper = service.getBaseMapper();
-        List<XcrFile> crmFileList = baseMapper.selectList(queryWrapper);
+        List<XcrFile> crmFileList = getBaseMapper().selectList(queryWrapper);
         return crmFileList;
     }
 
@@ -36,8 +36,40 @@ public class XcrFileServiceImpl extends ServiceImpl<XcrFileMapper, XcrFile> impl
     public List<XcrFile> selectByFid(Long fid) {
         QueryWrapper<XcrFile> queryWrapper =new QueryWrapper<>();
         queryWrapper.eq("fid",fid);
-        BaseMapper<XcrFile> baseMapper = service.getBaseMapper();
-        List<XcrFile> crmFileList = baseMapper.selectList(queryWrapper);
+        List<XcrFile> crmFileList = getBaseMapper().selectList(queryWrapper);
         return crmFileList;
     }
+
+    @Override
+    public boolean saveMinio(XcrFile crmFile, MultipartFile multipartFile) {
+        try {
+            String path = minioFileStorageService.uploadFile(multipartFile,crmFile.getModuleName());
+            crmFile.setFileUrl(path);
+            return save(crmFile);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean updateMinio(XcrFile crmFile, MultipartFile multipartFile) {
+        try {
+            //删除minio文件
+            minioFileStorageService.deleteFile(crmFile.getFileUrl());
+            //新增minio文件
+            String path = minioFileStorageService.uploadFile(multipartFile,crmFile.getModuleName());
+            crmFile.setFileUrl(path);
+            return updateById(crmFile);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean deleteFile(String id) {
+        XcrFile xcrFile = getById(id);
+        //删除minio文件
+        minioFileStorageService.deleteFile(xcrFile.getFileUrl());
+        return removeById(id);
+    }
 }

background-service/zksy-system/src/main/java/com/zksy/basicData/service/impl/XcrPatentServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zksy.basicData.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.basicData.domain.XcrPatent;
+import com.zksy.basicData.mapper.XcrPatentMapper;
+import com.zksy.basicData.service.IXcrPatentService;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 专利Service业务层处理
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+@Service
+public class XcrPatentServiceImpl extends ServiceImpl<XcrPatentMapper, XcrPatent> implements IXcrPatentService {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/service/impl/XcrSoftWorksServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zksy.basicData.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.basicData.domain.XcrSoftWorks;
+import com.zksy.basicData.mapper.XcrSoftWorksMapper;
+import com.zksy.basicData.service.IXcrSoftWorksService;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 软件著作权Service业务层处理
+ *
+ * @author nahida
+ * @date 2024-11-26
+ */
+@Service
+public class XcrSoftWorksServiceImpl extends ServiceImpl<XcrSoftWorksMapper, XcrSoftWorks> implements IXcrSoftWorksService {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/service/impl/XcrTrademarkServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zksy.basicData.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.basicData.domain.XcrTrademark;
+import com.zksy.basicData.mapper.XcrTrademarkMapper;
+import com.zksy.basicData.service.IXcrTrademarkService;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 商标Service业务层处理
+ *
+ * @author nahida
+ * @date 2024-11-27
+ */
+@Service
+public class XcrTrademarkServiceImpl extends ServiceImpl<XcrTrademarkMapper, XcrTrademark> implements IXcrTrademarkService {
+
+}

background-service/zksy-system/src/main/resources/mapper/basicData/XcrPatentMapper.xml

@@ -0,0 +1,17 @@
+<?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="com.zksy.basicData.mapper.XcrPatentMapper">
+
+    <resultMap type="XcrPatent" id="XcrPatentResult">
+            <result property="xhCodeId"    column="xh_code_id"    />
+            <result property="entName"    column="ent_name"    />
+            <result property="uniCode"    column="uni_code"    />
+            <result property="patentName"    column="patent_name"    />
+            <result property="patentType"    column="patent_type"    />
+            <result property="patentStatus"    column="patent_status"    />
+            <result property="publicDate"    column="public_date"    />
+            <result property="inventor"    column="inventor"    />
+    </resultMap>
+</mapper>

background-service/zksy-system/src/main/resources/mapper/basicData/XcrSoftWorksMapper.xml

@@ -0,0 +1,17 @@
+<?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="com.zksy.basicData.mapper.XcrSoftWorksMapper">
+
+    <resultMap type="XcrSoftWorks" id="XcrSoftWorksResult">
+            <result property="xhCodeId"    column="xh_code_id"    />
+            <result property="entName"    column="ent_name"    />
+            <result property="uniCode"    column="uni_code"    />
+            <result property="softwareName"    column="software_name"    />
+            <result property="registrationNo"    column="registration_no"    />
+            <result property="versionNo"    column="version_no"    />
+            <result property="firstPublicationDate"    column="first_publication_date"    />
+            <result property="registrationApprovalDate"    column="registration_approval_date"    />
+    </resultMap>
+</mapper>

background-service/zksy-system/src/main/resources/mapper/basicData/XcrTrademarkMapper.xml

@@ -0,0 +1,17 @@
+<?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="com.zksy.basicData.mapper.XcrTrademarkMapper">
+
+    <resultMap type="XcrTrademark" id="XcrTrademarkResult">
+            <result property="xhCodeId"    column="xh_code_id"    />
+            <result property="entName"    column="ent_name"    />
+            <result property="uniCode"    column="uni_code"    />
+            <result property="brandName"    column="brand_name"    />
+            <result property="registrationNo"    column="registration_no"    />
+            <result property="internationalClassification"    column="international_classification"    />
+            <result property="trademarkStatus"    column="trademark_status"    />
+            <result property="registrationDate"    column="registration_date"    />
+    </resultMap>
+</mapper>