diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/ReportSearchParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/ReportSearchParam.java new file mode 100644 index 000000000..f3caa5107 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/ReportSearchParam.java @@ -0,0 +1,36 @@ +package com.njcn.harmonic.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 模板动态更新数据 + * + * @author qijian + * @date 2022/10/11 + */ +@Data +public class ReportSearchParam { + + @ApiModelProperty(name = "lineId",value = "监测点id") + private String lineId; + + @ApiModelProperty(name = "tempId",value = "模板ID") + private String tempId; + + @ApiModelProperty(name = "activation",value = "激活状态") + private Integer activation; + + @ApiModelProperty(name = "type",value = "报表类型") + private Integer type; + + @ApiModelProperty(name = "startTime",value = "开始时间") + private String startTime; + + @ApiModelProperty(name = "endTime",value = "结束时间") + private String endTime; + + @ApiModelProperty(name = "deptId",value = "部门ID") + private String deptId; + +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ExcelRpt.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ExcelRpt.java new file mode 100644 index 000000000..37eaedfa2 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ExcelRpt.java @@ -0,0 +1,55 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * (SysExcelRpt)实体类 + * + * @author qijian + * @since 2022-10-14 10:44:54 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "sys_excel_rpt") +public class ExcelRpt extends BaseEntity { + /**6 + * 主键 + */ + private String id; + /** + * 名称 + */ + private String name; + /** + * 监测点Id + */ + private String lineId; + /** + * 报表日期 + */ + private Date dataDate; + /** + * 报表模板Id + */ + private String tempId; + /** + * 报表内容 + */ + private String content; + /** + * 报表类型(1年 2季度 3月份 4周 5日) + */ + private Integer type; + /** + * 状态(0:删除;1:正常) + */ + private Integer state; + +} + + diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ExcelRptTemp.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ExcelRptTemp.java new file mode 100644 index 000000000..565de13e1 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ExcelRptTemp.java @@ -0,0 +1,30 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * pqs + * 自定义报表 + * @author cdf + * @date 2022/8/16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "sys_excel_rpt_temp") +public class ExcelRptTemp extends BaseEntity { + private String id; + + private String name; + + private String content; + + private Integer state; + + private String valueTitle; + + private String reportType; + +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/SysDeptTemp.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/SysDeptTemp.java new file mode 100644 index 000000000..81f911997 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/SysDeptTemp.java @@ -0,0 +1,35 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * (SysDeptTemp)实体类 + * + * @author qijian + * @since 2022-10-18 09:31:39 + */ +@Data +@TableName(value = "sys_dept_temp") +public class SysDeptTemp implements Serializable { + private static final long serialVersionUID = -35391150359300949L; + /** + * 主键 + */ + private String id; + /** + * 部门主键 + */ + private String deptId; + /** + * 模板主键 + */ + private String tempId; + /** + * 激活状态 + */ + private Integer activation; +} + diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/SysDeptTempVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/SysDeptTempVO.java new file mode 100644 index 000000000..42d8eb5d5 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/SysDeptTempVO.java @@ -0,0 +1,37 @@ +package com.njcn.harmonic.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + * @author qijian + * @since 2022-10-19 09:31:39 + */ +@Data +public class SysDeptTempVO implements Serializable { + private static final long serialVersionUID = -35391150359300949L; + /** + * 主键 + */ + private String id; + /** + * 部门主键 + */ + private String deptId; + + /** + * 模板主键 + */ + private String tempId; + + /** + * 激活状态 + */ + private Integer activation; + + //部门名称 + private String deptName; +} + diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/PublicDataUtils.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/PublicDataUtils.java new file mode 100644 index 000000000..c60460313 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/PublicDataUtils.java @@ -0,0 +1,30 @@ +package com.njcn.harmonic.utils; + +/** + * 数据公共工具类 + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/10/14 - 10:07 + */ +public class PublicDataUtils { + /** + * 功能:下划线命名转驼峰命名 + * 将下划线替换为空格,将字符串根据空格分割成数组,再将每个单词首字母大写 + * @param s + * @return + */ + public static String underCamel(String s) + { + String separator = "_"; + String under=""; + s = s.toLowerCase().replace(separator, " "); + String sarr[]=s.split(" "); + for(int i=0;i { + + /** + * 激活部门模板(1:激活) + * @param sysDeptTemp 参数 + * @return 结果 + */ + int updateActivation(@Param("sysDeptTemp")SysDeptTemp sysDeptTemp); + + /** + * 初始化部门激活状态(0:未激活) + * @param deptId 参数 + * @return 结果 + */ + int updateAllActivation(@Param("deptId")String deptId); + + /** + * 根据模板获取部门数据 + * @param tempId 参数 + * @return 结果 + */ + List getDeptTempByTempId(@Param("tempId")String tempId); + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/ExcelRptMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/ExcelRptMapper.java new file mode 100644 index 000000000..cb6735a64 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/ExcelRptMapper.java @@ -0,0 +1,14 @@ +package com.njcn.harmonic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.harmonic.pojo.po.ExcelRpt; + +/** + * ExcelRptMapper + * + * @author qijian + * @date 2022/10/14 + */ +public interface ExcelRptMapper extends BaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/ExcelRptTempMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/ExcelRptTempMapper.java new file mode 100644 index 000000000..aac1cde08 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/ExcelRptTempMapper.java @@ -0,0 +1,26 @@ +package com.njcn.harmonic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.harmonic.pojo.param.ReportSearchParam; +import com.njcn.harmonic.pojo.po.ExcelRptTemp; +import com.njcn.harmonic.pojo.vo.ReportTemplateVO; +import com.njcn.web.pojo.param.BaseParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * pqs + * + * @author cdf + * @date 2022/8/16 + */ +public interface ExcelRptTempMapper extends BaseMapper { + + Page getReportTemplateListPage(Page page, @Param("baseParam")BaseParam baseParam); + + List getReportTemplateList(@Param("reportSearchParam")ReportSearchParam reportSearchParam); + + List getReportTemplateByDept(@Param("deptId")String deptId); +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/DeptTempMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/DeptTempMapper.xml new file mode 100644 index 000000000..c9ca265af --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/DeptTempMapper.xml @@ -0,0 +1,34 @@ + + + + + UPDATE sys_dept_temp + SET activation = 1 + WHERE 1=1 + + and dept_id = #{sysDeptTemp.deptId} + + + and temp_id = #{sysDeptTemp.tempId} + + + + + UPDATE sys_dept_temp + SET activation = 0 + WHERE + dept_id = #{deptId} + + + + + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ExcelRptTempMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ExcelRptTempMapper.xml new file mode 100644 index 000000000..6078f749a --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ExcelRptTempMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + +