增加项目模板和模板数据功能后台接口

datav-manager/pom.xml

@@ -27,13 +27,13 @@
 				<profiles.active>develop</profiles.active>
 				<profiles.server.port>17002</profiles.server.port>
 				<profiles.datasource.uri>
-					<![CDATA[jdbc:mysql://localhost:3306/yi_zheng_xiu?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
+					<![CDATA[jdbc:mysql://192.168.0.98:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
 				<profiles.datasource.username>root</profiles.datasource.username>
-				<profiles.datasource.password>12345678</profiles.datasource.password>
-				<profiles.redis.uri>127.0.0.1</profiles.redis.uri>
+				<profiles.datasource.password>nacos@2020</profiles.datasource.password>
+				<profiles.redis.uri>192.168.0.252</profiles.redis.uri>
 				<profiles.redis.port>6379</profiles.redis.port>
 				<profiles.redis.username></profiles.redis.username>
-				<profiles.redis.password></profiles.redis.password>
+				<profiles.redis.password>hotel@2020</profiles.redis.password>
 				<profiles.redis.database>3</profiles.redis.database>
 				<profiles.filepath>d:/mortals/app/data/datav</profiles.filepath>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>

datav-manager/src/main/java/com/mortals/xhx/module/goview/dao/GoviewMasterplateDao.java

+package com.mortals.xhx.module.goview.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateEntity;
+import java.util.List;
+/**
+* 模板表Dao
+* 模板表 DAO接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+
+public interface  GoviewMasterplateDao extends ICRUDDao<GoviewMasterplateEntity,Long>{
+
+
+}

datav-manager/src/main/java/com/mortals/xhx/module/goview/dao/GoviewMasterplateDataDao.java

+package com.mortals.xhx.module.goview.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateDataEntity;
+import java.util.List;
+/**
+* 模板数据Dao
+* 模板数据 DAO接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+
+public interface  GoviewMasterplateDataDao extends ICRUDDao<GoviewMasterplateDataEntity,Long>{
+
+
+}

datav-manager/src/main/java/com/mortals/xhx/module/goview/dao/ibatis/GoviewMasterplateDaoImpl.java

+package com.mortals.xhx.module.goview.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.goview.dao.GoviewMasterplateDao;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 模板表DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Repository("goviewMasterplateDao")
+public class GoviewMasterplateDaoImpl extends BaseCRUDDaoMybatis<GoviewMasterplateEntity,Long> implements GoviewMasterplateDao {
+
+
+
+}

datav-manager/src/main/java/com/mortals/xhx/module/goview/dao/ibatis/GoviewMasterplateDataDaoImpl.java

+package com.mortals.xhx.module.goview.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.goview.dao.GoviewMasterplateDataDao;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateDataEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 模板数据DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Repository("goviewMasterplateDataDao")
+public class GoviewMasterplateDataDaoImpl extends BaseCRUDDaoMybatis<GoviewMasterplateDataEntity,Long> implements GoviewMasterplateDataDao {
+
+
+
+}

datav-manager/src/main/java/com/mortals/xhx/module/goview/model/GoviewMasterplateDataEntity.java

+package com.mortals.xhx.module.goview.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.goview.model.vo.GoviewMasterplateDataVo;
+/**
+* 模板数据实体对象
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+
+public class GoviewMasterplateDataEntity extends GoviewMasterplateDataVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 模板Id
+    */
+    private Long masterplateId;
+    /**
+    * 存储数据
+    */
+    private byte[] content;
+
+
+
+    public GoviewMasterplateDataEntity(){}
+    /**
+    * 获取 模板Id
+    * @return Long
+    */
+    public Long getMasterplateId(){
+        return masterplateId;
+    }
+    /**
+    * 设置 模板Id
+    * @param masterplateId
+    */
+    public void setMasterplateId(Long masterplateId){
+        this.masterplateId = masterplateId;
+    }
+    /**
+    * 获取 存储数据
+    * @return byte[]
+    */
+    public byte[] getContent(){
+        return content;
+    }
+    /**
+    * 设置 存储数据
+    * @param content
+    */
+    public void setContent(byte[] content){
+        this.content = content;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof GoviewMasterplateDataEntity) {
+            GoviewMasterplateDataEntity tmp = (GoviewMasterplateDataEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",masterplateId:").append(getMasterplateId());
+        sb.append(",content:").append(getContent());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.masterplateId = null;
+
+            this.content = null;
+    }
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/model/GoviewMasterplateEntity.java

+package com.mortals.xhx.module.goview.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.goview.model.vo.GoviewMasterplateVo;
+/**
+* 模板表实体对象
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+
+public class GoviewMasterplateEntity extends GoviewMasterplateVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 模板名称
+    */
+    private String masterplateName;
+    /**
+    * 发布用户ID
+    */
+    private Long customerId;
+    /**
+    * 项目状态[0未发布,1发布]
+    */
+    private Integer state;
+    /**
+    * 首页图片
+    */
+    private String indexImage;
+    /**
+    * 模板介绍
+    */
+    private String remarks;
+
+
+
+    public GoviewMasterplateEntity(){}
+    /**
+    * 获取 模板名称
+    * @return String
+    */
+    public String getMasterplateName(){
+        return masterplateName;
+    }
+    /**
+    * 设置 模板名称
+    * @param masterplateName
+    */
+    public void setMasterplateName(String masterplateName){
+        this.masterplateName = masterplateName;
+    }
+    /**
+    * 获取 发布用户ID
+    * @return Long
+    */
+    public Long getCustomerId(){
+        return customerId;
+    }
+    /**
+    * 设置 发布用户ID
+    * @param customerId
+    */
+    public void setCustomerId(Long customerId){
+        this.customerId = customerId;
+    }
+    /**
+    * 获取 项目状态[0未发布,1发布]
+    * @return Integer
+    */
+    public Integer getState(){
+        return state;
+    }
+    /**
+    * 设置 项目状态[0未发布,1发布]
+    * @param state
+    */
+    public void setState(Integer state){
+        this.state = state;
+    }
+    /**
+    * 获取 首页图片
+    * @return String
+    */
+    public String getIndexImage(){
+        return indexImage;
+    }
+    /**
+    * 设置 首页图片
+    * @param indexImage
+    */
+    public void setIndexImage(String indexImage){
+        this.indexImage = indexImage;
+    }
+    /**
+    * 获取 模板介绍
+    * @return String
+    */
+    public String getRemarks(){
+        return remarks;
+    }
+    /**
+    * 设置 模板介绍
+    * @param remarks
+    */
+    public void setRemarks(String remarks){
+        this.remarks = remarks;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof GoviewMasterplateEntity) {
+            GoviewMasterplateEntity tmp = (GoviewMasterplateEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",masterplateName:").append(getMasterplateName());
+        sb.append(",customerId:").append(getCustomerId());
+        sb.append(",state:").append(getState());
+        sb.append(",indexImage:").append(getIndexImage());
+        sb.append(",remarks:").append(getRemarks());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.masterplateName = "";
+
+            this.customerId = null;
+
+            this.state = null;
+
+            this.indexImage = "";
+
+            this.remarks = "";
+    }
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/model/vo/GoviewMasterplateDataVo.java

+package com.mortals.xhx.module.goview.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateDataEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 模板数据视图对象
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Data
+public class GoviewMasterplateDataVo extends BaseEntityLong {
+
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/model/vo/GoviewMasterplateVo.java

+package com.mortals.xhx.module.goview.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 模板表视图对象
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Data
+public class GoviewMasterplateVo extends BaseEntityLong {
+    /** 项目数据 */
+    private String content;
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/service/GoviewMasterplateDataService.java

+package com.mortals.xhx.module.goview.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateDataEntity;
+/**
+* GoviewMasterplateDataService
+*
+* 模板数据 service接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+public interface GoviewMasterplateDataService extends ICRUDService<GoviewMasterplateDataEntity,Long>{
+
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/service/GoviewMasterplateService.java

+package com.mortals.xhx.module.goview.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateEntity;
+/**
+* GoviewMasterplateService
+*
+* 模板表 service接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+public interface GoviewMasterplateService extends ICRUDService<GoviewMasterplateEntity,Long>{
+
+    /**
+     * 使用模板
+     * @param masterplateId
+     * @param context
+     * @throws AppException
+     */
+    void useMasterplate(Long masterplateId, Context context) throws AppException;
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/service/GoviewProjectService.java

 package com.mortals.xhx.module.goview.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.goview.model.GoviewProjectEntity;
 /**
@@ -11,4 +13,10 @@ import com.mortals.xhx.module.goview.model.GoviewProjectEntity;
 */
 public interface GoviewProjectService extends ICRUDService<GoviewProjectEntity,Long>{
 
+    /**
+     * 发布为模板
+     * @param projectId
+     * @throws AppException
+     */
+    void publishMasterplate(Long projectId, Context context) throws AppException;
 }
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/service/impl/GoviewMasterplateDataServiceImpl.java

+package com.mortals.xhx.module.goview.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.goview.dao.GoviewMasterplateDataDao;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateDataEntity;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateDataService;
+/**
+* GoviewMasterplateDataService
+* 模板数据 service实现
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Service("goviewMasterplateDataService")
+public class GoviewMasterplateDataServiceImpl extends AbstractCRUDServiceImpl<GoviewMasterplateDataDao, GoviewMasterplateDataEntity, Long> implements GoviewMasterplateDataService {
+    
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/service/impl/GoviewMasterplateServiceImpl.java

+package com.mortals.xhx.module.goview.service.impl;
+import com.mortals.xhx.module.goview.model.*;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateDataService;
+import com.mortals.xhx.module.goview.service.GoviewProjectDataService;
+import com.mortals.xhx.module.goview.service.GoviewProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.goview.dao.GoviewMasterplateDao;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateService;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+* GoviewMasterplateService
+* 模板表 service实现
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Service("goviewMasterplateService")
+public class GoviewMasterplateServiceImpl extends AbstractCRUDServiceImpl<GoviewMasterplateDao, GoviewMasterplateEntity, Long> implements GoviewMasterplateService {
+
+    @Autowired
+    private GoviewProjectDataService goviewProjectDataService;
+    @Autowired
+    private GoviewProjectService goviewProjectService;
+    @Autowired
+    private GoviewMasterplateDataService goviewMasterplateDataService;
+
+    @Override
+    protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
+        List<Long> masterplateIdList = new ArrayList<>();
+        for(Long id:ids){
+            masterplateIdList.add(id);
+        }
+        List<GoviewMasterplateDataEntity> list = goviewMasterplateDataService.find(new GoviewMasterplateDataQuery().masterplateIdList(masterplateIdList));
+        List<Long> dataIds = new ArrayList<>();
+        for(GoviewMasterplateDataEntity item:list){
+            dataIds.add(item.getId());
+        }
+        goviewMasterplateDataService.remove(dataIds.toArray(new Long[dataIds.size()]),context);
+    }
+
+    @Override
+    public void useMasterplate(Long masterplateId, Context context) throws AppException {
+        GoviewMasterplateEntity masterplateEntity = this.get(masterplateId);
+        if(masterplateEntity==null){
+            throw new AppException("模板ID不正确，无对应数据");
+        }
+        GoviewProjectEntity projectEntity = new GoviewProjectEntity();
+        projectEntity.setProjectName(masterplateEntity.getMasterplateName());
+        projectEntity.setIndexImage(masterplateEntity.getIndexImage());
+        projectEntity.setRemarks(masterplateEntity.getRemarks());
+        projectEntity.setState(-1);
+        if(context!=null && context.getUser()!=null) {
+            projectEntity.setCustomerId(context.getUser().getId());
+            projectEntity.setCreateUserId(projectEntity.getCustomerId());
+        }
+        projectEntity.setCreateTime(new Date());
+        projectEntity = goviewProjectService.save(projectEntity);
+        GoviewMasterplateDataEntity masterplateDataEntity = goviewMasterplateDataService.selectOne(new GoviewMasterplateDataQuery().masterplateId(masterplateEntity.getId()));
+        if(masterplateDataEntity!=null){
+            GoviewProjectDataEntity projectDataEntity = new GoviewProjectDataEntity();
+            projectDataEntity.setProjectId(projectEntity.getId());
+            projectDataEntity.setContent(masterplateDataEntity.getContent());
+            projectDataEntity.setCreateUserId(projectEntity.getCreateUserId());
+            projectDataEntity.setCreateTime(projectEntity.getCreateTime());
+            goviewProjectDataService.save(projectDataEntity);
+        }
+    }
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/service/impl/GoviewProjectServiceImpl.java

@@ -4,15 +4,16 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.goview.dao.GoviewProjectDao;
-import com.mortals.xhx.module.goview.model.GoviewProjectDataEntity;
-import com.mortals.xhx.module.goview.model.GoviewProjectDataQuery;
-import com.mortals.xhx.module.goview.model.GoviewProjectEntity;
+import com.mortals.xhx.module.goview.model.*;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateDataService;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateService;
 import com.mortals.xhx.module.goview.service.GoviewProjectDataService;
 import com.mortals.xhx.module.goview.service.GoviewProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +28,10 @@ public class GoviewProjectServiceImpl extends AbstractCRUDServiceImpl<GoviewProj
 
     @Autowired
     private GoviewProjectDataService goviewProjectDataService;
+    @Autowired
+    private GoviewMasterplateService goviewMasterplateService;
+    @Autowired
+    private GoviewMasterplateDataService goviewMasterplateDataService;
 
     @Override
     protected void saveBefore(GoviewProjectEntity entity, Context context) throws AppException {
@@ -47,4 +52,31 @@ public class GoviewProjectServiceImpl extends AbstractCRUDServiceImpl<GoviewProj
         }
         goviewProjectDataService.remove(dataIds.toArray(new Long[dataIds.size()]),context);
     }
+
+    @Override
+    public void publishMasterplate(Long projectId, Context context) throws AppException {
+        GoviewProjectEntity projectEntity = this.get(projectId);
+        if(projectEntity == null){
+            throw new AppException("项目id不正确，无此项目数据");
+        }
+        GoviewMasterplateEntity masterplateEntity = new GoviewMasterplateEntity();
+        masterplateEntity.setCustomerId(projectEntity.getCustomerId());
+        masterplateEntity.setMasterplateName(projectEntity.getProjectName());
+        masterplateEntity.setIndexImage(projectEntity.getIndexImage());
+        masterplateEntity.setRemarks(projectEntity.getRemarks());
+        if(context!=null && context.getUser()!=null) {
+            masterplateEntity.setCreateUserId(context.getUser().getId());
+        }
+        masterplateEntity.setCreateTime(new Date());
+        masterplateEntity = goviewMasterplateService.save(masterplateEntity);
+        GoviewProjectDataEntity projectDataEntity = goviewProjectDataService.selectOne(new GoviewProjectDataQuery().projectId(projectId));
+        if(projectDataEntity!=null){
+            GoviewMasterplateDataEntity masterplateDataEntity = new GoviewMasterplateDataEntity();
+            masterplateDataEntity.setMasterplateId(masterplateEntity.getId());
+            masterplateDataEntity.setContent(projectDataEntity.getContent());
+            masterplateDataEntity.setCreateUserId(masterplateEntity.getCreateUserId());
+            masterplateDataEntity.setCreateTime(masterplateEntity.getCreateTime());
+            goviewMasterplateDataService.save(masterplateDataEntity);
+        }
+    }
 }
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/web/GoviewMasterplateController.java

+package com.mortals.xhx.module.goview.web;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.goview.model.*;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 模板表
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@RestController
+@RequestMapping("goview/masterplate")
+public class GoviewMasterplateController extends BaseCRUDJsonBodyMappingController<GoviewMasterplateService,GoviewMasterplateEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+    @Autowired
+    private GoviewMasterplateDataService goviewMasterplateDataService;
+
+    public GoviewMasterplateController(){
+        super.setModuleDesc( "模板表");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "state", paramService.getParamBySecondOrganize("GoviewMasterplate","state"));
+        super.init(model, context);
+    }
+
+    @RequestMapping(value = {"getData"},method = {RequestMethod.GET})
+    public Rest<Object> getData(Long masterplateId, ModelMap map) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询模板关联数据";
+        int code;
+        try {
+            GoviewMasterplateEntity goviewProjectEntity = service.get(masterplateId);
+            if(goviewProjectEntity==null){
+                throw new AppException("模板ID不正确，无对应数据");
+            }
+            GoviewMasterplateDataEntity goviewProjectDataEntity = this.goviewMasterplateDataService.selectOne(new GoviewMasterplateDataQuery().masterplateId(masterplateId));
+            if(goviewProjectEntity!=null && goviewProjectDataEntity!=null){
+                byte[] bs= goviewProjectDataEntity.getContent();
+                String str="二进制转换错误";
+                str = new String(bs);
+                goviewProjectEntity.setContent(str);
+            }
+            model.put("data", goviewProjectEntity);
+            code = 1;
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+
+        ret.setCode(code);
+        ret.setData(model.get("data"));
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+
+    @PostMapping({"save/data"})
+    public String saveData(GoviewMasterplateDataEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "保存模板数据";
+        int code=1;
+        try {
+            IUser user = this.getCurUser();
+            if(entity.getMasterplateId()==null){
+                throw new AppException("模板ID不能为空");
+            }
+            GoviewMasterplateDataEntity old = goviewMasterplateDataService.selectOne(new GoviewMasterplateDataQuery().masterplateId(entity.getMasterplateId()));
+            if(old==null){
+                entity.setCreateTime(new Date());
+                entity.setUpdateTime(entity.getCreateTime());
+                if (user != null) {
+                    entity.setCreateUserId(user.getId());
+                }
+                this.goviewMasterplateDataService.save(entity, context);
+            }else {
+                entity.setId(old.getId());
+                entity.setUpdateTime(new Date());
+                this.goviewMasterplateDataService.update(entity, context);
+            }
+
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var7) {
+            this.doException(this.request, busiDesc, model, var7);
+            model.put("entity", entity);
+            code = -1;
+        }
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+
+    /**
+     * 使用模板
+     * @param entity
+     * @return
+     */
+    @PostMapping({"use/masterplate"})
+    public String useMasterplate(@RequestBody GoviewMasterplateEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "使用模板";
+        int code=1;
+        try {
+            if(entity.getId()==null){
+                throw new AppException("模板ID不能为空");
+            }
+            service.useMasterplate(entity.getId(), context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var7) {
+            this.doException(this.request, busiDesc, model, var7);
+            model.put("entity", entity);
+            code = -1;
+        }
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/web/GoviewMasterplateDataController.java

+package com.mortals.xhx.module.goview.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.goview.model.GoviewMasterplateDataEntity;
+import com.mortals.xhx.module.goview.service.GoviewMasterplateDataService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 模板数据
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@RestController
+@RequestMapping("goview/masterplate/data")
+public class GoviewMasterplateDataController extends BaseCRUDJsonBodyMappingController<GoviewMasterplateDataService,GoviewMasterplateDataEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public GoviewMasterplateDataController(){
+        super.setModuleDesc( "模板数据");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

datav-manager/src/main/java/com/mortals/xhx/module/goview/web/GoviewProjectController.java

 package com.mortals.xhx.module.goview.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.IUser;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,12 +15,10 @@ import com.mortals.xhx.module.goview.model.GoviewProjectEntity;
 import com.mortals.xhx.module.goview.service.GoviewProjectService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
@@ -47,4 +47,36 @@ public class GoviewProjectController extends BaseCRUDJsonBodyMappingController<G
     }
 
 
+    /**
+     * 发布为模板
+     * @param entity
+     * @return
+     */
+    @PostMapping({"publish/masterplate"})
+    public String publishMasterplate(@RequestBody GoviewProjectEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "发布模板";
+        int code=1;
+        try {
+            if(entity.getId()==null){
+                throw new AppException("项目ID不能为空");
+            }
+            service.publishMasterplate(entity.getId(), context);
+            model.put("id", entity.getId());
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var7) {
+            this.doException(this.request, busiDesc, model, var7);
+            model.put("entity", entity);
+            code = -1;
+        }
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 }
\ No newline at end of file