资方管理提交

tianhu-system/src/main/java/com/tianhu/system/controller/OwnManagementInfController.java

@@ -2,10 +2,7 @@ package com.tianhu.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tianhu.common.core.domain.R;
-import com.tianhu.common.core.utils.CommonUtil;
-import com.tianhu.common.core.utils.DateUtils;
-import com.tianhu.common.core.utils.IdUtils;
-import com.tianhu.common.core.utils.SecurityUtils;
+import com.tianhu.common.core.utils.*;
 import com.tianhu.common.core.web.controller.BaseController;
 import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.core.web.page.TableDataInfo;
@@ -13,11 +10,12 @@ import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import com.tianhu.common.security.annotation.PreAuthorize;
 import com.tianhu.common.security.service.TokenService;
-import com.tianhu.system.api.domain.SysDept;
-import com.tianhu.system.api.domain.SysRole;
-import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.RemoteFileService;
+import com.tianhu.system.api.domain.*;
 import com.tianhu.system.api.model.LoginUser;
+import com.tianhu.system.domain.FileInf;
 import com.tianhu.system.domain.SysCompany;
+import com.tianhu.system.domain.SysManagementFileRel;
 import com.tianhu.system.domain.SysManagementInf;
 import com.tianhu.system.domain.SysUserCompanyRel;
 import com.tianhu.system.service.*;
@@ -25,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 资方管理Controller
@@ -47,10 +42,14 @@ public class OwnManagementInfController extends BaseController
     @Autowired
     private ISysManagementInfService sysManagementInfService;
     @Autowired
+    private ISysManagementFileRelService sysManagementFileRelService;
+    @Autowired
     private ISysUserCompanyRelService sysUserCompanyRelService;
     @Autowired
     private ISysCompanyService sysCompanyService;
     @Autowired
+    private IPubFileInfService pubFileInfService;
+    @Autowired
     private ISysDeptService deptService;
     @Autowired
     private ISysRoleService roleService;
@@ -60,6 +59,9 @@ public class OwnManagementInfController extends BaseController
     private TokenService tokenService;
     @Autowired
     private ISysConfigService configService;
+    //删除文件的公共方法服务类
+    @Autowired
+    private RemoteFileService remoteFileService;
     /**
      * 公司状态(正常)
      */
@@ -97,7 +99,6 @@ public class OwnManagementInfController extends BaseController
      */
     private String isAuto = "1";
 
-
     /**
      * 查询资方列表
      */
