企业模板详情接口，模板接收数组，存储sql为字符串，以及企业模板表加上更改人与更新时间字段(2)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCompanyTemplateController.java

@@ -1,8 +1,7 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -89,12 +88,13 @@ public class SysCompanyTemplateController extends BaseController
     {
         SysCompanyTemplate sysCompanyTemplate = sysCompanyTemplateService.selectSysCompanyTemplateById(id);
         if(sysCompanyTemplate.getTemplate() != null && !"".equals(sysCompanyTemplate.getTemplate())){
-            String template = sysCompanyTemplate.getTemplate().substring(1, sysCompanyTemplate.getTemplate().length()-1);
-            String[] templateList = template.split(",");
+//            String template = sysCompanyTemplate.getTemplate().substring(1, sysCompanyTemplate.getTemplate().length()-1);
+            String[] templateList = sysCompanyTemplate.getTemplate().split(",");
             Long[] templateIds = new Long[templateList.length];
             for(int i = 0;i<templateList.length;i++){
                 templateIds[i] = Long.parseLong(templateList[i]);
             }
+            sysCompanyTemplate.setTemplateIds(new ArrayList<>(Arrays.asList(templateIds)));
             sysCompanyTemplate.setTemplateList(sysRepoServiceImpl.selectSysRepoListByRepoIds(templateIds));
         }
         return success(sysCompanyTemplate);
@@ -113,7 +113,7 @@ public class SysCompanyTemplateController extends BaseController
     }
 
     /**
-     * 修改企业模板
+     * 修改企业模板接口
      */
     @PreAuthorize("@ss.hasPermi('system:template:edit')")
     @Log(title = "修改企业模板信息", businessType = BusinessType.UPDATE)
@@ -121,6 +121,7 @@ public class SysCompanyTemplateController extends BaseController
     public AjaxResult edit(@RequestBody SysCompanyTemplate sysCompanyTemplate)
     {
         sysCompanyTemplate.setUpdateBy(getUsername());
+        sysCompanyTemplate.setTemplate(sysCompanyTemplate.getTemplateIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
         return toAjax(sysCompanyTemplateService.updateSysCompanyTemplate(sysCompanyTemplate));
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCompanyTemplate.java

@@ -27,9 +27,14 @@ public class SysCompanyTemplate extends BaseEntity
     /** 企业模板配置 */
     private String template;
 
+
     /** 企业ID */
     private Long companyId;
 
+    /** 模板id列表 */
+    private List<Long> templateIds;
+
+    /** 模板列表 */
     private List<SysRepo> templateList = new ArrayList<SysRepo>();
 
     public void setId(Long id) 
@@ -79,6 +84,14 @@ public class SysCompanyTemplate extends BaseEntity
 
 	}
 
+    public List<Long> getTemplateIds() {
+		return templateIds;
+	}
+
+    public void setTemplateIds(ArrayList<Long> templateIds) {
+		this.templateIds = templateIds;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -87,6 +100,7 @@ public class SysCompanyTemplate extends BaseEntity
             .append("template", getTemplate())
             .append("companyId", getCompanyId())
             .append("templateList", getTemplateList())
+            .append("templateIds", getTemplateIds())
             .toString();
     }
 }