@@ -105,7 +106,7 @@ public class OwnManagementInfController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(String scyName,String smiType,String smiManager,String smiContract,String smiContractPhone)
     {
-        startPage();
+       startPage();
         Map map = new HashMap<>();
         map.put("scyName",scyName);
         map.put("smiType",smiType);
@@ -122,11 +123,26 @@ public class OwnManagementInfController extends BaseController
 //    @PreAuthorize(hasPermi = "system:company:details")
     @GetMapping("details/{scyId}")
     public AjaxResult details(@PathVariable("scyId") String scyId)throws Exception {
-        LoginUser user = tokenService.getLoginUser();
+        Map map1 = new HashMap();
         Map map = new HashMap<>();
         map.put("scyId",scyId);
         List<Map> list = ownManagementInfService.selectFundSide(map);
-        return AjaxResult.success(list);
+        LambdaQueryWrapper<SysManagementFileRel> sysManagementFileRel = new LambdaQueryWrapper();
+        sysManagementFileRel.eq(SysManagementFileRel::getSmfrCompanyId,scyId);
+        List<SysManagementFileRel> managementFile = sysManagementFileRelService.findSysManagementFileRels(sysManagementFileRel);
+        List<Map> dailyResult = new ArrayList();
+        for(int i=0;i<managementFile.size();i++){
+            Map pfi =new HashMap();
+            LambdaQueryWrapper<FileInf> file = new LambdaQueryWrapper();
+            file.eq(FileInf::getPfiFileId,managementFile.get(i).getSmfrFileId());
+            List<FileInf> fileInf = pubFileInfService.findFileInfs(file);
+            pfi.put("file",fileInf.get(0).getPfiFileId());
+            pfi.put("pfiUrl",fileInf.get(0).getPfiUrl());
+            dailyResult.add(pfi);
+        }
+        map1.put("data",dailyResult);
+        map1.put("list",list);
+        return AjaxResult.success(map1);
     }
 
     /**
@@ -213,6 +229,9 @@ public class OwnManagementInfController extends BaseController
         //获取创建人
         SysUser use = userInfo.getSysUser();
         company.setCreateBy(use.getUserId()+"");
+        //获取当前时间
+        Date currentTime = DateUtils.getNowDate();
+        company.setCreateTime(currentTime);
         sysCompanyService.createSysCompany(company);
         //创建部门
         SysDept dept = new SysDept();
@@ -231,6 +250,7 @@ public class OwnManagementInfController extends BaseController
         sysRole.setCompanyId(scyId);
         sysRole.setRoleName(scyName);
         sysRole.setRoleSort(defaultOrder);
+        sysRole.setRoleKey(scyName);
         sysRole.setDataScope(dataScope);
         sysRole.setMenuCheckStrictly(isCheck);
         sysRole.setDeptCheckStrictly(isCheck);
@@ -276,6 +296,12 @@ public class OwnManagementInfController extends BaseController
         sysUserCompanyRel.setSucrDeptId(deptId);
         sysUserCompanyRel.setSucrHandler("1");
         sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+        for(int i=0;i < smiAgreement.size();i++){
+            SysManagementFileRel file =new SysManagementFileRel();
+            file.setSmfrCompanyId(scyId);
+            file.setSmfrFileId(smiAgreement.get(i).get("uid"));
+            sysManagementFileRelService.createSysManagementFileRel(file);
+        }
         return R.ok();
     }
 
@@ -350,6 +376,23 @@ public class OwnManagementInfController extends BaseController
         sysManagementInf.setSmiManager(smiManager);
         sysManagementInf.setSmiDesc(smiDesc);
         sysManagementInfService.updateSysManagementInf(sysManagementInf);
+        //合作协议删除
+        LambdaQueryWrapper<SysManagementFileRel> sysManagementFileRel = new LambdaQueryWrapper();
+        sysManagementFileRel.eq(SysManagementFileRel::getSmfrCompanyId,scyId);
+        List<SysManagementFileRel> managementFile = sysManagementFileRelService.findSysManagementFileRels(sysManagementFileRel);
+        //资源删除
+        for(int j=0;j<managementFile.size();j++){
+            String token = SecurityUtils.getToken(ServletUtils.getRequest());
+            remoteFileService.delete(managementFile.get(j).getSmfrFileId(), scyId,token);
+        }
+        sysManagementFileRelService.deleteSysManagementFileRel(sysManagementFileRel);
+        //新增合作协议
+        for(int i=0;i < smiAgreement.size();i++){
+            SysManagementFileRel file =new SysManagementFileRel();
+            file.setSmfrCompanyId(scyId);
+            file.setSmfrFileId(smiAgreement.get(i).get("uid"));
+            sysManagementFileRelService.createSysManagementFileRel(file);
+        }
         return R.ok();
     }
 }

tianhu-system/src/main/java/com/tianhu/system/domain/FileInf.java

@@ -0,0 +1,179 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 文件信息表
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pub_file_inf")
+public class FileInf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件id
+     */
+    @TableId("pfi_file_id")
+    private String pfiFileId;
+
+    /**
+     * 企业id
+     */
+    @TableField("pfi_company_id")
+    private String pfiCompanyId;
+
+    /**
+     * 存储方(天虎)
+     */
+    @TableField("pfi_storage")
+    private String pfiStorage;
+
+    /**
+     * 文件类型(00:图片01视频 02:文档 03:音频 )
+     */
+    @TableField("pfi_file_type")
+    private String pfiFileType;
+
+    /**
+     * 文件大小(单位:k)
+     */
+    @TableField("pfi_file_size")
+    private String pfiFileSize;
+
+    /**
+     * 文件名称
+     */
+    @TableField("pfi_file_name")
+    private String pfiFileName;
+
+    /**
+     * 文件存储位置
+     */
+    @TableField("pfi_file_path")
+    private String pfiFilePath;
+
+    /**
+     * 文件url
+     */
+    @TableField("pfi_file_url")
+    private String pfiFileUrl;
+
+    /**
+     * 三方(00:阿里01:腾讯02:百度)
+     */
+    @TableField("pfi_tripartite")
+    private String pfiTripartite;
+
+    /**
+     * 文件服务器
+     */
+    @TableField("pfi_file_server")
+    private String pfiFileServer;
+
+    /**
+     * 文件上传时间
+     */
+    @TableField("pfi_upload_time")
+    private Date pfiUploadTime;
+
+    /**
+     * 访问时间
+     */
+    @TableField("pfi_visit_time")
+    private Date pfiVisitTime;
+
+    /**
+     * 状态（00：正常 99：删除）
+     */
+    @TableField("pfi_is_del")
+    private String pfiIsDel;
+
+    /**
+     * 备用字段1
+     */
+    @TableField("pfi_spare1")
+    private String pfiSpare1;
+
+    /**
+     * 备用字段2
+     */
+    @TableField("pfi_spare2")
+    private String pfiSpare2;
+
+    /**
+     * 备用字段3
+     */
+    @TableField("pfi_spare3")
+    private String pfiSpare3;
+
+    /**
+     * 备用字段4
+     */
+    @TableField("pfi_spare4")
+    private String pfiSpare4;
+
+    /**
+     * 备用字段5
+     */
+    @TableField("pfi_spare5")
+    private String pfiSpare5;
+
+    /**
+     * 备用字段6
+     */
+    @TableField("pfi_spare6")
+    private String pfiSpare6;
+
+    /**
+     * 备用字段7
+     */
+    @TableField("pfi_spare7")
+    private String pfiSpare7;
+
+    /**
+     * 备用字段8
+     */
+    @TableField("pfi_spare8")
+    private String pfiSpare8;
+
+    /**
+     * 备用字段9
+     */
+    @TableField("pfi_spare9")
+    private String pfiSpare9;
+
+    /**
+     * 备用字段10
+     */
+    @TableField("pfi_spare10")
+    private String pfiSpare10;
+
+    /**
+     * 文件url
+     */
+    @TableField("pfi_url")
+    private String pfiUrl;
+
+    /**
+     * 删除时间
+     */
+    @TableField("pfi_del_time")
+    private Date pfiDelTime;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/PubFileInfMapper.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.FileInf;
+
+/**
+ * <p>
+ * 文件信息表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-23
+ */
+public interface PubFileInfMapper extends BaseMapper<FileInf> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/IPubFileInfService.java

@@ -0,0 +1,58 @@
+package com.tianhu.system.service;
+
+
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tianhu.system.domain.FileInf;
+
+import java.util.List;
+
+/**
+ * ClassName: IPubFileInfService<br>
+ * Description: FileInfService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-23  cuixq    由Generator自动创建
+ */
+public interface IPubFileInfService extends IService<FileInf> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<FileInf>
+     * @return IPage<FileInf>
+     */
+    IPage<FileInf> findFileInfs(QueryRequest request, LambdaQueryWrapper<FileInf> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<FileInf>
+     * @return List<FileInf>
+     */
+    List<FileInf> findFileInfs(LambdaQueryWrapper<FileInf> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param FileInf FileInf
+     */
+    void createFileInf(FileInf FileInf);
+
+    /**
+     * 修改
+     *
+     * @param FileInf FileInf
+     */
+    void updateFileInf(FileInf FileInf);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<FileInf>
+     */
+    void deleteFileInf(LambdaQueryWrapper<FileInf> wrapper);
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/PubFileInfServiceImpl.java

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.FileInf;
+import com.tianhu.system.mapper.PubFileInfMapper;
+import com.tianhu.system.service.IPubFileInfService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: FileInfServiceImpl<br>
+ * Description: IFileInfService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-23  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class PubFileInfServiceImpl extends ServiceImpl<PubFileInfMapper, FileInf> implements IPubFileInfService {
+
+    @Autowired
+    private PubFileInfMapper PubFileInfMapper;
+
+    @Override
+    public IPage<FileInf> findFileInfs(QueryRequest request, LambdaQueryWrapper<FileInf> wrapper) {
+        Page<FileInf> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<FileInf> findFileInfs(LambdaQueryWrapper<FileInf> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createFileInf(FileInf FileInf) {
+        this.save(FileInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateFileInf(FileInf FileInf) {
+        this.saveOrUpdate(FileInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteFileInf(LambdaQueryWrapper<FileInf> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/resources/mapper/system/OwnManagementInfMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectFundSide" parameterType="map" resultType="map">
 		select
-		c.scy_id	 		 'scyId'  ,
+		c.scy_id	 		 'scyId',
 		c.scy_name 		     'scyName' ,
 		c.scy_license_file 	 'scyLicenseFile',
 		c.scy_social_code	 'scySocialCode',
@@ -17,9 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		s.smi_agreement_type 'smiAgreementType',
 		s.smi_address		 'smiAddress',
 		s.smi_manager 	     'smiManager',
-		u.nick_name         'smiContract',
+		u.nick_name          'smiContract',
 		u.user_name          'smiContractPhone',
-		s.smi_desc     	     'smiDesc'
+		ifnull(s.smi_desc,'') 'smiDesc'
 		from  sys_company c
 		left join sys_management_inf s
 		on s.smi_company_id	= c.scy_id
@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="smiManager != null  and smiManager != ''"> and s.smi_manager= #{smiManager}</if>
 		<if test="smiContract != null  and smiContract != ''"> and u.nick_name like concat('%', #{smiContract}, '%')</if>
 		<if test="smiContractPhone != null  and smiContractPhone != ''"> and u.user_name = #{smiContractPhone}</if>
+		 order by  c.create_time desc
 	</select>
 
 </mapper>

tianhu-system/src/main/resources/mapper/system/PubFileInfMapper.xml

@@ -0,0 +1,34 @@
+<?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.tianhu.system.mapper.PubFileInfMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.FileInf">
+        <id column="pfi_file_id" property="pfiFileId" />
+        <result column="pfi_company_id" property="pfiCompanyId" />
+        <result column="pfi_storage" property="pfiStorage" />
+        <result column="pfi_file_type" property="pfiFileType" />
+        <result column="pfi_file_size" property="pfiFileSize" />
+        <result column="pfi_file_name" property="pfiFileName" />
+        <result column="pfi_file_path" property="pfiFilePath" />
+        <result column="pfi_file_url" property="pfiFileUrl" />
+        <result column="pfi_tripartite" property="pfiTripartite" />
+        <result column="pfi_file_server" property="pfiFileServer" />
+        <result column="pfi_upload_time" property="pfiUploadTime" />
+        <result column="pfi_visit_time" property="pfiVisitTime" />
+        <result column="pfi_is_del" property="pfiIsDel" />
+        <result column="pfi_spare1" property="pfiSpare1" />
+        <result column="pfi_spare2" property="pfiSpare2" />
+        <result column="pfi_spare3" property="pfiSpare3" />
+        <result column="pfi_spare4" property="pfiSpare4" />
+        <result column="pfi_spare5" property="pfiSpare5" />
+        <result column="pfi_spare6" property="pfiSpare6" />
+        <result column="pfi_spare7" property="pfiSpare7" />
+        <result column="pfi_spare8" property="pfiSpare8" />
+        <result column="pfi_spare9" property="pfiSpare9" />
+        <result column="pfi_spare10" property="pfiSpare10" />
+        <result column="pfi_url" property="pfiUrl" />
+        <result column="pfi_del_time" property="pfiDelTime" />
+    </resultMap>
+
+</mapper>